summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/include
Commit message (Collapse)AuthorAgeFilesLines
* Switch audio tracks at runtimeJames Dong2012-05-141-0/+9
| | | | | | | | o The switching is not allowed if there is an audio seek operation ongoing. o related-to-bug: 6110705 Change-Id: Ib92a165f3984aa033d97800184d3d17319522db5
* Removed mutex lock in addTextSource, and rename to addTextSource_lEdwin Wong2012-05-021-1/+1
| | | | | | | | to indicate this method needs to be called with a lock hold. Change-Id: I7e99f0a622e7de49c288be09dd4fc955bbca390b related-to-bug: 5629511 related-to-bug: 5542712
* Impl for supporting two video scaling modesJames Dong2012-05-011-0/+3
| | | | | | | | | o allows the video scaling mode to change at any time o also remove the scaling mode logic in OMXCodec.cpp o related-to-bug: 5454345 Change-Id: I6f1714eb0c2774591ce650d56c1e779b8afd085f
* Removed software video encoders that are not OMX-based.James Dong2012-04-302-172/+0
| | | | | | o related-to-bug: 5933287 Change-Id: I63635375e2bef00733b61adc3fa12c29df7e2155
* Merge "Expose an API to run the WV extractor in crypto plugin mode." into jb-devJeff Tinker2012-04-271-0/+7
|\
| * Expose an API to run the WV extractor in crypto plugin mode.Jeff Tinker2012-04-261-0/+7
| | | | | | | | | | | | | | Provides compatibility with the MediaCodec model. Change-Id: I76f2c7d1e9d2cfc3e76b531ac9b2cf66aa6a4327 related-to-bug: 5986621
* | Handle the case when there is no timed text trackJames Dong2012-04-261-1/+0
|/ | | | | | | | o also replaced mTimedTextLock with mLock, since there is no particular reason to use a separate lock for timed text o related-to-bug: 6110705 Change-Id: Ia687e96956692c42d492e57992e5721ca1e8e18b
* Add the ability to query the amount of cached data to NuMediaExtractor.Andreas Huber2012-04-191-3/+3
| | | | | Change-Id: I0966270a2bd36698330beaa03f47d02fc6a40c44 related-to-bug: 6364341
* Fix for multiple audio/timed track feature implementation - part oneJames Dong2012-04-161-1/+10
| | | | | | | | | | | | | | | | o getTrackInfo now returns all tracks, rather than just the timed text tracks. o the index of the track info is kept to the same as the track index if the track is not from an external source o correctly maps the selectTrack() and unselectTrack() calls to the right track index o TODO: 1) note that the selectTrack() and unselectTrack() only works for timed text track at present; 2) the lock is timed text specific o related-to-bug: 6110705 Change-Id: Ib1feeef2184bc992930ace0d1197b6c00a2636d7
* Parse gapless info from mp4 filesMarco Nelissen2012-03-211-0/+4
| | | | Change-Id: I4c83d4e12e996dc29708268e68a4bb74b368c6f3
* Merge "Parse mp3 encoder padding/delay"Marco Nelissen2012-03-202-1/+7
|\
| * Parse mp3 encoder padding/delayMarco Nelissen2012-03-202-1/+7
| | | | | | | | | | | | Get the mp3 encoder padding and delay from a XING frame or iTunSMPB tag. Change-Id: Icde598c8857d7e7c187a718f478ee9799d6a1b8a
* | Remove obsolete software codec header files and amr encoders.Andreas Huber2012-03-1611-746/+0
| | | | | | | | Change-Id: Ifbdf252ee312c9cb5ab29498f1e06dae8f23faf7
* | Merge "Defines MediaPlayer APIs to support multiple audio/video/timedtext ↵James Dong2012-03-141-3/+2
|\ \ | |/ |/| | | tracks."
| * Defines MediaPlayer APIs to support multiple audio/video/timedtextInsun Kang2012-03-151-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tracks. o Newly introduced APIs are (MediaPlayer): getTrackInfo() / addExternalSource() / enableTrack() / disableTrack(). o Timed text tracks are supported only, for now. o TODOs: - Define the audio/video behavior for enableTrack and disableTrack. - Refactoring AwesomePlayer / TimedTextDriver so that all types of track index can be managed in the correct order and be ready for supporting audio/video tracks. (MediaExtractor and MediaSource for text file might be necessary.) Change-Id: Idb85e1b3f2ed49a64f377d05472dd6663ce94e07
* | Fix Xing seeking when TOC[0] == 0Marco Nelissen2012-03-141-1/+2
|/ | | | | | | | | | A file purchased from the Amazon mp3 store had two 0 entries at the start of the TOC (presumably because there was a lot of silence at the beginning, which compresses well), which made TOC based seeking think the TOC was not valid. b/6170518 Change-Id: Ie7135b4af06ebb925f63a374be780cf3a9404347
* Extend WAV extractor for multichannelJean-Michel Trivi2012-03-091-0/+1
| | | | | | | Support multichannel (more than 2) audio in WAV. Support WAV_EXT format. Change-Id: If0e6cf28cb3096f4f148ff6583f7e01db8f8a901
* Merge "Fix videos app bandwidth accounting for 4G streaming"Jeff Tinker2012-03-081-0/+3
|\
| * Fix videos app bandwidth accounting for 4G streamingJeff Tinker2012-02-141-0/+3
| | | | | | | | | | | | | | | | | | | | Register the app uid with the WV extractor so it can attribute bandwidth usage to the proper process. Multi-repository commit, also changes in vendor/widevine Change-Id: I42395fd08bf0bfc7e224745f820a714400066456 related-to-bug: 5434244
* | remove dependency on android_native{s_priv|buffer}.hMathias Agopian2012-02-241-1/+1
|/ | | | Change-Id: Ie4b95f7061c240f37c504414259f92d72c4ffc89
* Change the signature of method addTextSource() in AwesomePlayerJames Dong2012-02-091-1/+1
| | | | | | o avoid a unnecessary copy constructor call Change-Id: Ib598bbe42d42a835549e2d29502c6f196f859874
* Merge "First step of refactoring 'timedtext' code."James Dong2012-01-311-3/+2
|\
| * First step of refactoring 'timedtext' code.Insun Kang2012-01-311-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Goal 1. Removed dependency of TimedTextPlayer on AwsomePlayer. 2. Generalized TimedTextParser to TimedTextSource and its subclasses. Summary 1. Introduced TimedTextDriver, TimedTextPlayer (new implementation), TimedTextSource (and its subclasses). 2. Removed TimedTextParser. Remaining TODOs 1. Revise VideoVidew, Gallery3D app, AwesomePlayer to check if 'pause' and 'resume' works well. 2. Consider revising MediaPlayer APIs such as setParameter() -> addTextSource(). Need more thoughts. Change-Id: Ie0c4f15b9690102de755cef6940f8c31ccf78e27
* | Slighly improve the API to discover if the OMX stack is running in the localAndreas Huber2012-01-311-1/+1
|/ | | | | | process. Change-Id: Idd3c2f0d4a9542af01a3fdfd3b0bfab90e083505
* Make sure the ThrottledSource reports the proper mime typeAndreas Huber2012-01-191-0/+5
| | | | | | of the underlying source. Change-Id: I7cfd5c9f10d4b07781ed82fbdc9bf3db2e86cf84
* Separate sniffing from session initializationJames Dong2012-01-124-2/+11
| | | | | | | | | | | | This avoid lengthy/duplicate sniffing for drm plugins when a decrypt session is opened o The change is backward compatibile in that no update is required for existing drm plug-ins if they do not plan to provide separate sniffer/extractor related-to-bug: 5725548 Change-Id: I7fc4caf82d77472da4e2bc7b5d31060fb54fd84c
* am 3f6a7d1e: am d70c64db: Revert the following patches because they may lead ↵James Dong2011-12-141-8/+0
|\ | | | | | | | | | | | | to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b. * commit '3f6a7d1ee961a4544563932b7499535dc1cac1ec': Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.
| * Revert the following patches because they may lead to power regression ↵James Dong2011-12-141-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b. 2. Revert "Fixed the false drm recognition." This reverts commit aadbd80b307c817698ce5110ff8e002804d1b230. 3. Revert "Fix drm enumeration order, resolves failure to play forward lock ringtones" This reverts commit a5cbf023e349f2394ba6fc58d73b4375cfec4369. 4. Revert "Fix ANRs due to Widevine DRM plugin sniff taking too long." This reverts commit d0d19db1ca1c289b069db33f4665bcb9386064e9. As a result of the reverting, many ANRs from WV sniffing are back. related-to-bug: 5739618
* | am a5038d16: am a693a4b5: Merge "Fix ANRs due to Widevine DRM plugin sniff ↵Jeff Tinker2011-12-091-0/+8
|\ \ | |/ | | | | | | | | | | taking too long." into ics-mr1 * commit 'a5038d169f47b2e2278c0056495dfd4808803f8a': Fix ANRs due to Widevine DRM plugin sniff taking too long.
| * Fix ANRs due to Widevine DRM plugin sniff taking too long.Jeff Tinker2011-12-071-0/+8
| | | | | | | | | | | | | | | | Add a Widevine-specific format sniffer to avoid having to refetch data from the remote server. Change-Id: I5fdb21fe7a0d6e74f2a6f06e6fbf8070b068ac60 related-to-bug: 5725548
* | Allow data uris to be data sourcesNarayan Kamath2011-12-061-0/+76
| | | | | | | | | | bug:5571010 Change-Id: I0b6ae6c729ac34d46e9990fcceb08294eb4f7c58
* | am 624efe45: am c1b1709b: Merge "Make sure not to cancel pending seek/EOS ↵Andreas Huber2011-11-171-1/+1
|\ \ | |/ | | | | | | | | | | notifications on a cache underrun..." into ics-mr1 * commit '624efe45671131903fb5165f6133ba39486092ab': Make sure not to cancel pending seek/EOS notifications on a cache underrun...
| * Make sure not to cancel pending seek/EOS notifications on a cache underrun...Andreas Huber2011-11-161-1/+1
| | | | | | | | | | | | | | or they are lost for good. Change-Id: I2f9f53efb05db4077961137c9dc8c27edac4ec62 related-to-bug: 5544907
* | resolved conflicts for merge of 26f70db9 to masterAndreas Huber2011-11-081-2/+0
|\ \ | |/ | | | | Change-Id: Ib1536b1a4c9eeff80e0726b3e61cee12057cd120
| * Remove surface legacy APIs and code.Andreas Huber2011-10-281-2/+0
| | | | | | | | | | | | All surfaces are now supported through surface textures. Change-Id: I95dd823e7099c0c32a48a1121624149dcc29d9c6
* | Properly decode ADTS files with ID3 headers.Andreas Huber2011-11-011-1/+1
| | | | | | | | Change-Id: I55247e79ac9cc9547e3e0f6fe048bcbdc9b639d1
* | Support new HLS byte-range extensionsAndreas Huber2011-10-312-1/+8
|/ | | | Change-Id: Ic767ddea93ffcb87d83b8fbc20837486648da3d7
* am 23d64420: Merge "Stagefright: idle OMX after ANW errors" into ics-mr0Dave Burke2011-10-192-0/+5
|\ | | | | | | | | * commit '23d644202a44383bf008ff86f6faa3ea7e447290': Stagefright: idle OMX after ANW errors
| * Stagefright: idle OMX after ANW errorsJamie Gennis2011-10-192-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fixes an issue in Stagefright where the state of an OMXCodec object can get out of sync with the state of the OMX component. In particular, if one of the ANativeWindow functions failed and put the OMXCodec into the ERROR state, this would cause Stagefright to skip doing the Executing -> Idle transition. Without this transition the freeBuffersOnPort call would never be made, and the MediaBuffers would end up being leaked (which would also leak the Gralloc buffers they reference). Bug: 5333695 Change-Id: I85ea0cf92d18e7ef6d35c7d1e2a7b4e2c9745d34
* | NuPlayer is now taking on the task of streaming over RTSP.Andreas Huber2011-10-132-107/+0
| | | | | | | | Change-Id: Ie204db8810807f1e7981959e34dc0149e5d9563a
* | Merge "Support for an MPEG2 Program Stream extractor."Andreas Huber2011-10-131-0/+80
|\ \ | |/ |/|
| * Support for an MPEG2 Program Stream extractor.Andreas Huber2011-09-301-0/+80
| | | | | | | | Change-Id: I606d87c278f72b22a5b6d7ee57bce6b02e280d41
* | YouTube can now request custom cache/prefetch parameters and ↵Andreas Huber2011-10-101-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | disconnect-at-highwater through the use of pseudo http headers specified in the setDataSource call. x-cache-config: -1/-1/0 x-disconnect-at-highwatermark: 1 turns off keep-alives and disconnects every time the cache is full (will attempt to reconnect once it run below lowwater mark) related-to-bug: 5433309 Change-Id: Id2f942fc956e0e156834cfcd6bb08dae6a29fae1
* | Allow a system property "media.stagefright.cache-params" to override ↵Andreas Huber2011-10-061-4/+13
|/ | | | | | | | | | | | | | | | | cache/prefetcher default parameters. To override specify a property adb shell setprop media.stagefright.cache-params "4096/20480/15" to set the low water threshold to 4096 KB, the high water threshold to 20 MB and the keepalive interval to 15 secs. if high and/or lowwater mark are negative, the default values are used for the respective value. if keep-alive interval is 0, keep-alives are disabled. Change-Id: I89a4a06836e4a2f473d7a92b567ab07818c2f87d
* Support even more .avi files with .mp3 content not aligned to chunk boundariesAndreas Huber2011-09-231-0/+5
| | | | | Change-Id: I3ace4118e2e519648c23c51d0b699ba0d7511a5d related-to-bug: 5349382
* Support some .avi files containing H.264 video, log warnings if audio/video ↵Andreas Huber2011-09-211-0/+1
| | | | | | | unsupported Change-Id: Ie7280f25f2bd19f32234c08673e64ceb65833677 related-to-bug: 5349382
* Remove an O(n^2) algorithm in MPEG4Extractor.cpp to speed up seeks in long ↵Andreas Huber2011-09-191-2/+4
| | | | | | | | | streams containing B-frames. Change-Id: Ie4dc734d2c2d5a5ce84674bb883f4b27e2278642 related-to-bug: 5336497
* In order to recover from video lagging behind audio, drop avc framesAndreas Huber2011-09-161-0/+1
| | | | | | that are not referenced by other frames before feeding them into the decoder. Change-Id: I822190af8f8329567bff8da1ea23136d0a765481
* Support .avi tracks that have a sample size of 1, i.e. samples != chunksAndreas Huber2011-09-131-1/+10
| | | | | | | | Assume for now that all chunks are the same size, i.e. have the same number of samples. Change-Id: Ib8a7dfeb16cc3e5be199ff9d98b68dd0b9c23eb8 related-to-bug: 5279872
* Guard the audio notifications with a separate lock to avoid deadlocks during ↵Andreas Huber2011-09-011-2/+2
| | | | | | | reset. Change-Id: I9a97372e1f777d1cbd6774cac2ed34b4b8cd9392 related-to-bug: 5179827