summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Revert "Fix AAC timestamps for multiple aac frames per input buffer"" ↵Marco Nelissen2014-09-102-194/+128
|\ | | | | | | into lmp-dev
| * Revert "Fix AAC timestamps for multiple aac frames per input buffer"Marco Nelissen2014-09-102-194/+128
| | | | | | | | | | | | | | | | This reverts commit e086387c805311ac87904c3c4d6d4eb08d4b4ee2. (broke multichannel movie playback) Bug: 17454025 Change-Id: I95b82359f87f8beca66f35c34b7e125850a44747
* | Merge "fix failure in MediaCodecTest#testException" into lmp-devChong Zhang2014-09-101-1/+14
|\ \ | |/ |/|
| * fix failure in MediaCodecTest#testExceptionChong Zhang2014-09-101-1/+14
| | | | | | | | | | | | | | reset codec after failed configure() Bug: 17418876 Change-Id: I21ff8a0751dae6a164678015142e11d481403bed
* | Merge "Fix AAC timestamps for multiple aac frames per input buffer" into lmp-devMarco Nelissen2014-09-092-128/+194
|\ \ | |/ |/|
| * Fix AAC timestamps for multiple aac frames per input bufferMarco Nelissen2014-09-072-128/+194
| | | | | | | | | | | | | | Support multiple aac frames per input buffer also for non-ADTS streams. Bug: 16715379 Change-Id: I84f33d9bb65b6821b2a697f6750356cea98777c4
* | Merge "Make IPowerManager native conform to .aidl for oneway" into lmp-devGlenn Kasten2014-09-081-2/+2
|\ \
| * | Make IPowerManager native conform to .aidl for onewayGlenn Kasten2014-09-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | But provide a temporary escape hatch for AudioFlinger. This oneway option will be removed as soon as possible. Bug: 16408906 Change-Id: I058a50906af810787e444a96819cb781b7f639ad
* | | Merge "DO NOT MERGE - MPEG4Extractor: parse csd correctly; workaround ↵Robert Shih2014-09-061-3/+23
|\ \ \ | |/ / |/| | | | | malformed csd" into lmp-dev
| * | DO NOT MERGE - MPEG4Extractor: parse csd correctly; workaround malformed csdRobert Shih2014-09-061-3/+23
| |/ | | | | | | | | | | Bug: 14895152 Change-Id: Ibfee9e176459099507589c26a5eca6c61caabd1c (cherry picked from commit bc413f6ad0023f7ad451a0129a07fc31dbc65665)
* | Merge "stagefright: allow P-frames spacing of 0 and 1" into lmp-devLajos Molnar2014-09-052-2/+0
|\ \ | |/ |/|
| * stagefright: allow P-frames spacing of 0 and 1Lajos Molnar2014-09-042-2/+0
| | | | | | | | | | Bug: 17387418 Change-Id: Ib966496b4ca220d96fb3741c29002c13cd2db848
* | Merge "PlaylistFetcher: do not reset mStartTimeUs if we are resuming" into ↵Robert Shih2014-09-041-2/+2
|\ \ | |/ |/| | | lmp-dev
| * PlaylistFetcher: do not reset mStartTimeUs if we are resumingRobert Shih2014-09-031-2/+2
| | | | | | | | | | Bug: 17376049 Change-Id: Ie519bdf7128841172df41e6512d624e99d9853d6
* | Merge "Fix the bug that same video frame has been decoded twice during port ↵hkuang2014-09-032-32/+38
|\ \ | | | | | | | | | reconfig." into lmp-dev
| * | Fix the bug that same video frame has been decoded twice during port reconfig.hkuang2014-09-032-32/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | This does not hurt normal video playback. But in adaptive playback, this will lead to a little bit delay for some clips. Bug: 17202935 Change-Id: I5af0a5911e28a1597c74d79960fac25faf72c9d2
* | | Merge "Use CharacterEncodingDetector in metadataretriever" into lmp-devMarco Nelissen2014-09-032-16/+46
|\ \ \ | |_|/ |/| |
| * | Use CharacterEncodingDetector in metadataretrieverMarco Nelissen2014-09-022-16/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of media scanner. This way the java MediaMetadataRetriever API will give the same result as the media scanner. Also apply some tweaks to the encoding detector to improve handling of ISO-8859-1 tags. Bug: 16302581, 17205395 Change-Id: I1682a7a6a8bf04cffaa455044ba72dd7fd152d49
* | | Merge "Move stale handler cleanup to constructor" into lmp-devMarco Nelissen2014-09-031-4/+4
|\ \ \
| * | | Move stale handler cleanup to constructorMarco Nelissen2014-08-281-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids the potential side effect of deleting more ALoopers inside the cleanup loop. Bug: 17059501 Change-Id: I41efaf490449b95fedfe01175f3b19067d50da24
* | | | Merge "Fix more potential deadlocks in ALooperRoster" into lmp-devMarco Nelissen2014-09-031-29/+12
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Fix more potential deadlocks in ALooperRosterMarco Nelissen2014-08-281-29/+12
| | | | | | | | | | | | | | | Bug: 17059501 Change-Id: I242f2859527bed2d6e275c27de94fb19f4dcdc28
* | | Merge "Add adaptive playback support to VPX decoder." into lmp-devRonghua Wu2014-09-027-35/+87
|\ \ \
| * | | Add adaptive playback support to VPX decoder.Ronghua Wu2014-08-287-35/+87
| | |/ | |/| | | | | | | | | | Bug: 13842676 Change-Id: I9c054ea489fd3a71b3b2394f15a85b84d42edb5a
* | | Merge "MediaCodec: set state to UNINITIALIZED when receiving fatal error." ↵Wei Jia2014-08-301-2/+4
|\ \ \ | | | | | | | | | | | | into lmp-dev
| * | | MediaCodec: set state to UNINITIALIZED when receiving fatal error.Wei Jia2014-08-291-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | NuPlayerDecoder: release MediaCodec when handling an error. Bug: 16661923 Change-Id: I1b6fd7ee5cc1136b3f289135e5360cd3d98f9799
* | | | Merge "Tunneled Video Playback: Changed AudioHwSync token to int32_t to ↵Rachad2014-08-301-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | match Audio stack api." into lmp-dev
| * | | | Tunneled Video Playback:Rachad2014-08-281-4/+4
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Changed AudioHwSync token to int32_t to match Audio stack api. Bug: 17112525 Change-Id: I673819495c2e7b540e8d7572cc95796bddbf63bb
* | | | Merge "stagefright: add codec capability info for google video codecs" into ↵Lajos Molnar2014-08-291-10/+81
|\ \ \ \ | |_|/ / |/| | | | | | | lmp-dev
| * | | stagefright: add codec capability info for google video codecsLajos Molnar2014-08-141-10/+81
| | | | | | | | | | | | | | | | | | | | Bug: 11990470 Change-Id: I3926551506ebc33181d50f532ef379be55b60147
* | | | PlaylistFetcher: add lower bound check when starting live streamsRobert Shih2014-08-281-0/+3
| |/ / |/| | | | | | | | | | | | | | | | | | | | Avoid false 'missed the boat' alarms that cause us to queue a bogus discontinuity before even starting. Bug: 17303166 Change-Id: I5003934fc695f30db2df9a0803b8fe960d77a458
* | | Fix potential deadlock in unregisterStaleHandlers()Marco Nelissen2014-08-271-7/+19
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | The scenario is that a call to unregisterStaleHandlers() is in progress, and is holding a temporary sp<ALooper> reference to an active ALooper inside of the loop. At this point the only other remaining external reference to the ALooper goes away, so the temporary sp<ALooper> in the loop is now the only reference keeping that object alive. When the loop iterates and the sp<> goes out of scope, the ALooper destructor is called, which in turn calls unregisterStaleHandlers again, resulting in a recursive lock. Bug: 17300093 Change-Id: I116f2ffab4ae7c43b6bcf54a367ae6f9d77c9626
* | Merge "HTTPLiveSource: check for NULL before getTrackCount/Info" into lmp-devRobert Shih2014-08-251-2/+10
|\ \
| * | HTTPLiveSource: check for NULL before getTrackCount/InfoRobert Shih2014-08-181-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | The effect is MediaPlayer returns a 0-length array when getTrackInfo is called before PREPARED state. Bug: 12029173 Change-Id: Ib3a48525eac07b04a2ff88ce199d66dcc61c1641
* | | stagefright: process CSD regardless of what port was last queuedLajos Molnar2014-08-231-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | CSD is always on the input port, so it does not matter which port a buffer was last queued to. Bug: 17216852 Change-Id: I6d00eb4bf3c2e9b9cc3c9918229de958bc465693
* | | Merge "MediaCodec: handle errors during flushing." into lmp-devWei Jia2014-08-231-6/+10
|\ \ \
| * | | MediaCodec: handle errors during flushing.Wei Jia2014-08-221-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 17068327 Bug: 13133027 Change-Id: I06caf79b90ebf55d6d7561cb82516c0b6c66f0e4
* | | | Merge "ACodec: handle errors related to native window." into lmp-devWei Jia2014-08-221-4/+8
|\ \ \ \
| * | | | ACodec: handle errors related to native window.Wei Jia2014-08-221-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17068327 Bug: 13133027 Change-Id: I9875e524222a10d1be26be5a84b9633b4aaeb210
* | | | | Merge "move cache prefill to GenericSource's message handler" into lmp-devChong Zhang2014-08-221-70/+7
|\ \ \ \ \
| * | | | | move cache prefill to GenericSource's message handlerChong Zhang2014-08-211-70/+7
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows prepareAsync to be terminated by reset promptly. It also makes it easier to do buffer update as GenericSource can access the cache status now. Bug: 16892748 Bug: 17182378 Change-Id: Ia55c04a810fd805041cb2025f6739afa5120b5ed
* | | | | Merge "print warning if offset != buffer size" into lmp-devChong Zhang2014-08-221-0/+5
|\ \ \ \ \
| * | | | | print warning if offset != buffer sizeChong Zhang2014-08-191-0/+5
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Bug: 17110981 Change-Id: Iacceca203372f4c06ff5ef7ce98edd5554727b64
* | | | | stagefright: allow to resubmit CSDs for SoftAAC2Lajos Molnar2014-08-221-208/+201
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17118001 Change-Id: I45469b9aa6146edf3265b0f05f5ce3592b5daca6
* | | | | SoftAAC2: allow reconfiguring output after multiple output buffersRobert Shih2014-08-221-10/+1
| |/ / / |/| | | | | | | | | | | | | | | Bug: 17134697 Change-Id: Iaa8bdccbf1a8ccd3f898e48cfd22a0a443710fdd
* | | | Merge "handle error during flush in MediaPlayer.reset()" into lmp-devMarco Nelissen2014-08-191-3/+8
|\ \ \ \ | |/ / / |/| | |
| * | | handle error during flush in MediaPlayer.reset()Marco Nelissen2014-08-201-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there was an error during the flush phase of a reset, then the reset would never complete. We now make sure the MediaCodec moves to the right state in this case, and that NuPlayer cleans up and resumes the rest of the reset after a failed flush. Bug: 16955082 Change-Id: Ied61136871a9fcdffcc80647fa2bba64a926ac2a
* | | | Don't crash for bitstream errors in AMPEG4ElementaryAssemblerChong Zhang2014-08-191-5/+10
| | | | | | | | | | | | | | | | | | | | Bug: 17110981 Change-Id: I0d0960fa12f2ad179231494be29af307de217b2a
* | | | Merge "stagefright: Fix thumbnail generation for some clips." into lmp-devRonghua Wu2014-08-181-7/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | stagefright: Fix thumbnail generation for some clips.Ronghua Wu2014-08-191-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix thumbnail generation for clips that include an immediate resolution change: * Enable dynamic resolution change, when port settings may change while we have filled buffers. * Handle the case when port settings change happens right after stop is called. Bug: 16210021 Change-Id: I8b2c48365d74ce7551f000a1f4b0711647a9796f
generated by cgit v1.1 at 2024-07-17 16:12:58 +0000