summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fix potential deadlock between AudioPolicyService and AudioSystem" int...Andy Hung2014-09-081-1/+5
|\
| * Fix potential deadlock between AudioPolicyService and AudioSystemAndy Hung2014-09-081-1/+5
* | Merge "NuPlayerDriver: put player in paused state when reaching EOS." into lm...Wei Jia2014-09-081-2/+2
|\ \
| * | NuPlayerDriver: put player in paused state when reaching EOS.Wei Jia2014-09-051-2/+2
* | | 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
* | | Merge "Revert "Revert "disable AwesomePlayer for Ogg vorbis""" into lmp-devAndy Hung2014-09-082-12/+14
|\ \ \
| * | | Revert "Revert "disable AwesomePlayer for Ogg vorbis""Andy Hung2014-09-032-12/+14
* | | | Merge "DO NOT MERGE - MPEG4Extractor: parse csd correctly; workaround malform...Robert Shih2014-09-061-3/+23
|\ \ \ \
| * | | | DO NOT MERGE - MPEG4Extractor: parse csd correctly; workaround malformed csdRobert Shih2014-09-061-3/+23
* | | | | Merge "Cache audio attributes when player not available" into lmp-devJean-Michel Trivi2014-09-051-2/+19
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Cache audio attributes when player not availableJean-Michel Trivi2014-09-051-2/+19
* | | | | 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
* | | | | | Merge "GenericSource: refactor track selection for dedicated looper" into lmp...Robert Shih2014-09-052-16/+189
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | GenericSource: refactor track selection for dedicated looperRobert Shih2014-09-032-16/+189
* | | | | | Merge "NuPlayer: Restrict seek on video texture changes" into lmp-devAndy Hung2014-09-051-1/+7
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | NuPlayer: Restrict seek on video texture changesAndy Hung2014-09-051-1/+7
* | | | | | Merge "NuPlayer: Discard seeks when source and decoders are NULL" into lmp-devAndy Hung2014-09-052-1/+9
|\ \ \ \ \ \ | |/ / / / /
| * | | | | NuPlayer: Discard seeks when source and decoders are NULLAndy Hung2014-09-042-1/+9
* | | | | | Merge "Split CEA-608 Closed caption into 4 tracks CC1~CC4" into lmp-devChong Zhang2014-09-053-67/+134
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Split CEA-608 Closed caption into 4 tracks CC1~CC4Chong Zhang2014-09-033-67/+134
| | |_|/ / | |/| | |
* | | | | Merge "Fix to parse audio_source_t member of audio_attributes_t" into lmp-devEric Laurent2014-09-051-0/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix to parse audio_source_t member of audio_attributes_tHyejin Kim2014-09-051-0/+3
| | |/ / | |/| |
* | | | Merge "PlaylistFetcher: do not reset mStartTimeUs if we are resuming" into lm...Robert Shih2014-09-041-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | PlaylistFetcher: do not reset mStartTimeUs if we are resumingRobert Shih2014-09-031-2/+2
* | | | 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
| | |/ / | |/| |
* | | | 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
| |/ / /
* | | | Merge "Use CharacterEncodingDetector in metadataretriever" into lmp-devMarco Nelissen2014-09-037-199/+97
|\ \ \ \ | |_|/ / |/| | |
| * | | Use CharacterEncodingDetector in metadataretrieverMarco Nelissen2014-09-027-199/+97
* | | | 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
* | | | | 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
* | | | | 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
* | | | | 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
* | | | | | 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
* | | | | | | 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
| | |/ / / / / | |/| | | | |
* | | | | | | 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
| | |/ / / / / | |/| | | | |
* | | | | | | 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
| | |_|/ / / / | |/| | | | |
* | | | | | | 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