summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Get rid of redundant media profilesJames Dong2011-03-011-6/+172
| | | | | | bug - 3330679 Change-Id: Idc55aea32746c0c57552c5e15a289681421aa859
* Merge "Stagefright: Query buffer usage from the component."Jamie Gennis2011-03-012-4/+18
|\
| * Stagefright: Query buffer usage from the component.Jamie Gennis2011-02-282-5/+18
| | | | | | | | | | | | | | | | This change makes Stagefright query the gralloc buffer usage flags from the OMX IL component and passing those flags on to the ANativeWindow. Change-Id: Ic9af8a9e6df9ff4aadc7355890324d68841bc488 Related-Bug: 3479027
* | Merge "Add an OMX IL API for querying buffer usage flags."Jamie Gennis2011-03-015-0/+79
|\ \ | |/
| * Add an OMX IL API for querying buffer usage flags.Jamie Gennis2011-02-285-0/+79
| | | | | | | | | | | | | | | | | | | | This change defines an OpenMAX IL API for querying from the IL component the gralloc buffer usage flags that should be used to allocate the buffers. It also adds the Stagefright plumbing for using the new OMX IL API. Change-Id: I046b5e7be70ce61e2a921dcdc6e3aa9324d19ea6 Related-Bug: 3479027
* | Merge "Fix error recovery in Stagefright init."Jamie Gennis2011-03-012-32/+27
|\ \
| * | Fix error recovery in Stagefright init.Jamie Gennis2011-02-282-32/+27
| | | | | | | | | | | | | | | | | | | | | | | | This change fixes the error path of OMXCodec::allocateOutputBuffersFromNativeWindow so that it cancels the correct number of buffers if a dequeueBuffer operation fails. Change-Id: Ib7cdcdf24f1718bc070ad218a5980949c0e942eb
* | | Merge "The color conversion from YUV420Planar to RGB only requires the image ↵James Dong2011-02-281-1/+1
|\ \ \ | |_|/ |/| | | | | width to be a multiple of 2, not 4."
| * | The color conversion from YUV420Planar to RGB only requires the image width ↵James Dong2011-02-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | to be a multiple of 2, not 4. bug - 3379293 Change-Id: I8960737f0604b54ce90dfc26137f1582073b4ab2
* | | Bug 3447027 Limit previews for DRM videoGlenn Kasten2011-02-283-11/+25
| |/ |/| | | | | Change-Id: I5b15cf6a15623cf73f007c59143ab5e3fa5a07e8
* | mp4a box contains mp3 audio when the object type indication is 0x6bJames Dong2011-02-251-0/+8
| | | | | | | | | | | | | | | | | | | | In this case, the MediaExtractor returns ERROR_UNSUPPORTED since our software MP3 audio decoder may not be able to handle packetized MP3 audio. bug - 3377570 Change-Id: I8bb6b3813716b5fa019e318842e8e1908b3c8bf8
* | Merge "Alternate patch for late video issue: seek only the video ahead to ↵Andreas Huber2011-02-242-17/+66
|\ \ | | | | | | | | | the next"
| * | Alternate patch for late video issue: seek only the video ahead to the nextAndreas Huber2011-02-242-17/+66
| | | | | | | | | | | | | | | | | | | | | syncframe after the current audio media position, leave audio untouched. Change-Id: Ia9fa8e205467e5460c8219afd396bddd09fcfb46 related-to-bug: 3375737
* | | Merge "Suppress the logging of URLs when in incognito mode."Andreas Huber2011-02-2410-15/+77
|\ \ \
| * | | Suppress the logging of URLs when in incognito mode.Andreas Huber2011-02-2410-15/+77
| |/ / | | | | | | | | | | | | Change-Id: Ib951b495eae15669e160ef54686eab0eeb9b366a related-to-bug: 3336575
* | | Merge "Bug 3438258 Add SurfaceTexture as MediaPlayer sink"Glenn Kasten2011-02-2422-40/+151
|\ \ \
| * | | Bug 3438258 Add SurfaceTexture as MediaPlayer sinkGlenn Kasten2011-02-2322-40/+151
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change enables the use of a SurfaceTexture in place of a Surface as the video sink for an android.media.MediaPlayer. The new API MediaPlayer.setTexture is currently hidden. This includes: - New Java and C++ interfaces - C++ plumbing and implementation (JNI, Binder) - Stagefright AwesomePlayer and NuPlayer use ANativeWindow (either Surface or SurfaceTextureClient) Change-Id: I2b568bee143d9eaf3dfc6cc4533c1bebbd5afc51
* | | | Fix MP3ExtractorJames Dong2011-02-241-5/+13
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the temp buffer wraps around, the next read position should start from what have been read to avoid reading the same remaining bytes in the buffer again. o also fix some of the formatting string for logging bug - 3482444 Change-Id: Ie0b56f4691ff9e80a48a57f1b7d0d28c78cfb313
* | | Merge "Don't crash when parsing DRM MIME types"Glenn Kasten2011-02-241-5/+12
|\ \ \
| * | | Don't crash when parsing DRM MIME typesGlenn Kasten2011-02-181-5/+12
| | | | | | | | | | | | | | | | Change-Id: I414897c911a6588061ddbb5f05c574e78162dca9
* | | | d263 may contain optional bitr box, and thus its size can be up to 23 bytesJames Dong2011-02-231-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | bug - 3482703 Change-Id: Id6fdf9d1f4a304954c018b67d50bd79a07164687
* | | | Merge "Remove RefBase.h dependency on TextOutput.h"Mathias Agopian2011-02-236-0/+6
|\ \ \ \
| * | | | Remove RefBase.h dependency on TextOutput.hMathias Agopian2011-02-226-0/+6
| | | | | | | | | | | | | | | | | | | | Change-Id: I72cd6b98ef82b4868fe1c8ec87862cf43fb4ee73
* | | | | Merge "To collect the total usage time of encoders in the media recorder"Gloria Wang2011-02-232-7/+81
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | To collect the total usage time of encoders in the media recorderGloria Wang2011-02-232-7/+81
| | | | | | | | | | | | | | | | | | | | Change-Id: I94c9c94dec6bd714a3ebf96b4465b94f069e55b8
* | | | | Merge "Application-managed callback buffer support for raw image"James Dong2011-02-231-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Application-managed callback buffer support for raw imageJames Dong2011-02-221-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | bug - 3292153 Change-Id: I9789f7c5cde3a3889d7375e881181e9152d95fc2
* | | | Merge "- Add method in MediaPlayerService to collect and pull codec usage ↵Gloria Wang2011-02-234-2/+186
|\ \ \ \ | |/ / / |/| | | | | | | (duration) for the battery app - Collect MediaPlayer decoding usage data"
| * | | - Add method in MediaPlayerService to collect and pullGloria Wang2011-02-224-2/+186
| |/ / | | | | | | | | | | | | | | | | | | codec usage (duration) for the battery app - Collect MediaPlayer decoding usage data Change-Id: I0ef4e32b6a041ba1fe73c19f9c67185c61d03965
* | | Merge "Remove mkvparser code from /frameworks/base"James Dong2011-02-223-5073/+3
|\ \ \
| * | | Remove mkvparser code from /frameworks/baseJames Dong2011-02-223-5073/+3
| |/ / | | | | | | | | | | | | | | | bug - 3322129 Change-Id: I94dca6234ce57c9a32290aa7ac4885b0a2f566a9
* | | Support for PCMA and PCMU raw audio data in RTP/RTSP.Andreas Huber2011-02-225-0/+210
| | | | | | | | | | | | | | | Change-Id: Icb87bdfa7cf572c572e2a86c46fa072d9fad18f6 related-to-bug: 3084183
* | | MTP: Add support for dynamically adding and removing storage unitsMike Lockwood2011-02-225-25/+95
| | | | | | | | | | | | | | | | | | BUG: 3402847 Change-Id: I7da266061d949abcb6bb11c6faaa47b5e4a2a977
* | | Merge "Support more MPEG4-LATM audio functionality."Andreas Huber2011-02-223-12/+76
|\ \ \
| * | | Support more MPEG4-LATM audio functionality.Andreas Huber2011-02-223-12/+76
| |/ / | | | | | | | | | | | | | | | | | | related-to-bug: 3474610 Change-Id: I6dab40e8b465922c62be9ee7f168718822c6caac Now skipping extra header that the spec claimed shouldn't be present in LATM...
* | | Check file descriptor before passing it through binder callsJames Dong2011-02-221-0/+11
|/ / | | | | | | | | | | bug - 3476613 Change-Id: I858933fd2fe4c095c0bd58bf50344c47fc104be9
* | Merge "Experimental support for https transfers in stagefright."Andreas Huber2011-02-178-22/+133
|\ \
| * | Experimental support for https transfers in stagefright.Andreas Huber2011-02-178-22/+133
| | | | | | | | | | | | Change-Id: If1bd0f265dda136c7c34b53317f64383023b53a3
* | | A/V synchronization at the beginning of a recording sessionJames Dong2011-02-173-29/+54
|/ / | | | | | | | | | | | | | | | | | | | | | | | | o do not use edts/elst boxes since these optional boxes are ignored o manipulate the first video/audio frame duration to make sure that the rest of the audio/video is in sync (ideally, we should only manipulate the vidoe frame duration, not the audio) o reduce the initial audio mute/suppression period, which is used to eliminate the "recording" sound. bug - 3405882 and 3362703 Change-Id: Ib0acfb4f3843b365157288951dc122b006299c18
* | Merge "Respond to RTSP server->client requests."Andreas Huber2011-02-162-7/+83
|\ \
| * | Respond to RTSP server->client requests.Andreas Huber2011-02-162-7/+83
| | | | | | | | | | | | | | | | | | | | | Even if it's just to tell them that we don't support any (this is optional). Change-Id: I557865ac00d0fb65ffa69363eb1eceaabe522a1a related-to-bug: 3353752
* | | Decouple AudioRecord read and audio encodingJames Dong2011-02-161-128/+145
|/ / | | | | | | | | | | bug - 3313754 Change-Id: I951dd0e21e34aa1412c391f003bc32103d0424b0
* | Remove legacy, AwesomePlayer-based http live implementation.Andreas Huber2011-02-167-136/+9
| | | | | | | | Change-Id: I455d0faa5612dcd4d2bb6f2b3c7b64a1caaabf69
* | Merge "Add AAC extractor"Gloria Wang2011-02-1510-52/+442
|\ \
| * | Add AAC extractorGloria Wang2011-02-1510-52/+442
| | | | | | | | | | | | Change-Id: Iedb08525ac72e65ba98e5c791734da0720a0e3f6
* | | Revert "Make AwesomePlayer's reset process more verbose to track down ANRs ↵Andreas Huber2011-02-152-14/+1
| | | | | | | | | | | | | | | | | | | | | | | | (yet again)" This reverts commit e7c83d4a711241923854d6bbd5de0e24f9192f93. Change-Id: I5151c7c72d79154528c55aa01bf006c8e38e7af7
* | | Merge "Derive the Transport "source" attribute from the RTSP endpoint ↵Andreas Huber2011-02-151-23/+42
|\ \ \ | | | | | | | | | | | | address if necessary"
| * | | Derive the Transport "source" attribute from the RTSP endpoint address if ↵Andreas Huber2011-02-151-23/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | necessary and continue even if we were unable to poke a hole into the firewall. related-to-bug: 3457201 Change-Id: I0a523f38e6959bf00b8b140a70bb65fcc414c9c1
* | | | Merge "Work around several issues with non-compliant RTSP servers."Andreas Huber2011-02-156-25/+89
|\ \ \ \ | |/ / /
| * | | Work around several issues with non-compliant RTSP servers.Andreas Huber2011-02-156-25/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In this particular case these RTSP servers were implemented as local services, retransmitting live streams via a local RTSP server instance. They picked wrong rtp/rtcp port pairs (odd rtp port), blank lines in the session description, wrong case of the format description, relative base URLs... Change-Id: I63fa90ca2398f19e8b52c147248bd2c5c2372426 related-to-bug: 3452103