summaryrefslogtreecommitdiffstats
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-038-55/+98
|\ \ \ \ | |/ / /
| * | | Merge "Use CharacterEncodingDetector in metadataretriever" into lmp-devMarco Nelissen2014-09-038-55/+98
| |\ \ \
| | * | | Use CharacterEncodingDetector in metadataretrieverMarco Nelissen2014-09-028-55/+98
* | | | | 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-032-31/+12
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Fix more potential deadlocks in ALooperRoster" into lmp-devMarco Nelissen2014-09-032-31/+12
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fix more potential deadlocks in ALooperRosterMarco Nelissen2014-08-282-31/+12
* | | | | | am 23c8cf95: Merge "Restore the ability to build tee sink for debugging" into...Glenn Kasten2014-09-033-12/+16
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Restore the ability to build tee sink for debugging" into lmp-devGlenn Kasten2014-09-033-12/+16
| |\ \ \ \ \
| | * | | | | Restore the ability to build tee sink for debuggingGlenn Kasten2014-09-023-12/+16
| | | |/ / / | | |/| | |
* | | | | | 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 97d547da: audio flinger: fix use of global effect bufferEric Laurent2014-09-031-0/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | audio flinger: fix use of global effect bufferEric Laurent2014-09-021-0/+4
| | |_|_|_|/ | |/| | | |
* | | | | | am b72726ba: Merge "camera1: Ensure MemoryHeap buffers are mmapped before cop...Ruben Brunk2014-09-021-1/+14
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "camera1: Ensure MemoryHeap buffers are mmapped before copying." into l...Ruben Brunk2014-09-021-1/+14
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | camera1: Ensure MemoryHeap buffers are mmapped before copying.Ruben Brunk2014-08-291-1/+14
* | | | | | 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-302-5/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Tunneled Video Playback: Changed AudioHwSync token to int32_t to match...Rachad2014-08-302-5/+5
| |\ \ \ \ \ \ \
| | * | | | | | | Tunneled Video Playback:Rachad2014-08-282-5/+5
* | | | | | | | | 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 4030b561: Merge "sound trigger: fix cross deadlock between service and cli...Eric Laurent2014-08-291-20/+38
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge "sound trigger: fix cross deadlock between service and client" into lmp...Eric Laurent2014-08-291-20/+38
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | sound trigger: fix cross deadlock between service and clientEric Laurent2014-08-281-20/+38
* | | | | | | | | | | am 9a63396f: Merge "audio policy: fix input source passed to openInput()" int...Eric Laurent2014-08-291-2/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge "audio policy: fix input source passed to openInput()" into lmp-devEric Laurent2014-08-291-2/+4
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | audio policy: fix input source passed to openInput()Eric Laurent2014-08-281-2/+4
| | |/ / / / / / / / /