summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Merge "stagefright: add a 2kb cache for CallbackDataSource."Chris Watkins2015-04-203-4/+80
|\
| * stagefright: add a 2kb cache for CallbackDataSource.Chris Watkins2015-04-203-4/+80
| | | | | | | | | | | | | | | | | | | | | | | | Without a cache the mediaserver does a lot of small reads which result in round trips through binder and jni to the app MediaDataSource. On a Nexus 5 I measured time to first frame from MediaPlayer for 1) 1350kbps h264, and 2) 20480kbps vp8. Without a cache, MediaDataSource was ~250ms slower than an fd. With a 2kb cache it's 30ms slower for (1) and 70ms slower for (2). Change-Id: If1e811db7b853c4f79430603318d4744ac30acb9
* | Merge "HLS: reduce number of guessed wrong seq numbers"Chong Zhang2015-04-186-190/+266
|\ \
| * | HLS: reduce number of guessed wrong seq numbersChong Zhang2015-04-176-190/+266
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - account for playlist age in live streaming when calculating segment time - be more conservative on downswitching if bandwidth is unstable - adjust forward or backward if guessed wrong seq number - code refactor bug: 19567254 Change-Id: I0b61cea888fdffd1b3ee2446747ed10152e9e7d7
* | | am 4c85e16c: am d2dc1ea3: am 88574352: am 7725022e: Merge "SoftMPEG2: start ↵Lajos Molnar2015-04-182-5/+21
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | output at first I-frame" * commit '4c85e16c9f7cbd9e9fa4713d62ed2c7f4da2f7d3': SoftMPEG2: start output at first I-frame
| * \ \ am 88574352: am 7725022e: Merge "SoftMPEG2: start output at first I-frame"Lajos Molnar2015-04-172-5/+21
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '88574352adec1af117d21bb6fadf85b3b9b2f4bc': SoftMPEG2: start output at first I-frame
| | * \ \ am 7725022e: Merge "SoftMPEG2: start output at first I-frame"Lajos Molnar2015-04-172-5/+21
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '7725022e8bbff4160e46055ebaa4128dff86821c': SoftMPEG2: start output at first I-frame
| | | * | | SoftMPEG2: start output at first I-frameVenkatarama Avadhani2015-04-172-5/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes thumbnail generation for open GOP sequences Also add -Werror to this library to detect issues. Change-Id: I0136ca05070326c895fb3010b8e9557eac2d25df
* | | | | | Merge "NuPlayer: queue a deferred scan sources when flushing during scan"Chong Zhang2015-04-187-31/+32
|\ \ \ \ \ \
| * | | | | | NuPlayer: queue a deferred scan sources when flushing during scanChong Zhang2015-04-177-31/+32
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also refactor code to move scheduleRequestBuffers to decoder base. bug: 20267388 Change-Id: I48f16adc6b4d4008f8fcda8b3b01c595ad199f8b
* | | | | | Merge "libmediaplayerservice: fix warnings, make warnings errors, use clang"Lajos Molnar2015-04-1723-45/+50
|\ \ \ \ \ \
| * | | | | | libmediaplayerservice: fix warnings, make warnings errors, use clangLajos Molnar2015-04-1723-45/+50
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Change-Id: I1b2f6b65c5abbc366068a60b8909104f31b94228
* | | | | | Merge "stagefright: make more warnings errors"Lajos Molnar2015-04-1724-44/+46
|\ \ \ \ \ \
| * | | | | | stagefright: make more warnings errorsLajos Molnar2015-04-1724-44/+46
| |/ / / / / | | | | | | | | | | | | | | | | | | Change-Id: I9b1ad60fbfb866dbf9c00843e06553c3eb25c113
* | | | | | libmedia: fix all warning, make warnings errors, use clangLajos Molnar2015-04-1712-16/+16
|/ / / / / | | | | | | | | | | | | | | | Change-Id: Ic00d2c5d0bbb1605e96666e25c9ccc22bea6d3ff
* | | | | stagefright: warnings be gone, some are now errors, use clangLajos Molnar2015-04-1777-194/+262
|/ / / / | | | | | | | | | | | | Change-Id: I81f438ae444f04c12ae27ae4ef6d073033de172c
* | | | Merge "NuPlayerDriver: Maintain the timeStamp after seek"Wei Jia2015-04-171-0/+3
|\ \ \ \
| * | | | NuPlayerDriver: Maintain the timeStamp after seekHaynes Mathew George2015-04-171-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While offload playback is going on, if user pause and seeks to new position before offload tear-down, on resume playback starts from old time-stamp. Once tear-down happens NuPlayer loses updated time-stamp so while resuming it resumes playback with stale time-stamp. Make sure the updated time-stamp is maintained in NuPlayerDriver which is used while starting the playback after resume. authored-by: Sharad Sangle <assangle@codeaurora.org> Change-Id: Ie125cf0fab1b0a237e67e43b0e5b4a704483ef99
* | | | | Merge "stagefright: initial timed id3 support in hls"Robert Shih2015-04-1718-84/+399
|\ \ \ \ \
| * | | | | stagefright: initial timed id3 support in hlsRobert Shih2015-04-1618-84/+399
| |/ / / / | | | | | | | | | | | | | | | Change-Id: I00a8a786b3f4b74742c34770edd94e937abe20a8
* | | | | MediaSync: sanity check native sample rate.Wei Jia2015-04-161-0/+5
|/ / / / | | | | | | | | | | | | | | | | Bug: 19666434 Change-Id: I0eb7a70c81c4fcc336f52f014eeb6d261ac2c501
* | | | MediaCodec: hold input buffers during FLUSHED stateChong Zhang2015-04-161-2/+11
| | | | | | | | | | | | | | | | | | | | bug: 20267388 Change-Id: I21a12cb2ebb74e17dcdb7b502c3f674e9e64b5dc
* | | | Merge "Work around lack of pitch adjustment in Timestretcher"Andy Hung2015-04-161-12/+40
|\ \ \ \
| * | | | Work around lack of pitch adjustment in TimestretcherAndy Hung2015-04-161-12/+40
| | | | | | | | | | | | | | | | | | | | Change-Id: I3e057b97c250a826133248b6aa1ff9ed677d88df
* | | | | am 6705a49f: am 541a9ac7: am 8cd4132a: am 3f22f5a2: Merge "Signal EOS at end ↵Marco Nelissen2015-04-164-1/+33
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | of mpeg video to flush out final sample" * commit '6705a49f6481ad1728215a2a72472fe43c786cd0': Signal EOS at end of mpeg video to flush out final sample
| * | | | am 8cd4132a: am 3f22f5a2: Merge "Signal EOS at end of mpeg video to flush ↵Marco Nelissen2015-04-164-1/+33
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | out final sample" * commit '8cd4132a85239fd318193e10c0817ac7784c304a': Signal EOS at end of mpeg video to flush out final sample
| | * | | am 3f22f5a2: Merge "Signal EOS at end of mpeg video to flush out final sample"Marco Nelissen2015-04-164-1/+33
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | * commit '3f22f5a2d95699650a454041bcaa1d5a248cca88': Signal EOS at end of mpeg video to flush out final sample
| | | * | Merge "Signal EOS at end of mpeg video to flush out final sample"Marco Nelissen2015-04-164-1/+33
| | | |\ \
| | | | * | Signal EOS at end of mpeg video to flush out final sampleMarco Nelissen2015-04-154-1/+33
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I27196a4a4b7fe37da52d3ee99da8cb80294d36d0
* | | | | | Merge "Unhide the android.media.[Media]DataSource interface."Chris Watkins2015-04-1625-26/+469
|\ \ \ \ \ \
| * | | | | | Unhide the android.media.[Media]DataSource interface.Chris Watkins2015-04-1525-26/+469
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows apps to implement MediaDataSource, which is modeled on stagefright's DataSource, to supply media data to the framework. This was already implemented for MediaExtractor, but it was renamed from DataSource. MediaExtractor, MediaPlayer and MediaMetadataRetriever each have a new overload: #setDataSource(android.media.MediaDataSource) Only NuPlayer supports this new data source. The change introduces: * IDataSource: The binder interface for DataSource. * JMediaDataSource: The native counterpart to the java interface. It implements IDataSource. * CallbackDataSource: A stagefright DataSource that wraps an IDataSource. Change-Id: Ib3c944b49cc8a792c8eb9c85e5015c07f298ebc1
* | | | | | | am 5c16a387: am 382bcd5a: am 6a2dffb1: am 4491a4ab: Merge "libstagefright: ↵Lajos Molnar2015-04-161-0/+2
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | free mMoovBoxBuffer" * commit '5c16a3877c0b32f21cbee7f1bdc77a2a4d2b79c6': libstagefright: free mMoovBoxBuffer
| * | | | | | am 6a2dffb1: am 4491a4ab: Merge "libstagefright: free mMoovBoxBuffer"Lajos Molnar2015-04-161-0/+2
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | * commit '6a2dffb1c7a0e45388257bc5d2ec763f234f8cca': libstagefright: free mMoovBoxBuffer
| | * | | | | am 4491a4ab: Merge "libstagefright: free mMoovBoxBuffer"Lajos Molnar2015-04-161-0/+2
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | * commit '4491a4ab2d6991baa1ce15f24025aa24430d15d1': libstagefright: free mMoovBoxBuffer
| | | * | | | Merge "libstagefright: free mMoovBoxBuffer"Lajos Molnar2015-04-161-0/+2
| | | |\ \ \ \
| | | | * | | | libstagefright: free mMoovBoxBufferSuresh Choudhary2015-04-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add free(mMoovBoxBuffer) in MPEG4Writer::release() Change-Id: Ic396e64e9e238bdc23cb0b02b7aa341d879d2237
* | | | | | | | am f16511ca: am 0a4d22e5: am 9985f6af: am 30d7b488: Merge "MPEG4Writer: Set ↵Lajos Molnar2015-04-161-2/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the correct audio bit rate for camera recorded content" * commit 'f16511ca737b8bf8a33ce589a28630e98c3aaae5': MPEG4Writer: Set the correct audio bit rate for camera recorded content
| * | | | | | | am 9985f6af: am 30d7b488: Merge "MPEG4Writer: Set the correct audio bit rate ↵Lajos Molnar2015-04-161-2/+4
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for camera recorded content" * commit '9985f6af71061c9340fffa9a6e7c8fea5dac04ab': MPEG4Writer: Set the correct audio bit rate for camera recorded content
| | * | | | | | am 30d7b488: Merge "MPEG4Writer: Set the correct audio bit rate for camera ↵Lajos Molnar2015-04-161-2/+4
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recorded content" * commit '30d7b4883bf3198bfba0d0acf14e0bcbb67716d1': MPEG4Writer: Set the correct audio bit rate for camera recorded content
| | | * | | | | Merge "MPEG4Writer: Set the correct audio bit rate for camera recorded content"Lajos Molnar2015-04-161-2/+4
| | | |\ \ \ \ \
| | | | * | | | | MPEG4Writer: Set the correct audio bit rate for camera recorded contentDaniel Bonnevier2015-04-151-2/+4
| | | | | |_|/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the hard coded value for bit rate. Use the audio bit rate from the stream format, if it is specified, otherwise default to 96kpbs. Change-Id: Ib643c79bbdddaafb3dc703448645606267f7ca4d
* | | | | | | | am 655084f9: am e7a53499: am 0a45cda6: am 187b196e: Merge changes ↵Lajos Molnar2015-04-1611-11/+3668
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ic51e92e9,Ie808aa82,I74f5f4a1 * commit '655084f979b3067cb5a6fd2d4de148b411fbec23': stagefright: add SoftAVCEnc using libavc stagefright: add SoftAVCDec using libavc stagefright: add SoftMPEG2 decoder using libmpeg2
| * | | | | | | am 0a45cda6: am 187b196e: Merge changes Ic51e92e9,Ie808aa82,I74f5f4a1Lajos Molnar2015-04-1611-11/+3668
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0a45cda68209717767412d040c24e8253c1b5847': stagefright: add SoftAVCEnc using libavc stagefright: add SoftAVCDec using libavc stagefright: add SoftMPEG2 decoder using libmpeg2
| | * | | | | | am 187b196e: Merge changes Ic51e92e9,Ie808aa82,I74f5f4a1Lajos Molnar2015-04-1611-11/+3668
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '187b196e48ed6ea655c7a0e48908d92d670627a8': stagefright: add SoftAVCEnc using libavc stagefright: add SoftAVCDec using libavc stagefright: add SoftMPEG2 decoder using libmpeg2
| | | * | | | | stagefright: add SoftAVCEnc using libavcVenkatarama Avadhani2015-04-155-6/+1680
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic51e92e9d86db21109b8714e822697869e184cd1
| | | * | | | | stagefright: add SoftAVCDec using libavcVenkatarama Avadhani2015-04-155-5/+1017
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie808aa82c624dbbcaeb6b41662c9b7770bc80bd9
| | | * | | | | stagefright: add SoftMPEG2 decoder using libmpeg2Venkatarama Avadhani2015-04-155-0/+971
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I74f5f4a1e6d7be8df45bcbc83a965111454b97ea
| * | | | | | am 85bb3235: am 8eae9223: am a05bd3c1: am 2f47bb53: am eb204f82: am ↵Nick Kralevich2015-04-111-0/+6
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b919a3a3: am 64290793: Merge "Fix integer underflow in ESDS processing" into klp-dev * commit '85bb3235ef58120131e20801dd37eb9708ddc570': Fix integer underflow in ESDS processing
| | * \ \ \ \ \ am 2f47bb53: am eb204f82: am b919a3a3: am 64290793: Merge "Fix integer ↵Nick Kralevich2015-04-111-0/+6
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | underflow in ESDS processing" into klp-dev * commit '2f47bb53f65e34ba9cff66106390351440b9409b': Fix integer underflow in ESDS processing
| | | * \ \ \ \ \ am eb204f82: am b919a3a3: am 64290793: Merge "Fix integer underflow in ESDS ↵Nick Kralevich2015-04-101-0/+6
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | processing" into klp-dev * commit 'eb204f82afd5519eb544bf8bee692e7152820c3b': Fix integer underflow in ESDS processing
generated by cgit v1.1 at 2024-05-15 02:14:05 +0000