summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
Commit message (Collapse)AuthorAgeFilesLines
* Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGESteve Block2012-01-031-7/+7
| | | | | | | See https://android-git.corp.google.com/g/156016 Bug: 5449033 Change-Id: I4c4e33bb9df3e39e11cd985e193e6fbab4635298
* Merge "Fix build error when verbose logging is enabled"Glenn Kasten2011-12-151-1/+1
|\
| * Fix build error when verbose logging is enabledGlenn Kasten2011-12-151-1/+1
| | | | | | | | Change-Id: I30f4e5d35d1b24dce2e6152a13fd0fb61414a3e2
* | Fix the build. (Change LOGV to ALOGV)Owen Lin2011-12-121-1/+1
| | | | | | | | Change-Id: I14104540cfbd2bcdd7af1534db20554b88c4c0ce
* | am ebfce84f: am 68f592a8: Merge "Don\'t perform RTSP seeks right away but ↵Andreas Huber2011-12-092-4/+31
|\ \ | | | | | | | | | | | | | | | | | | queue them for 200ms" into ics-mr1 * commit 'ebfce84f7fd3e25fa08c36b155db91df90a59b3d': Don't perform RTSP seeks right away but queue them for 200ms
| * \ Merge "Don't perform RTSP seeks right away but queue them for 200ms" into ↵Andreas Huber2011-12-082-4/+31
| |\ \ | | | | | | | | | | | | ics-mr1
| | * | Don't perform RTSP seeks right away but queue them for 200msAndreas Huber2011-12-082-4/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | and only execute the last one. Change-Id: I9ab342396ec9c9c03624a4b0306d1e180ceca000 related-to-bug: 5732960
* | | | am aa82c39b: am 0ba9380a: Merge "Fix Bitreader "putBits" implementation, ↵Andreas Huber2011-12-092-7/+21
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | make sure we emulate timestamps" into ics-mr1 * commit 'aa82c39bdb4ad9c1fdcb09f3bea11be5197d3ce6': Fix Bitreader "putBits" implementation, make sure we emulate timestamps
| * | Fix Bitreader "putBits" implementation, make sure we emulate timestampsAndreas Huber2011-12-082-7/+21
| |/ | | | | | | | | | | | | if we don't receive npt time mapping from the rtsp server (i.e. live stream) Change-Id: I5147d665bd90c9a303ad6ffdafbf770f930f917c related-to-bug: 5660357
* | resolved conflicts for merge of 3d630e86 to masterAndreas Huber2011-11-302-2/+20
|\ \ | |/ | | | | Change-Id: I9eb7b7c1668b5f0de85ec8b1e9257cf1ec4d8b9e
| * Merge "Make sure we can properly shutdown even if" into ics-mr1Andreas Huber2011-11-292-2/+20
| |\
| | * Make sure we can properly shutdown even ifAndreas Huber2011-11-282-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a) one of the two decoders has a pending discontinuity b) the renderer holds on to all output buffers for that decoder c) the renderer is paused if all three conditions are met the decoder won't ask for more input data and therefore never see the discontinuity. To avoid this we briefly resume the renderer just before shutting down. Change-Id: I9e08af2a1eb4298d1cd00497d6aa33f4ad184e9a related-to-bug: 5655016
* | | am 074133b2: am 351143fb: Merge "Updated (internal) API for IStreamSource to ↵Andreas Huber2011-11-291-6/+11
|\ \ \ | |/ / | | | | | | | | | | | | | | | signal discontinuities" into ics-mr1 * commit '074133b260f8d12e484e93b9aa5a33a4983b7349': Updated (internal) API for IStreamSource to signal discontinuities
| * | Merge "Updated (internal) API for IStreamSource to signal discontinuities" ↵Andreas Huber2011-11-291-6/+11
| |\ \ | | | | | | | | | | | | into ics-mr1
| | * | 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
* | | MidiFile uses C++ Thread not createThreadEtcGlenn Kasten2011-11-162-7/+26
| | | | | | | | | | | | | | | | | | This permits leveraging future improvements to Thread. Change-Id: I323b709e935c47fa3c6041cb8b82fda994e78b56
* | | 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-0810-34/+0
|\ \ \ | |/ / | | | | | | Change-Id: Ib1536b1a4c9eeff80e0726b3e61cee12057cd120
| * | Merge "Remove surface legacy APIs and code." into ics-mr1Andreas Huber2011-11-0810-34/+0
| |\ \
| | * | Remove surface legacy APIs and code.Andreas Huber2011-10-2810-34/+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
| * | Merge "Properly report that we're no longer playing after receiving event" ↵Andreas Huber2011-10-283-4/+17
| |\ \ | | | | | | | | | | | | into ics-mr1
| | * | 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
* | | | am fc9592f8: am 08479cee: Merge "Stagefright: ANW::connect in ↵Jamie Gennis2011-10-282-1/+63
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | MediaPlayerService" into ics-mr0 * commit 'fc9592f8a5f2f75207e5e532655ac294eb2b334b': Stagefright: ANW::connect in MediaPlayerService
| * | | am 08479cee: Merge "Stagefright: ANW::connect in MediaPlayerService" into ↵Jamie Gennis2011-10-282-1/+63
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | ics-mr0 * commit '08479ceeba56c460fb52f60a24df27776f1936c3': Stagefright: ANW::connect in MediaPlayerService
| | * Stagefright: ANW::connect in MediaPlayerServiceJamie Gennis2011-10-262-1/+63
| | | | | | | | | | | | | | | | | | | | | | | | This change moves the ANativeWindow connect and disconnect logic from MediaPlayer to MediaPlayerService::Client. Bug: 5502654 Change-Id: Ifc43b98b01ad8f35d62d7ece43110724ec7fda3d
* | | Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGESteve Block2011-10-269-258/+258
|/ / | | | | | | | | | | | | See https://android-git.corp.google.com/g/#/c/143865 Bug: 5449033 Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
* | am b3cdadb6: Merge "Check whether media recorder client exists before ↵James Dong2011-10-191-5/+7
|\ \ | |/ | | | | | | | | | | dumping." into ics-mr0 * commit 'b3cdadb639027f62c7c1637ca962a70d2d1f3b4d': Check whether media recorder client exists before dumping.
| * Check whether media recorder client exists before dumping.James Dong2011-10-181-5/+7
| | | | | | | | | | Change-Id: I1f3a644a958975e4cf6c02099c53e30cc4d2fd82 related-to-bug: 5477177
* | NuPlayer is now taking on the task of streaming over RTSP.Andreas Huber2011-10-139-4/+492
|/ | | | Change-Id: Ie204db8810807f1e7981959e34dc0149e5d9563a
* Fix an issue where we should allow negative values but did notJames Dong2011-10-052-8/+8
| | | | | Change-Id: Ia8d718b4e6aec4c17db86e30134132f767fd72c5 related-to-bug: 5419527
* Merge "Signal an appropriate error even if there are no active streams yet."Andreas Huber2011-09-276-27/+32
|\
| * 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
* | Merge "Fix issue 5373048: AudioCache decode errors"Eric Laurent2011-09-271-2/+11
|\ \ | |/ |/|
| * Fix issue 5373048: AudioCache decode errorsEric Laurent2011-09-271-2/+11
| | | | | | | | | | | | | | | | When decoding a file for the SoundPool, do not reject the entire file in case of error but return what was decoded so far instead. Change-Id: Iff199a1b6a4c8e064e42a0dfe0704e0ae36a27fd
* | 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
* Require INTERNET permission for network-based content.Dave Burke2011-09-022-67/+28
| | | | | | Bug #1870981 Change-Id: Ia3ad166390c4d60cea19c3783895b078a2c4c15f
* 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