summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/nuplayer
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | Updated (internal) API for IStreamSource to signal discontinuitiesAndreas Huber2011-11-291-6/+11
| | |/ | | | | | | | | | | | | Change-Id: Idd4b9d8e7cec16b3e3c91c70e75144d42be30f96 related-to-bug: 5553055
* | | resolved conflicts for merge of 998a929a to masterAndreas Huber2011-11-292-20/+59
|\ \ \ | |/ / | | | | | | Change-Id: Id5cfbcf20e5ec28782cc88075040cf9edebfdfe8
| * | Finer granularity discontinuity support.Andreas Huber2011-11-282-20/+59
| |/ | | | | | | | | | | | | | | No clients can signal a format change on either audio or video track (or both) and a time discontinuity (timestamps changed) independantly. Change-Id: I3e6cf4e7c260e85759879d61a9b517f68431c22f related-to-bug: 5553055
| * am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop before" ↵Glenn Kasten2011-11-091-1/+1
| |\ | | | | | | | | | | | | | | | | | | into ics-mr0 * commit '19998120f53caceb620f138c6eea182f1e693660': Bug 5478024 drop after decode if can't drop before
* | \ am bb1b7d5c: am 19998120: Merge "Bug 5478024 drop after decode if can\'t ↵Glenn Kasten2011-11-091-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | drop before" into ics-mr0 * commit 'bb1b7d5cb3c5502484269bfd0cdcd0d5a6d6bfad': Bug 5478024 drop after decode if can't drop before
| * \ \ am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop before" ↵Glenn Kasten2011-11-091-1/+1
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | into ics-mr0 * commit '19998120f53caceb620f138c6eea182f1e693660': Bug 5478024 drop after decode if can't drop before
| | * Bug 5478024 drop after decode if can't drop beforeGlenn Kasten2011-11-041-1/+1
| | | | | | | | | | | | Change-Id: Iaa64553be1a710da5d42be4e3a1e1d6dc873e371
| | * DO NOT MERGE Poll input data with a small timeout and don't consume a full core.Andreas Huber2011-11-031-1/+1
| | | | | | | | | | | | | | | Change-Id: I3c288698920fe6ead0df24a52330483609821a41 related-to-bug: 5549263
* | | resolved conflicts for merge of 26f70db9 to masterAndreas Huber2011-11-084-14/+0
|\ \ \ | |/ / | | | | | | Change-Id: Ib1536b1a4c9eeff80e0726b3e61cee12057cd120
| * | Merge "Remove surface legacy APIs and code." into ics-mr1Andreas Huber2011-11-084-14/+0
| |\ \
| | * | Remove surface legacy APIs and code.Andreas Huber2011-10-284-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | All surfaces are now supported through surface textures. Change-Id: I95dd823e7099c0c32a48a1121624149dcc29d9c6
* | | | am e395f645: Poll input data with a small timeout and don\'t consume a full ↵Andreas Huber2011-11-031-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | core. * commit 'e395f645aa4c30a4fad8beb3da6f8fad72338617': Poll input data with a small timeout and don't consume a full core.
| * | | Poll input data with a small timeout and don't consume a full core.Andreas Huber2011-11-031-1/+1
| |/ / | | | | | | | | | | | | Change-Id: I3c288698920fe6ead0df24a52330483609821a41 related-to-bug: 5549263
* | | am 27ed1249: Merge "Properly report that we\'re no longer playing after ↵Andreas Huber2011-10-283-4/+17
|\ \ \ | |/ / | | | | | | | | | | | | | | | receiving event" into ics-mr1 * commit '27ed12492dfbec6ec67b66ff3cf60febce370b01': Properly report that we're no longer playing after receiving event
| * | Properly report that we're no longer playing after receiving eventAndreas Huber2011-10-263-4/+17
| | | | | | | | | | | | | | | | | | MEDIA_PLAYBACK_COMPLETE or MEDIA_ERROR. Change-Id: I03eeba751d3728adb33d9c66de4c7444a91696f3
* | | Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGESteve Block2011-10-262-30/+30
|/ / | | | | | | | | | | | | See https://android-git.corp.google.com/g/#/c/143865 Bug: 5449033 Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
* | NuPlayer is now taking on the task of streaming over RTSP.Andreas Huber2011-10-137-3/+487
|/ | | | Change-Id: Ie204db8810807f1e7981959e34dc0149e5d9563a
* Signal an appropriate error even if there are no active streams yet.Andreas Huber2011-09-276-27/+32
| | | | | Change-Id: I3ac1053ad288558b62ee18056dfd0a9ce0da8f49 related-to-bug: 5372901
* Propagate error signalled by the source all the way to the output EOS ↵Andreas Huber2011-09-262-3/+18
| | | | | | | notification. Change-Id: I30e959a6d669f09745c59fbdebee08f869511cf7 related-to-bug: 5372901
* Bug 5234242 audio continues after discontinuityGlenn Kasten2011-09-211-2/+2
| | | | | | Reduce to 8 buffers of 10 packets from 16 buffers of 20 packets. Change-Id: Ifdb5e15535989fbb6e5e1b70d5f9f71dc66a5c83
* In order to recover from video lagging behind audio, drop avc framesAndreas Huber2011-09-166-44/+132
| | | | | | that are not referenced by other frames before feeding them into the decoder. Change-Id: I822190af8f8329567bff8da1ea23136d0a765481
* Various improvements to nuplayer playbackAndreas Huber2011-09-167-56/+102
| | | | | | | | | | | | | | | | | | | | - Drastically cut down the number of times we supply the AudioSink with data by estimating the time until the sink would run out of data and then scheduling a refill in advance of that. - Use a dedicated looper for video decoders since they are currently taking too long to return from OMX_FillThisBuffer (bug 5325201) - Revise thread priorities for the OMX dispatcher and software codecs, instead of running them at ANDROID_PRIORITY_AUDIO, they now only run at ANDROID_PRIORITY_FOREGROUND - Since threads created by pthread_create inherit all of the parent threads attributes including thread priority, briefly reset thread priority to ANDROID_PRIORITY_FOREGROUND before instantiating OMX components and then restore it. Change-Id: If9332a3a20dad5485333d68c11de0d2d5d3fffc3
* Don't post position updates too frequentlyAndreas Huber2011-09-132-3/+17
| | | | | | | i.e. don't hog my message queue. related-to-bug: 5284760 Change-Id: I8e2d36a11dbee1567b18ed13dc5257a65c6eeda7
* I have one HLS stream that switches stream PIDs from one bandwidth to the nextAndreas Huber2011-08-312-2/+17
| | | | | | | this change intends to support its very limited case and signals an error in all other cases of unexpected PID changes that we cannot recover from. Change-Id: Icbfdf9fe7461969e2a8781ed416f54d891dd789a
* Discontinuities are only signalled on streams that have been identified, i.e.Andreas Huber2011-08-311-0/+13
| | | | | | | | | | | | | those that have a queue. This ensures that the player doesn't observe discontinuities that don't match up across streams. Also, make sure output buffers arriving from the decoder to be rendered are sent back to the decoder if we started flushing. Finally, don't parse TS packets for streams we don't support. And don't allocate memory for them. Change-Id: I708e0de4cba8110a62e4c8ceb1e5702430d5d2bb
* ATSParser now supports a mode in which PTS is considered to be absolute timeAndreas Huber2011-08-301-1/+1
| | | | | | i.e. PTS 0 <=> media time 0 Change-Id: If10a0f98c129b95e8430dc419664b1def92e547e
* Signal errors to the client instead of asserting in ACodec.Andreas Huber2011-08-262-19/+32
| | | | | | Also make sure NuPlayer can properly shutdown in certain edge cases. Change-Id: Iceb16d600d87ba66c802e60e95bf62f66487a453
* Error handling in ACodec and Nuplayer.Andreas Huber2011-08-163-18/+35
| | | | | | | Codec errors (and codec not found errors) now trigger a controlled shutdown of playback and signal errors to the MediaPlayer client. Change-Id: I2ee23ff2a1422d05a1a21e50ecb87d7c7ab958cc
* Fix seek behaviour at startup and teardown of media session that hasn't been ↵Andreas Huber2011-07-152-3/+11
| | | | | | | | started Nuplayer specific. Change-Id: I7b0be52c29bdb7032414d63c503d686df7844bf6
* Enable signalling of a stream discontinuity involving a format-changeAndreas Huber2011-07-131-2/+11
| | | | | | | through IStreamListener. Change-Id: Ic0409cdc4891ad26b61f2f98bdda3c7fb2e2de6a related-to-bug: 5022434
* Charge network traffic to the uid of the process using the MediaPlayer.Andreas Huber2011-07-016-5/+31
| | | | | Change-Id: I2bcb54b8232afd3fc7ee16289f37c7a7b3f23067 related-to-bug: 4517282
* Support mpeg1,2 audio and mpeg1,2,4 video content extraction from .ts streams.Andreas Huber2011-05-252-4/+4
| | | | Change-Id: I9d2ee63495f161e30daba7c3aab16cb9d8ced6a5
* The decoder wrapper is no longer needed. Also disable building old-style ↵Andreas Huber2011-05-125-691/+4
| | | | | | decoders. Change-Id: Ie022f1a6dffe619c1b0385aa13f63e097282cfe4
* Add setParameter/getParameter to MediaPlayer API.Gloria Wang2011-04-292-0/+10
| | | | | | for bug 1982947 Change-Id: If3f40e4f18cbba155af29944af38bdc627f8cd53
* Add extra headers specified in the media player's setDataSource callAndreas Huber2011-04-203-19/+28
| | | | | | | to all http requests made by the http live implementation. Change-Id: I9dd78bb261bc678ea98c82009ca2634b74f3cd58 related-to-bug: 4315346
* Fix issue 3483718: audio streaming and A2DP.Eric Laurent2011-03-211-9/+12
| | | | | | | | | | | | | | | | | | | | The problem is that when switching from A2DP to device speakers or headset, The AudioTrack binder interface to AudioFlinger must be destroyed and restored to accomodate new buffer size requirements. Current AudioTrack implementation did not restore properly the PCM buffer write index which caused a mismatch between the written frame count in the mediaplayer renderer and the AudioTrack. The renderer could then believe the AudioTrack buffer was full and stop writing data preventing the AudioTrack to reach a bufffer full condition and resume playback. The rendered was also modified to refresh the AudioTrack frame count (buffer size) inside the write loop in NuPlayer::Renderer::onDrainAudioQueue() as this count can change from one write to the next. Also modified AudioTrack::obtainBuffer() to check for track invalidated status before querying for available space in the buffer. This avoids writing to the old track's buffer until full before detecting the invalidated condition and create a new track. Change-Id: I16a857e464e466880847f52f640820aa271539ad
* Allow optional specification of a PTS timestamp when signalling a discontinuity.Andreas Huber2011-03-026-6/+67
| | | | | | | If present, rendering will be suppressed until reaching the timestamp. Change-Id: Ic64bdf4225063c5a4d042ea9809960b843a46d19 related-to-bug: 3489454
* Merge "Suppress the logging of URLs when in incognito mode."Andreas Huber2011-02-243-4/+22
|\
| * Suppress the logging of URLs when in incognito mode.Andreas Huber2011-02-243-4/+22
| | | | | | | | | | Change-Id: Ib951b495eae15669e160ef54686eab0eeb9b366a related-to-bug: 3336575
* | Bug 3438258 Add SurfaceTexture as MediaPlayer sinkGlenn Kasten2011-02-236-15/+41
|/ | | | | | | | | | | | | | 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
* Some tweaks to HTTP live / nuplayer behaviourAndreas Huber2011-01-211-3/+9
| | | | | | | | | | - play audio-only streams again - workaround for malformed streams that switch PIDs across bandwidths - attempt to pick a different bandwidth stream if the previously chosen one appears to be malformed/unsupported. Change-Id: I426d0a40dc725aa242f619d4c9d048b69aca55c9 related-to-bug: 2368598
* Implement missing pause/resume support for NuPlayer.Andreas Huber2011-01-204-5/+85
| | | | | Change-Id: Ia3f1ce521dd4b70e134ef03aa7c9db8e8d39a134 related-to-bug: 2368598
* NuPlayer now properly sends MEDIA_SET_VIDEOSIZE notifications.Andreas Huber2011-01-102-12/+45
| | | | | Change-Id: I99b4223ad6ecfd8839a3c0e737fef3165565d76d related-to-bug: 3336496
* Some more fixes regarding HTTP live in NuPlayer.Andreas Huber2011-01-052-11/+5
| | | | Change-Id: I9e29615fa8ee6c7bd4189373a75c20caef3fd2b1
* Seek/Duration support for completed http live streams in NuPlayer.Andreas Huber2011-01-0510-40/+283
| | | | | Change-Id: I55bbe75d87140c07b1927d14ad24130fce803463 related-to-bug: 3321475
* Properly shutdown the decoders on a reset() in NuPlayer's implementation.Andreas Huber2011-01-045-61/+191
| | | | | related-to-bug: 3321470 Change-Id: Ida6d2171c5a3a407188d4633602b764f8fe7086a
* Squashed commit of the following:Andreas Huber2010-12-2315-183/+517
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit eaeaa2672d4e0a82891493b2bde8bdd0c0e79a1b Author: Andreas Huber <andih@google.com> Date: Thu Dec 23 10:26:48 2010 -0800 Remove lowest bandwidth stream if using the legacy player. Change-Id: I2f885e26344996de9152f8fda9fd6bdef89bf953 commit 7d652972615b2750fd8f1c21b9fab0e136df2b82 Author: Andreas Huber <andih@google.com> Date: Thu Dec 23 10:14:36 2010 -0800 Don't clear the packet source's format for legacy discontinuities. Change-Id: I9bd5a21b9bd28043ad38bd0658ccc8eda3c1079a commit 2b18a45aac17cbfe1aa089d0f6510957d438dd64 Author: Andreas Huber <andih@google.com> Date: Thu Dec 23 10:13:55 2010 -0800 Use NuPlayer for HTTP live streaming based on runtime property. adb shell setprop media.httplive.enable-nuplayer true Change-Id: I22738df3403985dc8e6992b1ab5da5747309f773 commit 50d899fb7b9ea52c3994b0a58e993998d926aeed Author: Andreas Huber <andih@google.com> Date: Wed Dec 22 16:25:22 2010 -0800 Make ACodec a lot less verbose. Change-Id: I94c7e499b61032321ffaf999f5ad2c913cde6a48 commit b19e1740cb4d02990a56844654b5d019987c6405 Author: Andreas Huber <andih@google.com> Date: Wed Dec 22 16:22:22 2010 -0800 Wait until we have fresh codec-specific-data before instantiating the decoders after a discontinuity involving a format change. Change-Id: I7bcf9b5ae3319f08bf8978a117e8ee5220902e37 commit 06428c006906c9099e430aface3b439ff1d36ecc Author: Andreas Huber <andih@google.com> Date: Wed Dec 22 15:20:38 2010 -0800 Disable random seeks in the streaming tool for now. Change-Id: Ie86fde422dcfc4b2c7a01be51a193fda9c88cd71 commit e19db68f3bea8a61c191f60f6940f30e3a0d5f1b Author: Andreas Huber <andih@google.com> Date: Wed Dec 22 15:20:27 2010 -0800 Tweak HTTP live parameters. Change-Id: If4b71e12485facc523a8a43d8213d0feb190daab commit 1e9942791538c2256b579d96c6c04264b0d8b087 Author: Andreas Huber <andih@google.com> Date: Wed Dec 22 14:48:23 2010 -0800 Enable http live streaming through NuPlayer for http URLs containing the string m3u8 Change-Id: I1691fe12ae8f1507fe3673313959cd50bc324624 commit 4c33f96a6e499ee0efe0e70b687094430cb7c1c0 Author: Andreas Huber <andih@google.com> Date: Wed Dec 22 14:40:27 2010 -0800 Support for HTTP live streaming in NuPlayer. Change-Id: Iacba1c3ebaeb8d3b972185deaf4cff18c8009c54 commit ddf705ce553708bc5b13d89a878484cf839bd674 Author: Andreas Huber <andih@google.com> Date: Wed Dec 22 13:42:47 2010 -0800 StreamingSource now a subclass of abstract NuPlayer::Source Change-Id: Ia6c7c639628910b9d1f37decc55da48b07a70de3 commit 9e04a8406b1882a8e3fdeb7b4d52db5ae70b970a Author: Andreas Huber <andih@google.com> Date: Wed Dec 22 13:33:52 2010 -0800 Refactor media data sourcing to NuPlayer::Source. Change-Id: I1db9fb08c4e527bf7b19c29978cf342c2b0a0bc9 Change-Id: I9610a097481dda58f22142eacda3ac2dba0b63f9
* Distinguish discontinuities w/ a format change from those without.Andreas Huber2010-12-222-18/+55
| | | | | | Shutdown decoders as needed in anticipation of a format change, otherwise just flush. Change-Id: Ieb04f8aa8658569b091409c4903075fd496e5abb
* Squashed commit of the following:Andreas Huber2010-12-218-25/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 63be8ceb8b2354fb997a277c0092abae015ecf10 Author: Andreas Huber <andih@google.com> Date: Fri Dec 17 13:45:34 2010 -0800 Enable handling of discontinuities that involve potential format changes. Change-Id: I21848a113db8764abb54bdcf302b0923253eaf4d commit d18a7f80ec09af382026809263dcbbfa9e7a9ec8 Author: Andreas Huber <andih@google.com> Date: Fri Dec 17 13:45:01 2010 -0800 Signal whether or not a format change occured as part of the discontinuity. Change-Id: I06e64f542f4369549c9cebbb892dc612346ae43d commit c400adbd5fdbd65cfef7aed9ec65bcaace4bb69b Author: Andreas Huber <andih@google.com> Date: Fri Dec 17 13:44:46 2010 -0800 A little more instrumentation of ACodec Change-Id: I07f4aeccbbd15cdd9f80f48c3f92ee984ef6d92b commit 1d802ee01f47b3cdc5b89502cec7fbb595e197a3 Author: Andreas Huber <andih@google.com> Date: Fri Dec 17 13:43:58 2010 -0800 Only sync audio/video queues if both types of media are actually present. Change-Id: Ic88edf9bb1ebd4034c08747cce9877a4e28e0d35 commit e402da39d9a4d8b75653a78f728e20a3ef0fb497 Author: Andreas Huber <andih@google.com> Date: Fri Dec 17 13:42:24 2010 -0800 Disable the random seek for now. Change-Id: Iddd597b546e2f229e88214f9bdd6452bb188105e Change-Id: I27c4d9ba916080be94ce6117dbb095e9022ed62b
* Properly announce decoder output format changes, make sure AMessage::dup does.Andreas Huber2010-12-162-32/+104
| | | | Change-Id: Ia77f6b6d5e5c5055583740dfe876b8a3c22be9b6