summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
Commit message (Collapse)AuthorAgeFilesLines
* Merge "DO NOT MERGE libmediaplayerservice: set priority and operating rate ↵Ronghua Wu2015-04-271-0/+12
|\ | | | | | | for the codec used by nuplayer." into mnc-dev
| * DO NOT MERGE libmediaplayerservice: set priority and operating rate for the ↵Ronghua Wu2015-04-271-0/+12
| | | | | | | | | | | | | | | | codec used by nuplayer. Bug: 20481562 Change-Id: I9806414962352fbcda726f8274f1cd348c961de0 (cherry picked from commit f19f5d716b39a5d9dc1abdcd5a16a7aaf1b1ab8b)
* | DO NOT MERGE libmedia: add sub resource type audio-codec and video-codec.Ronghua Wu2015-04-271-7/+16
|/ | | | | | Bug: 20559813 Change-Id: If231cb44337ca7dc74c39fc3cd73e2b6f3cb85b8 (cherry picked from commit d4c1f6b4ecfef7323422359fc38bd1edb1abf205)
* MatroskaExtractor: skip track when codec id is NULL in addTracksRobert Shih2015-04-241-1/+4
| | | | | Bug: 18872598 Change-Id: I0cdb2ffae202fc06b068c57dafae7523981b6000
* Merge "mediaresourcemanager: add dumpsys support."Ronghua Wu2015-04-241-0/+15
|\
| * mediaresourcemanager: add dumpsys support.Ronghua Wu2015-04-231-0/+15
| | | | | | | | | | Bug: 20233206 Change-Id: Ic253985e408b05b488e87cd5c50c0d619ac568ef
* | Merge "MediaCodec: ignore error when linkToDeath to batterystats"Chong Zhang2015-04-241-8/+5
|\ \
| * | MediaCodec: ignore error when linkToDeath to batterystatsChong Zhang2015-04-241-8/+5
| | | | | | | | | | | | | | | bug: 20071299 Change-Id: I932b40e46312db467fe88f8ff6cea028b63785cd
* | | Merge "HLS: make disconnect faster to prevent ANR"Chong Zhang2015-04-247-329/+509
|\ \ \
| * | | HLS: make disconnect faster to prevent ANRChong Zhang2015-04-237-329/+509
| |/ / | | | | | | | | | | | | | | | | | | disconnect HTTP connection when we absolutely won't resume bug: 19890444 Change-Id: Idee36b48741f6f8eb1d65bca32156e9e18349c67
* | | Merge "Copy sei offset/size during ABuffer/MediaBuffer conversion"Robert Shih2015-04-241-0/+5
|\ \ \
| * | | Copy sei offset/size during ABuffer/MediaBuffer conversionRobert Shih2015-04-231-0/+5
| |/ / | | | | | | | | | | | | Bug: 20537676 Change-Id: I0bd11527ccd022c39d94b7877df81de4da1b14a6
* | | MediaSync: allow users to query play time for pending audio frames.Wei Jia2015-04-231-0/+36
| |/ |/| | | | | | | Bug: 19666434 Change-Id: I5cfd3e1a9b4f56aaa6482facd55a22ed1e7ed3e6
* | Merge "MediaSync: fix the optimization code path to reduce messages posted ↵Wei Jia2015-04-231-13/+29
|\ \ | |/ |/| | | to drain video."
| * MediaSync: fix the optimization code path to reduce messages posted to drain ↵Wei Jia2015-04-221-13/+29
| | | | | | | | | | | | | | video. Bug: 19666434 Change-Id: I195a896033855ab3bfa43791b3c99f66776b007a
* | AnotherPacketSource: make getBufferedDurationUs more discontinuity-awareRobert Shih2015-04-213-105/+102
| | | | | | | | | | | | | | | | | | The new getBufferedDurationUs implementation obsoletes the purpose of getEstimatedDurationUs; remove getEstimatedDurationUs and its associated member variables. Finally replace calls to getEstimatedDurationUs with getBufferedDurationUs. Change-Id: I38f20df8e177ffbfe299b203d99076fc98dcd274
* | HLS: remove no more than 10% of bandwidth history at a timeChong Zhang2015-04-212-11/+51
|/ | | | | | | | | | | | | | | | | | - fix a 'possible video time jump' after seek, don't update renderer anchor time for 0-sized audio buffers - fix another 'possible video time jump' caused by some states not reset in mStreams - bandwidth estimator changes to not remove more than 10% of total transfer duration at a time to avoid jumping up too quickly bug: 20267388 related-to-bug: 19864613 related-to-bug: 20138395 Change-Id: I8812332cd1e26bf562acfaf086fd679a3549debc
* Merge "media: ignore the result of linkToDeath, which can fail if called ↵Ronghua Wu2015-04-201-5/+1
|\ | | | | | | from same process."
| * media: ignore the result of linkToDeath, which can fail if called from same ↵Ronghua Wu2015-04-201-5/+1
| | | | | | | | | | | | | | process. Bug: 19620911 Change-Id: I6a25ed1ef1b2790d0976943ec129f31972e27714
* | 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
| | * | | | 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 "libmediaplayerservice: fix warnings, make warnings errors, use clang"Lajos Molnar2015-04-172-9/+9
|\ \ \ \ \ \
| * | | | | | libmediaplayerservice: fix warnings, make warnings errors, use clangLajos Molnar2015-04-172-9/+9
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Change-Id: I1b2f6b65c5abbc366068a60b8909104f31b94228
* | | | | | stagefright: make more warnings errorsLajos Molnar2015-04-1724-44/+46
|/ / / / / | | | | | | | | | | | | | | | Change-Id: I9b1ad60fbfb866dbf9c00843e06553c3eb25c113
* | | | | stagefright: warnings be gone, some are now errors, use clangLajos Molnar2015-04-1773-188/+256
| |_|/ / |/| | | | | | | | | | | Change-Id: I81f438ae444f04c12ae27ae4ef6d073033de172c
* | | | Merge "stagefright: initial timed id3 support in hls"Robert Shih2015-04-1711-54/+250
|\ \ \ \
| * | | | stagefright: initial timed id3 support in hlsRobert Shih2015-04-1611-54/+250
| | | | | | | | | | | | | | | | | | | | 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
* | | | 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
| | * | 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-167-15/+183
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Unhide the android.media.[Media]DataSource interface.Chris Watkins2015-04-157-15/+183
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | 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
| | * | | | 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
generated by cgit v1.1 at 2024-05-18 12:35:03 +0000