summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Fix valgrind errorMarco Nelissen2013-03-191-0/+1
| | | | | | | | The volume member of the BundledEffectContext class was not being initialized, resulting in uninitialized data being used for calculations and control flow. Change-Id: I84bf9fd478e5d0479e781323b21c7c03dea958c5
* am 59ac7b30: am 66abe3ae: Merge "Fix for crash if no content in DESCRIBE ↵Andreas Huber2013-03-151-0/+3
|\ | | | | | | | | | | | | response" * commit '59ac7b3056db57e5a8e851b7946a181c5fc34852': Fix for crash if no content in DESCRIBE response
| * Fix for crash if no content in DESCRIBE responseXuefei Chen2013-03-121-0/+3
| | | | | | | | | | | | | | | | | | | | If DESCRIBE response is received with status 200 but no content, MyHandler will still set content data for session description parsing. This will cause NULL Pointer crash. This fix checks whether DESCRIBE response has content before parsing session description. Change-Id: I114ae6fd54ce804e61718f62618ca9008425a433
* | Merge "Make limitations of MPEG4Writer explicit" into jb-mr2-devTenghui Zhu2013-03-142-6/+49
|\ \
| * | Make limitations of MPEG4Writer explicitJames Dong2013-03-142-6/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o No more than 2 tracks will be supported o No more than one video and/or one audio tracks will be supported o Only take video and/or audio track (for instance, no text tracks) o If there is no track before start() is called, bail out. At the same time, make sure the errors from addSource() report to addTrack(), not to start(). Bug: 7991013 Change-Id: I1ca35aaeb75b5448d75ed2c6c10dd12ecea720ab
* | | Merge "Parse SBR extension sample rate" into jb-mr2-devMarco Nelissen2013-03-141-9/+22
|\ \ \
| * | | Parse SBR extension sample rateMarco Nelissen2013-03-141-9/+22
| | | | | | | | | | | | | | | | Change-Id: Ib6f6994228a279ee10b389515fba04516c7c42ba
* | | | Merge "remove uses of Surface in favor or IGraphicBufferProducer" into ↵Mathias Agopian2013-03-138-14/+14
|\ \ \ \ | | | | | | | | | | | | | | | jb-mr2-dev
| * | | | remove uses of Surface in favor or IGraphicBufferProducerMathias Agopian2013-03-128-14/+14
| | |/ / | |/| | | | | | | | | | Change-Id: I13d7a9553aa335bca790a3a59d389d7533c83d57
* | | | Attempt to recover from network stalls by dropping frames on the source side.Andreas Huber2013-03-1310-4/+100
| | | | | | | | | | | | | | | | Change-Id: I5f9eb4f5acb624a9e5bc0087801fb5a4a9ade35c
* | | | Merge "Squashed commit of the following:" into jb-mr2-devAndreas Huber2013-03-1217-17/+127
|\ \ \ \
| * | | | Squashed commit of the following:Andreas Huber2013-03-1217-17/+127
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit f4edf442741886cdbe071e2d15f6e6247269f7c5 Author: Andreas Huber <andih@google.com> Date: Tue Mar 12 09:09:18 2013 -0700 Pass additional flags to the sink, use TCP by default in wolfiecast mode. Change-Id: I41e11a2375d4199656e45c4f149d8441d0016092 commit 6302602ed280a38287f507159abfb40a1da38c5a Author: Andreas Huber <andih@google.com> Date: Tue Mar 12 08:51:58 2013 -0700 tweaks Change-Id: Ie29e422d7258be522f4bb1f6c5afcf74c937e547 commit a38a860e4979ba563cadbaafa21b084439449d26 Author: Andreas Huber <andih@google.com> Date: Mon Mar 11 16:57:43 2013 -0700 Report average lateness all the way from NuPlayerRenderer... Change-Id: I2e7700703ae656515e44b9c25610d26c75778111 commit a7d49b11675ea88be4029dd8451d1649db94571d Author: Andreas Huber <andih@google.com> Date: Mon Mar 11 14:54:19 2013 -0700 Make TimeSyncer smarter, enable TunnelRenderer Change-Id: I27377a60cd8feb01589da456967fddd34532c20e commit 0f214c8ef68179f7b61512c37040939554013151 Author: Andreas Huber <andih@google.com> Date: Thu Mar 7 15:57:56 2013 -0800 convert source timestamps to sink timestamps, report lateness. Change-Id: I051a60fbbceca2f7b508ae3dac6e01e402bae39e commit 04a4f8e16bad09157b5615a5fa45310438955832 Author: Andreas Huber <andih@google.com> Date: Thu Mar 7 09:00:28 2013 -0800 Sync time between sink and source. Change-Id: Ie8b4d75c957aa48310e7c81d1279761b9f821efe commit aebe20e6184e3636a99082f8ece08e708015cb8d Author: Andreas Huber <andih@google.com> Date: Wed Mar 6 09:03:12 2013 -0800 play with back pressure Change-Id: I51eb69257e6a79e76f5f9c75ff99d8adbd083947 Change-Id: Ifdf57228667fed7fc71c5090a2c3f7cea1037c5c
* | | | GraphicBufferSource fixesAndy McFadden2013-03-123-56/+81
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Various fixes: - Set the maximum number of BQ buffers we're allowed to acquire equal to the actual number of codec buffers. That way we keep the codec as full as possible, and never try to acquire more than we're allowed from the BufferQueue. - Actually use "end of stream sent" flag. - Name the BufferQueue (for debug messages). Bug 8359403 Change-Id: I3b8c1f679bbebf6a89e623e13ca029eda7f657ba
* | | Merge "Clean up the native code to match Java update" into jb-mr2-devztenghui2013-03-081-9/+14
|\ \ \
| * | | Clean up the native code to match Java updateztenghui2013-03-081-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Add flags to match the java side change. 2. Update the interface. bug:7991013 Change-Id: I8ffe84c466b2a68e2e1e48b35b78db9e44640265
* | | | Merge "Disable our fancy logic to respect both sink and source's native ↵Andreas Huber2013-03-073-13/+10
|\ \ \ \ | | | | | | | | | | | | | | | formats" into jb-mr2-dev
| * | | | Disable our fancy logic to respect both sink and source's native formatsAndreas Huber2013-03-073-13/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since it isn't actually supported by anything in the field. Change-Id: I9cd038d7631105de26303312ca87c472d67034d4
* | | | | The transport stream HDCP descriptor belongs in the program_info sectionAndreas Huber2013-03-074-30/+70
|/ / / / | | | | | | | | | | | | | | | | | | | | instead of being included in the per-stream descriptors Change-Id: If5251c0c02456646e2fdbb5e62acf66c356cf13e
* | | | Merge "Correct MediaCodec + Surface behavior" into jb-mr2-devAndy McFadden2013-03-065-41/+69
|\ \ \ \ | |_|/ / |/| | |
| * | | Correct MediaCodec + Surface behaviorAndy McFadden2013-03-055-41/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assorted tweaks: - Allow signalEndOfInputStream() before ACodec is in Executing state (added message to two more states). - Return an error if signalEndOfInputStream() is called a second time on the same stream. - Require AndroidOpaque color format in createInputSurface(). - Disallow dequeueInputBuffer() after an input surface has been created (boolean flag in MediaCodec tracks it). - Discard input surface when encoder is re-configure()ed (drop OMXNodeInstance's ref when we go back to Loaded). Bug 7991062 Change-Id: Iff30f3036e14eb5a2f6536910dcf11aba33031ee
* | | | Merge "Add template class SingleStateQueue" into jb-mr2-devGlenn Kasten2013-03-063-0/+140
|\ \ \ \
| * | | | Add template class SingleStateQueueGlenn Kasten2013-03-053-0/+140
| | | | | | | | | | | | | | | | | | | | Change-Id: If7e2bc9b2a216524ee9cbb68682e2634933b4973
* | | | | Merge "Squashed commit of the following:" into jb-mr2-devAndreas Huber2013-03-0522-2859/+1579
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Squashed commit of the following:Andreas Huber2013-03-0522-2859/+1579
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit e5919b1f57ea61fa1d380dfdb4e3e832ce73d79d Author: Andreas Huber <andih@google.com> Date: Wed Feb 27 16:38:48 2013 -0800 Configure TCP datagram sockets to be TCP_NODELAY. Change-Id: Ia724a81e6e27dccd00ac84603e712d69ca77a0cd commit 1b52b393183db8a6dc000a7c31baac544ccfc50c Author: Andreas Huber <andih@google.com> Date: Wed Feb 27 14:26:01 2013 -0800 Send IDR frame requests on packet loss. Change-Id: I53b7fb85cbd6923491113b93ec3e2175726d654a commit 68d76b4b3a0181b30abc57cd2915273210530a6d Author: Andreas Huber <andih@google.com> Date: Tue Feb 26 15:12:34 2013 -0800 Revive TunnelRenderer Change-Id: I8c5a9d982793b1c5b841c828227b354f1dab618c commit 3df28a8e9d8bcdc1430016bb088d097eca653b56 Author: Andreas Huber <andih@google.com> Date: Tue Feb 26 13:53:14 2013 -0800 Disable suspension of video updates. Change-Id: I7e3a16b8d7dd7a55d9f962a2236388931f664106 commit 2ec7a79de019a26ec415016c1478afd762f069cd Author: Andreas Huber <andih@google.com> Date: Tue Feb 26 08:54:40 2013 -0800 Adds an SNTP client to wfd. Change-Id: Icd7d6104e951e1443e4c1b81ccf6b3731d79d3ec commit c81c3bb5725bb4079a4d7fb02151ad0bb540632f Author: Andreas Huber <andih@google.com> Date: Mon Feb 25 10:00:58 2013 -0800 Squashed commit of the following: commit b83a4ec96659ef6f6b7c2090fdd866abe3ab78ba Author: Andreas Huber <andih@google.com> Date: Mon Feb 25 09:28:11 2013 -0800 Some reorganization of the rtp code, renamed StreamHub -> MediaSender Change-Id: I8cf67444960e60426bf74880af1acce41e8b2fef commit 7769cbd739f2a67c58e0c6a7b1a21a12210c7c4d Author: Andreas Huber <andih@google.com> Date: Fri Feb 22 16:12:18 2013 -0800 Choose a smaller MTU to avoid fragmented IPv4 packets, fix AVC assembler. Change-Id: I274b3cc1483c4e9f4d146dbf9f3d9f7557ef7ef9 commit 1f687ee80a88b56d614c2cf408ff729114ff86a0 Author: Andreas Huber <andih@google.com> Date: Fri Feb 22 11:38:31 2013 -0800 better reporting. Change-Id: I67f0bb51f106ea77f5cc75938b053c8e8e8f688e commit 7950c1cd59213eb5f281fcde44a772ecffae473d Author: Andreas Huber <andih@google.com> Date: Fri Feb 22 09:07:41 2013 -0800 stuff Change-Id: Ib99416366d3eec6e6ad69b4d791a8a9408410f3b commit 33c09045b0f86fcaa4619cbd679b47a074f71231 Author: Andreas Huber <andih@google.com> Date: Thu Feb 21 15:54:01 2013 -0800 Render frames according to their timestamps. Change-Id: I8143a95cffe775799d6a4bb093558bd7abb1f063 commit d8b6daae2160bf1c016d7c6251256b46bb89db42 Author: Andreas Huber <andih@google.com> Date: Thu Feb 21 15:01:27 2013 -0800 Better packet-lost logic. Change-Id: I611eee5a42bd089638cf45b0e16f628ff2a955ab commit 782c6b15717e2d062d96665a089d06c0577733d0 Author: Andreas Huber <andih@google.com> Date: Wed Feb 20 15:06:47 2013 -0800 Add a dedicated looper for the MediaReceiver Change-Id: I3b79cad367fb69c9a160a8d009af8c5f5142b98e commit 4c7b8b10861674b773270103bcabd1a99486a691 Author: Andreas Huber <andih@google.com> Date: Wed Feb 20 14:30:28 2013 -0800 Tweaks to RTPSender and RTPReceiver Change-Id: Ib535552f289a26cfead6df8c63e4c63d3987d4e9 commit 39226b28177a816cda5c67b321745d396b18277d Author: Andreas Huber <andih@google.com> Date: Tue Feb 19 08:48:25 2013 -0800 Playing around with non muxed delivery Change-Id: I845375f6938d04bc30502840c2ceb7688dc9b237 commit c16d21de75d8ecdbcd9abce14934afe484970061 Author: Andreas Huber <andih@google.com> Date: Wed Feb 13 14:43:35 2013 -0800 A more solid base for RTP communication. Change-Id: I52033eeb0feba0ff029d61553a821c82f2fa1c3f Change-Id: I57e3bcfc1c59a012b15aaaa42ed81f09c34c26bb Change-Id: I4b09db4a44d0eeded7a1658f6dc6c97d4b8be720
* | | | Merge "Implement Surface input to MediaCodec." into jb-mr2-devAndy McFadden2013-03-0511-20/+1083
|\ \ \ \ | |/ / / |/| | |
| * | | Implement Surface input to MediaCodec.Andy McFadden2013-03-0411-20/+1083
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Also, renamed a CHECK_INTERFACE macro that was clashing with the Binder version. Bug 7991062 Change-Id: If5e6ed0a06d9f67975497676e4b05abe3aa3d6c0
* | | Miscellaneous cleanupGlenn Kasten2013-03-041-3/+3
|/ / | | | | | | | | | | | | | | | | | | Abbreviation framesReady to fRdy for new systrace. Put inline const on one line. Use local copy of mState in state. Improve logging. Line length 100. Change-Id: I8201c3ce0e53fd464fd33d02544e52c342d40b68
* | am c0048178: Merge "Avoid invalid memory access when using extractMetadata()"Marco Nelissen2013-03-011-1/+16
|\ \ | |/ | | | | | | * commit 'c0048178a1d312e7e05557ba99becd6a89b9e97a': Avoid invalid memory access when using extractMetadata()
| * Merge "Avoid invalid memory access when using extractMetadata()"Marco Nelissen2013-03-011-1/+16
| |\
| | * Avoid invalid memory access when using extractMetadata()Sangkyu Lee2013-02-281-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BpMediaMetadataRetriever::extractMetadata() returns a string which is returned by readCString() function of the reply parcel object. However, the parcel object is destroyed at the end of the extractMetadata() function, and so the returned pointer is invalid. This patch fixes this problem by storing the metadata string value. Change-Id: I2a2ccba78246175b2845a237679d6cebe881e83b Signed-off-by: Sangkyu Lee <sk82.lee@lge.com>
* | | am ceb83b8d: Merge "SoftAMR: Signal the right frame format"Andreas Huber2013-02-271-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit 'ceb83b8d8919dc778402bf610c073987d4f9f89b': SoftAMR: Signal the right frame format
| * | Merge "SoftAMR: Signal the right frame format"Andreas Huber2013-02-271-1/+1
| |\ \
| | * | SoftAMR: Signal the right frame formatMartin Storsjo2013-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The correct enum for the format used is OMX_AUDIO_AMRFrameFormatFSF, which is the same as is used in amrnb/enc/SoftAMRNBEncoder.cpp, amrwbenc/SoftAMRWBEncoder.cpp and in OMXCodec and ACodec. The OMX_AUDIO_AMRFrameFormatConformance enum refers to an odd file format only used for conformance tests, not used in the wild. Change-Id: Idc395fc1d4969e33453522d6ec6526876438c526
* | | | am ccf51ec4: Merge "SoftVorbis: Set the right encoding in the port definition"Andreas Huber2013-02-271-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'ccf51ec41652a7e2db8cbee37bca91a95908d5ff': SoftVorbis: Set the right encoding in the port definition
| * | | Merge "SoftVorbis: Set the right encoding in the port definition"Andreas Huber2013-02-271-1/+1
| |\ \ \
| | * | | SoftVorbis: Set the right encoding in the port definitionMartin Storsjo2013-01-311-1/+1
| | | |/ | | |/| | | | | | | | | | | | | | | | | Previously, it set the encoding type to AAC, which is just a typo. Change-Id: I2dcae1f579e9feb0b35b6f5d334028c534275042
* | | | Merge "camera_client: refactor Camera/ProCamera commonalities into ↵Igor Murashkin2013-02-271-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | BasicCamera" into jb-mr2-dev
| * \ \ \ am ceb388d6: CameraService and Stagefright: Support AppOpsEino-Ville Talvala2013-02-268-13/+91
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ceb388d6c03c38b96dc41c0ea4804b749aa077c4': CameraService and Stagefright: Support AppOps
| * | | | | Handles duplicated NAL start code to fix crash on HLS streams.Insun Kang2013-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some youtube live streams are encoded having duplicated NAL start code, for instance, 00 00 01 00 00 00 01 .... In previous code, zero NAL size causes crash by CHECK_GT(nalsize, 0) macro. With this patch, duplicated NAL start code will be just ignored. TESTED=Played problematic Youtube Live streams. Change-Id: I1d76f111a34bd29cb09b037eb1b0626fe5f5b140
* | | | | | am 801726ef: Merge "MPEG4Writer: Write a zero-length compressor string"Andreas Huber2013-02-271-1/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | | * commit '801726efb2dcc6ea19e9f55c7c43fe41f0c6643e': MPEG4Writer: Write a zero-length compressor string
| * | | | Merge "MPEG4Writer: Write a zero-length compressor string"Andreas Huber2013-02-271-1/+2
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | MPEG4Writer: Write a zero-length compressor stringMartin Storsjo2013-01-311-1/+2
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The first byte is the number of bytes in the string to display, the rest is the actual string (see ISO/IEC 14496-12:2008 page 29, compressorname in VisualSampleEntry) to display. Currently, all 31 space characters are displayed in certain players (such as Apple QuickTime Player) instead of the plain codec name (e.g. "H.264"). By writing the string length properly, the actual content of the remaining 31 bytes is ignored instead of displayed. Change-Id: I7f93a8966d74a4e86abc46c3dcb70f71780d9cd6
* | | | CameraService and Stagefright: Support AppOpsEino-Ville Talvala2013-02-258-13/+91
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Camera: - Signal to AppOpsService when camera usage starts and stops - Listen to permissions revocations and act on them - Currently just kill camera connection when permissions lost Stagefright: - Pass on client name, UID to camera as needed Bug: 8181262 Change-Id: I9e33c9d05e9daa77dbb2d795045d08eb887ec8f0
* | | Permit conditional registry of mediaserver extensionsGlenn Kasten2013-02-204-0/+57
| | | | | | | | | | | | Change-Id: I94dc0d038e702dfe1779a50a1de0fae9bad15057
* | | Merge "Refactoring: Rename SurfaceTextureClient to Surface"Mathias Agopian2013-02-159-21/+21
|\ \ \
| * | | Refactoring: Rename SurfaceTextureClient to SurfaceMathias Agopian2013-02-159-21/+21
| | | | | | | | | | | | | | | | Change-Id: I4e8a8b20914cb64edc37abe68233fbc9f2b5d830
* | | | Remove FragmentedMP4ExtractorMarco Nelissen2013-02-155-544/+1
|/ / / | | | | | | | | | | | | | | | MPEG4Extractor now supports fragmented mp4 files. Change-Id: I5659a51f4e5e4407a12535e69238fe3abffda7dc
* | | Add support for fragmented mp4 to MPEG4ExtractorMarco Nelissen2013-02-153-29/+897
| | | | | | | | | | | | | | | | | | | | | This makes FragmentedMP4Extractor obsolete. It will be removed in a separate change. Change-Id: Ida74c07ccf84983e20a1320ee24ffc7a5c083859
* | | Merge "Add OMX.google.vpx.encoder"James Dong2013-02-131-0/+1
|\ \ \
| * | | Add OMX.google.vpx.encoderJames Dong2013-02-121-0/+1
| | | | | | | | | | | | | | | | Change-Id: I843e6e542533884a94e105e1cb56f16f0440af61