summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/AwesomePlayer.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" ↵James Dong2011-05-181-28/+111
|\ | | | | | | into honeycomb-mr2
| * Using widevine:// to stream adaptive bitrate wvm content no longerAndreas Huber2011-05-101-28/+111
| | | | | | | | | | | | | | | | uses stagefright's http cache but defers caching to the WVMExtractor, which now has the responsibility of reporting buffer status/duration. Change-Id: Ieec64a20203977fd0a61d0c6834da124de78bfa2 related-to-bug: 4390283
* | DO NOT MERGEGloria Wang2011-05-131-2/+2
|/ | | | | | | | | | | | | | | | | | | | | | | | For bug 4422428 Squashed commit of the following: commit ae2e13783db2284f40d3891e70e152dab941edfc Author: Gloria Wang <gwang@google.com> Date: Fri May 13 11:43:11 2011 -0700 Add one more DRM error code. For bug 4422428. Change-Id: I4e333f474c96c0e0f162dde4013ad32b336bebd6 commit 0f88249d0cb5221f622cf1d1ac3cdccefb8f58a2 Author: Gloria Wang <gwang@google.com> Date: Fri Apr 29 10:44:46 2011 -0700 Add DRM errors in the DRM frameworks to MediaErrors also. For bug 4350156. Change-Id: Ib5711ec642178a49203a448b7f5114e675d49394 Change-Id: Ia02de462159400eef8c015d28531bf1dd6796a18
* Bug 4167061 remove debugging codeGlenn Kasten2011-04-131-1/+1
| | | | Change-Id: I1cb46a7bbf885c72e75d32f3f7675d90ab611e85
* Enable HDCP debugging in Stagefright (1 of 2)Glenn Kasten2011-04-111-1/+1
| | | | Change-Id: Ia3ea555d5fa45547ed6bfce59f299087ced7809c
* Bug 4167061Glenn Kasten2011-03-301-1/+1
| | | | Change-Id: I9bf7c0f9387ad23501261b8c2d10fa6fdaba8aef
* Make sure we post a video event when seeking after seeing video EOS before.Andreas Huber2011-03-251-2/+17
| | | | | Change-Id: I513bf94c0732a85324160977ea5723d8aafd6aba related-to-bug: 3316960
* Switch to use SF cached sourceJames Dong2011-03-251-6/+1
| | | | | | bug - 3500025 Change-Id: I96c416d39af498f091d2d52f5923f556382a9c1f
* Bug 4159373 Use HDCP debug settingsGlenn Kasten2011-03-231-0/+37
| | | | Change-Id: Iefc0a0d4b574ee94fbc83bf74b57c1d3465c821c
* DO NOT MERGE: Fix a race condition when playing an audio-only stream and ↵Andreas Huber2011-03-161-12/+5
| | | | | | | seeking before starting. Change-Id: I70dfdfb7c27e3c713079c359ef89a570eb600dc7 related-to-bug: 4039068
* Bug 3012968 DRM output controlGlenn Kasten2011-03-101-0/+14
| | | | | | | Modifies Stagefright to verify that there is a hardware-protected path to video sink for DRM content. Change-Id: I18b8741390e803a05a88c7f180b860a24ba88a10
* Merge "Alternate patch for late video issue: seek only the video ahead to ↵Andreas Huber2011-02-241-16/+59
|\ | | | | | | the next"
| * Alternate patch for late video issue: seek only the video ahead to the nextAndreas Huber2011-02-241-16/+59
| | | | | | | | | | | | | | 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-241-1/+18
|\ \
| * | Suppress the logging of URLs when in incognito mode.Andreas Huber2011-02-241-1/+18
| |/ | | | | | | | | Change-Id: Ib951b495eae15669e160ef54686eab0eeb9b366a related-to-bug: 3336575
* | Bug 3438258 Add SurfaceTexture as MediaPlayer sinkGlenn Kasten2011-02-231-6/+19
|/ | | | | | | | | | | | | | 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
* - Add method in MediaPlayerService to collect and pullGloria Wang2011-02-221-1/+43
| | | | | | | codec usage (duration) for the battery app - Collect MediaPlayer decoding usage data Change-Id: I0ef4e32b6a041ba1fe73c19f9c67185c61d03965
* Experimental support for https transfers in stagefright.Andreas Huber2011-02-171-1/+2
| | | | Change-Id: If1bd0f265dda136c7c34b53317f64383023b53a3
* Remove legacy, AwesomePlayer-based http live implementation.Andreas Huber2011-02-161-84/+1
| | | | Change-Id: I455d0faa5612dcd4d2bb6f2b3c7b64a1caaabf69
* Revert "Make AwesomePlayer's reset process more verbose to track down ANRs ↵Andreas Huber2011-02-151-13/+0
| | | | | | | | (yet again)" This reverts commit e7c83d4a711241923854d6bbd5de0e24f9192f93. Change-Id: I5151c7c72d79154528c55aa01bf006c8e38e7af7
* Enable cancelling the rtsp connection process early.Andreas Huber2011-02-141-1/+10
| | | | | Change-Id: Ie2059c54541ad8c675944d71b39c772b0f6f04c8 related-to-bug: 3452699
* Start playing (and decoding) audio only after the first video frame has been ↵Andreas Huber2011-02-111-24/+63
| | | | | | | | | | decoded. if there's both audio and video content. This gives the video decoder an opportunity to fill its internal buffer queue at the start of playback. Change-Id: Ib2c95753b430e4e47207953b913b607024a328d7 related-to-bug: 3431702
* Change timestamp handling in RTSP, remove unused, experimental, gtalk supportAndreas Huber2011-02-101-125/+6
| | | | | | | | related-to-bug: 3216447 NTP timestamp handling is now done at a higher layer than before. Change-Id: I9fb23f1335110ec59e534f9aa0fe6f6a6406dd52
* Add more check before using the DRM manager client.Gloria Wang2011-02-081-3/+6
| | | | Change-Id: I7369dcd6b6abd1945430373200fd5353bca70652
* Merge "- Do not use global DrmManagerClient - Release the DrmManagerClient ↵Gloria Wang2011-02-081-1/+0
|\ | | | | | | and DecryptHandle in DataSource Fix for bug 3429811"
| * - Do not use global DrmManagerClientGloria Wang2011-02-071-1/+0
| | | | | | | | | | | | | | - Release the DrmManagerClient and DecryptHandle in DataSource Fix for bug 3429811 Change-Id: I549f72b75225751877eb0e630ce8098f8ec6316f
* | Display a single (still-)frame of video after seeking while paused.Andreas Huber2011-02-071-29/+37
|/ | | | | Change-Id: Ia78bf29ba6d649043e70c49913725cecdf918c03 related-to-bug: 3392259
* Make AwesomePlayer's reset process more verbose to track down ANRs (yet again)Andreas Huber2011-02-031-0/+13
| | | | Change-Id: Ie1d853c31ad75ec5b12303c1131c9a74eb8cfc9f
* Revert "Make AwesomePlayer's reset process more verbose to track down ANRs ↵Andreas Huber2011-01-281-13/+0
| | | | | | | | | (again)" This reverts commit aac2e9e1566a3bb0ef811ebd3a56b538324c95c1. Change-Id: Ic84dfa829981fdc1a1330ccfe6b9dccf64a80719 related-to-bug: 3392386
* Make AwesomePlayer's reset process more verbose to track down ANRs (again)Andreas Huber2011-01-241-0/+13
| | | | | Change-Id: I0d66994cc4295fd5ceeaaf151ce913ed0dd995f9 related-to-bug: 3362836
* Revert "Make AwesomePlayer's reset process more verbose to track down ANRs."Carl Shapiro2011-01-211-13/+0
| | | | | | | This reverts commit 90c656574175bd54ed8d258f406f158177e5e91c. Bug: 3378444 Change-Id: Id845bc0bc213f18c73fec12e6a2084cb2075c2d9
* Prefill the cache before trying to instantiate the media extractor.Andreas Huber2011-01-191-3/+30
| | | | | | | | | The latter is an operation that otherwise could block on the datasource for a significant amount of time. During that time we'd be unable to abort the preparation phase without this prefill. Change-Id: Ia42496d88a11314386ea8797d665bf4e94871e30 related-to-bug: 3362836
* Fix the presentation video resolution when it is different from the actual ↵James Dong2011-01-191-0/+22
| | | | | | | | image resolution of the video. bug - 3352413 Change-Id: I8f08f3896e9fb90f09119dccdb88b82af60f79f2
* Don't report 100% buffered when the stream ends prematurely.Bryan Mawhinney2011-01-181-4/+9
| | | | Change-Id: Ia4e80d02f28104427a3309e3d5b155faa5702757
* Increase cache size and low-watermark threshold, alsoAndreas Huber2011-01-111-0/+38
| | | | | | | | | MediaPlayer now sends out MEDIA_INFO,MEDIA_INFO_VIDEO_TRACK_LAGGING messages to the JAVA client informing it how much (if at all) the video lags behind audio (arg2 is the media delay in ms). Change-Id: I6933f573d8597a35112e4b5ee0fcb826a7f6ddd1 related-to-bug: 3335220
* Awesomeplayer : Frame dropping logic changepmehendale2011-01-071-6/+12
| | | | | | | | | | | Changed late frame drop policy, now we are dropping only 1 in 8, late (> 40ms) frames. Dropping every late frame result in lot of noticible pauses, usually with peaky bitrate activity these pauses become more prominant. Dropping few frames is still required to allow overall playback chain, to regain the performance. Experimentally decided to drop Max one late frame in 8. Change-Id: If20848d619a76aaf8179b1e5c3155610e3bc85fd
* Make AwesomePlayer's reset process more verbose to track down ANRs.Andreas Huber2011-01-041-0/+14
| | | | | Change-Id: I8c9fa872263796ba61b3e8de6bc05d50f57833f5 related-to-bug: 3302399
* Remove now obsolete implementation of streaming from AwesomePlayer.Andreas Huber2010-12-161-249/+1
| | | | Change-Id: If62bedbf74c8e987d6651604d7bebc9da381e86a
* API Support for both synchronous and queued commands, optionally associated ↵Andreas Huber2010-12-061-48/+86
| | | | | | metadata. Change-Id: Idb90d64cb638942210c5822b3cba2f05b087d601
* Squashed commit of the following:Andreas Huber2010-12-061-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 9254c845d7c82976fd4b8be406ce4b17eeb0e119 Author: Andreas Huber <andih@google.com> Date: Fri Dec 3 15:26:12 2010 -0800 Remove obsolete code from the cached data source. Change-Id: I794b986ac8977cbc834dff189221a636ba564e36 commit 2ee33711064c58c53ba65ed9e63dd4b01ec2380e Author: Andreas Huber <andih@google.com> Date: Fri Dec 3 15:23:13 2010 -0800 LiveSource is dead, long live LiveSession. Change-Id: Ibcd0731ecf9c94f0b3e5db3d53d012d9da2a1c66 commit 9eabb2c3cd8571ab859bdeae0aa7f655c414d8fa Author: Andreas Huber <andih@google.com> Date: Fri Dec 3 12:49:31 2010 -0800 Respect explicitly signalled discontinuities. Change-Id: I3c0c16a2de7a99742d25db7d1b2ff0258de52271 commit 7f7f7b6b906b6ece6e4d43af7fd5f494e805c5e5 Author: Andreas Huber <andih@google.com> Date: Fri Dec 3 11:45:57 2010 -0800 Better protection against syncword emulation in AAC ADTS content. Change-Id: I867e80a4556dd46d24ab3e781177c248a5221719 commit fe765766582efcc350aed01135ea603576adccf6 Author: Andreas Huber <andih@google.com> Date: Fri Dec 3 09:15:59 2010 -0800 New implementation of http live driving code. Change-Id: I31ddf3d6a0d5929b121be704a2b9c3d6775f7737 Change-Id: Id8d1829c8fcb173756965013f848c1d426ef1048
* Squashed commit of the following:Andreas Huber2010-12-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit de99ae4a523ff5ec40b47071f22fdde1a4b2a0bf Author: Andreas Huber <andih@google.com> Date: Thu Dec 2 13:18:40 2010 -0800 Scan for sync words to find H.264 frame/AAC frame boundaries if PES packets do not start with them. Change-Id: If2861982ecb3006fac806105dbfcd1d43c2a4205 commit be23791ff0d037aa7073589cdc8bfc362e1c281d Author: Andreas Huber <andih@google.com> Date: Thu Dec 2 13:12:39 2010 -0800 Properly expand relative key URLs and strip surrounding quotes in the M3UParser. Change-Id: I013a6d83a64f095d090e5c7730298bdac7d03ab4 commit 0f1d8f65effe0cc42a265dd91d8b91dce6534325 Author: Andreas Huber <andih@google.com> Date: Thu Dec 2 13:11:27 2010 -0800 Ugly hack that assumes that any http url containing "m3u8" refers to an httplive stream. Change-Id: I05d7bbc5dab0f9822558122b5b9dc2a109ed8518 commit 255f0d5cdb1072ecd66b47ee614bf574f1388e5a Author: Andreas Huber <andih@google.com> Date: Thu Dec 2 13:10:56 2010 -0800 Add one more mimetype "application/x-mpegurl" to identify httplive playlists. Change-Id: I63fd3b8c2539c9ee23c077df533157af78b10863 Change-Id: I135687383009dbe32d690c9ba8dea60159adc616
* Support streaming data across binder boundaries.Andreas Huber2010-11-231-4/+223
| | | | Change-Id: Ifbac61406dcb81343765f99ccba08bd90f9274cc
* am 3e18dfab: am 4da48ec8: Merge "Notify the playback status to DRM agents ↵Gloria Wang2010-11-221-7/+12
|\ | | | | | | | | | | | | before the playback starts" * commit '3e18dfab3417e139c7ec3896cea9e303fdc8fa63': Notify the playback status to DRM agents before the playback starts
| * am 4da48ec8: Merge "Notify the playback status to DRM agents before the ↵Gloria Wang2010-11-221-7/+12
| |\ | | | | | | | | | | | | | | | | | | playback starts" * commit '4da48ec88338af2df6f9abba850fb4c65918bb82': Notify the playback status to DRM agents before the playback starts
| | * Notify the playback status to DRM agents before the playback startsGloria Wang2010-11-221-7/+12
| | | | | | | | | | | | Change-Id: I288eae2d35ab175c720bb0dd9f69e3e08ada9b8a
| * | resolved conflicts for merge of 31dc911a to gingerbread-plus-aospAndreas Huber2010-11-081-17/+71
| |\ \ | | | | | | | | | | | | Change-Id: I2f51b2120b3c552566d91a7dc498a5e8b130205f
| | * | Support post-decode video rotation.Andreas Huber2010-11-051-17/+71
| | | | | | | | | | | | | | | | Change-Id: Ia371316e73a57e44610de86adce3eaa560afbf84
* | | | Squashed commit of the following:Andreas Huber2010-11-221-218/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 0870f7bdd10a7cd36087d723d1957d8e1b967ca7 Author: Andreas Huber <andih@google.com> Date: Mon Nov 22 12:57:04 2010 -0800 set_surface_crop doesn't seem to work right yet, stop using it in the SoftwareRenderer. Change-Id: If0a24f78b7810a6cecaa82eb4f23d0f90c22cc42 commit 4767b52bee3a54ae117a8708d6832276a44e6a6a Author: Andreas Huber <andih@google.com> Date: Mon Nov 22 11:14:57 2010 -0800 info->mMediaBuffer may still be NULL at this point... Change-Id: I25a71569015b1bb87f1ea7efff7588958774426f commit 0cef79874e1f1ddb10b7402177a87d3cffc7de92 Author: Andreas Huber <andih@google.com> Date: Mon Nov 22 10:55:12 2010 -0800 QCOM's YVU420 color format conversion has now been tested. Change-Id: I7fef4b642a928af15d42f006f7cdc107d5ff1d67 commit 84fe05a6c969ede0ce8a85a530e110afca07c7a7 Author: Andreas Huber <andih@google.com> Date: Mon Nov 22 09:59:50 2010 -0800 Removed remaining traces of suspend/resume. Proper reporting of video dimensions based on cropping rectangle. Change-Id: Ib238b80cbc1f19e7d312f2422eb5e9ab6b06b1bc commit 50970cdc837c5c498bcf0cb61b436196ca9e2ef7 Author: Andreas Huber <andih@google.com> Date: Fri Nov 19 16:11:06 2010 -0800 Revamped Software Renderer respects the crop rectangle. Removed obsolete ADRENO support code. Change-Id: I984cbc8a99c4d97e09e7d1b1292099c88b9ae535 commit 8abbc6a5608bff650f968540f24a2eab75f254ed Author: Andreas Huber <andih@google.com> Date: Fri Nov 19 16:10:41 2010 -0800 The metadata retriever now respects the crop rectangle while capturing a video frame. Change-Id: Id3377176060086d16717f62c77ce26fabe899050 commit 2d42e4466609d304e88bd2cdd6eb7b297340cc21 Author: Andreas Huber <andih@google.com> Date: Fri Nov 19 16:09:50 2010 -0800 Changed ColorConverter APIs to be more general. Clients can now refer to crop rectangles in both source and destination. Change-Id: Ief151d736818396d0389ec04e7df5650e3ad7c04 commit 273184303d54a54febd3e9c3dd4df30507ea78b5 Author: Andreas Huber <andih@google.com> Date: Fri Nov 19 15:04:06 2010 -0800 The stagefright commandline tool now writes the extracted video frame to /sdcard/out.jpg Change-Id: Ieb2ab3fda7a7cd9294beccb8db0eed75096eeef4 commit 2d43390328cadf4ba94c1c3c02e4fb30baa29690 Author: Andreas Huber <andih@google.com> Date: Fri Nov 19 14:36:55 2010 -0800 The AVC software decoder now properly advertises the cropping rectangle. Change-Id: Idb7a8a7e2fde5740f0fc34b7e8c92eca2577104b commit 9a7ed23c2fac8ce19dce7a34a603acee945a89f6 Author: Andreas Huber <andih@google.com> Date: Fri Nov 19 13:40:39 2010 -0800 OMXCodec now signals a format change if the cropping rectangle changes. ...and puts the cropping info into its output format. Change-Id: I3ffbd8e877ba286fe06a82c536ef20d92548d2e2 commit efe0323947029df1c502599ccc288c8d676dfd31 Author: Andreas Huber <andih@google.com> Date: Fri Nov 19 11:29:39 2010 -0800 Stagefright's MetaData object now supports rectangle items. Change-Id: I5667bb5ee6622c76104b99fb57f60abb802a8504 Change-Id: I27cb78f2c5e0353f95fdfc5cb53991949ed75b70
* | | | 64-bit file size/offset support for media frameworkJames Dong2010-11-181-1/+1
| | | | | | | | | | | | | | | | Change-Id: I3452bc2c0f1d990cc67285df2fce1f9f86ff8e10
* | | | Support post-decode video rotation.Andreas Huber2010-11-161-10/+54
| | | | | | | | | | | | | | | | Change-Id: I9ac90871269c5e132e98a9bf3ad8cae00f329f17