summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 90073050: Merge "Fix the bug that same video frame has been decoded twice ...hkuang2014-09-032-32/+38
|\
| * Merge "Fix the bug that same video frame has been decoded twice during port r...hkuang2014-09-032-32/+38
| |\
| | * Fix the bug that same video frame has been decoded twice during port reconfig.hkuang2014-09-032-32/+38
* | | am d3db0bfa: Merge "NuPlayer: add seek operation when change video texture su...Wei Jia2014-09-032-0/+5
|\ \ \ | |/ /
| * | Merge "NuPlayer: add seek operation when change video texture surface." into ...Wei Jia2014-09-032-0/+5
| |\ \
| | * | NuPlayer: add seek operation when change video texture surface.Wei Jia2014-09-032-0/+5
| | |/
* | | am d71233a8: Merge "Use CharacterEncodingDetector in metadataretriever" into ...Marco Nelissen2014-09-037-199/+97
|\ \ \ | |/ /
| * | Merge "Use CharacterEncodingDetector in metadataretriever" into lmp-devMarco Nelissen2014-09-037-199/+97
| |\ \
| | * | Use CharacterEncodingDetector in metadataretrieverMarco Nelissen2014-09-027-199/+97
* | | | am acdae5d7: Merge "Move stale handler cleanup to constructor" into lmp-devMarco Nelissen2014-09-031-4/+4
|\ \ \ \ | |/ / /
| * | | 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
* | | | | am ea8462cc: Merge "Fix more potential deadlocks in ALooperRoster" into lmp-devMarco Nelissen2014-09-031-29/+12
|\ \ \ \ \ | |/ / / /
| * | | | 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
* | | | | am 453d633b: Merge "render one video frame after flush even when we\'re pause...Chong Zhang2014-09-032-15/+29
|\ \ \ \ \ | |/ / / /
| * | | | Merge "render one video frame after flush even when we're paused" into lmp-devChong Zhang2014-09-032-15/+29
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | render one video frame after flush even when we're pausedChong Zhang2014-09-032-15/+29
* | | | | am e4478feb: Merge "Add adaptive playback support to VPX decoder." into lmp-devRonghua Wu2014-09-027-35/+87
|\ \ \ \ \ | |/ / / /
| * | | | 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
* | | | | | am e7494680: Merge "NuPlayerRenderer: stop feeding AudioSink when paused." in...Wei Jia2014-09-022-6/+7
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "NuPlayerRenderer: stop feeding AudioSink when paused." into lmp-devWei Jia2014-09-022-6/+7
| |\ \ \ \ \
| | * | | | | NuPlayerRenderer: stop feeding AudioSink when paused.Wei Jia2014-08-292-6/+7
* | | | | | | am 64a385d5: Merge "GenericSource: set DRM playback status." into lmp-devRonghua Wu2014-08-315-0/+94
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "GenericSource: set DRM playback status." into lmp-devRonghua Wu2014-08-305-0/+94
| |\ \ \ \ \ \
| | * | | | | | GenericSource: set DRM playback status.Ronghua Wu2014-08-295-0/+94
| | | |/ / / / | | |/| | | |
* | | | | | | am c9d62de7: Merge "MediaCodec: set state to UNINITIALIZED when receiving fat...Wei Jia2014-08-312-2/+6
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "MediaCodec: set state to UNINITIALIZED when receiving fatal error." in...Wei Jia2014-08-302-2/+6
| |\ \ \ \ \ \
| | * | | | | | MediaCodec: set state to UNINITIALIZED when receiving fatal error.Wei Jia2014-08-292-2/+6
| | | |/ / / / | | |/| | | |
* | | | | | | am b6b927fc: Merge "Tunneled Video Playback: Changed AudioHwSync token to int...Rachad2014-08-301-4/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Tunneled Video Playback: Changed AudioHwSync token to int32_t to match...Rachad2014-08-301-4/+4
| |\ \ \ \ \ \
| | * | | | | | Tunneled Video Playback:Rachad2014-08-281-4/+4
| | | |_|/ / / | | |/| | | |
* | | | | | | am 3049c672: Merge "stagefright: add codec capability info for google video c...Lajos Molnar2014-08-291-10/+81
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "stagefright: add codec capability info for google video codecs" into l...Lajos Molnar2014-08-291-10/+81
| |\ \ \ \ \ \
| | * | | | | | stagefright: add codec capability info for google video codecsLajos Molnar2014-08-141-10/+81
* | | | | | | | am c2aa6971: Merge "[AU]Sync libmedia/Android.mk modification from KLP-Sprout...Bart Sears2014-08-291-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "[AU]Sync libmedia/Android.mk modification from KLP-Sprout" into lmp-devBart Sears2014-08-291-1/+1
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | [AU]Sync libmedia/Android.mk modification from KLP-SproutHochi Huang2014-08-291-1/+1
| | | |_|/ / / | | |/| | | |
* | | | | | | am 6868628c: Merge "PlaylistFetcher: add lower bound check when starting live...Robert Shih2014-08-281-0/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | PlaylistFetcher: add lower bound check when starting live streamsRobert Shih2014-08-281-0/+3
| | |_|/ / / | |/| | | |
* | | | | | am 277090f1: Merge "Fix potential deadlock in unregisterStaleHandlers()" into...Marco Nelissen2014-08-271-7/+19
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Fix potential deadlock in unregisterStaleHandlers()" into lmp-devMarco Nelissen2014-08-271-7/+19
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Fix potential deadlock in unregisterStaleHandlers()Marco Nelissen2014-08-271-7/+19
| | | |_|/ | | |/| |
* | | | | am d362ea17: Merge "AudioPlayback: delay the post of EOS based on pending pla...Ronghua Wu2014-08-272-22/+19
|\ \ \ \ \ | |/ / / /
| * | | | Merge "AudioPlayback: delay the post of EOS based on pending playout." into l...Ronghua Wu2014-08-272-22/+19
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | AudioPlayback: delay the post of EOS based on pending playout.Ronghua Wu2014-08-272-22/+19
| | |/ /
* | | | am 5bc5b4fb: Merge "NuPlayer: set controlledByApp to true when creating Surfa...Wei Jia2014-08-271-1/+1
|\ \ \ \ | |/ / /
| * | | Merge "NuPlayer: set controlledByApp to true when creating Surface." into lmp...Wei Jia2014-08-271-1/+1
| |\ \ \
| | * | | NuPlayer: set controlledByApp to true when creating Surface.Wei Jia2014-08-261-1/+1
| | |/ /