summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "NuPlayerDriver: do not set to paused state when receiving playback com...Wei Jia2014-09-101-5/+8
|\
| * NuPlayerDriver: do not set to paused state when receiving playback complete a...Wei Jia2014-09-101-5/+8
* | Merge "Revert "Fix AAC timestamps for multiple aac frames per input buffer"" ...Marco Nelissen2014-09-102-194/+128
|\ \
| * | Revert "Fix AAC timestamps for multiple aac frames per input buffer"Marco Nelissen2014-09-102-194/+128
* | | Merge "fix failure in MediaCodecTest#testException" into lmp-devChong Zhang2014-09-101-1/+14
|\ \ \ | |/ / |/| |
| * | fix failure in MediaCodecTest#testExceptionChong Zhang2014-09-101-1/+14
* | | Merge "mediaplayer: limit number of outstanding buffer requests" into lmp-devLajos Molnar2014-09-101-6/+7
|\ \ \
| * | | mediaplayer: limit number of outstanding buffer requestsLajos Molnar2014-09-091-6/+7
| | |/ | |/|
* | | Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P" into lmp-devZhijun He2014-09-101-0/+1
|\ \ \ | |/ / |/| |
| * | CamcorderProfile: Add QUALITY_HIGH_SPEED_2160PZhijun He2014-09-091-0/+1
* | | Merge "NuPlayer: make previous decoders obsolete when reset is done." into lm...Wei Jia2014-09-091-0/+3
|\ \ \
| * | | NuPlayer: make previous decoders obsolete when reset is done.Wei Jia2014-09-091-0/+3
| |/ /
* | | Merge "[media][nuplayer] Remove debug message EWOULDBLOCK" into lmp-devPhil Burk2014-09-091-1/+0
|\ \ \
| * | | [media][nuplayer] Remove debug message EWOULDBLOCKPhil Burk2014-09-091-1/+0
| |/ /
* | | Merge " NuPlayer::Renderer::onPause() - Converted CHECK(!mPaused) to a warnin...Rachad2014-09-091-2/+4
|\ \ \ | |/ / |/| |
| * | NuPlayer::Renderer::onPause() - Converted CHECK(!mPaused) to a warning.Rachad2014-09-091-2/+4
* | | 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
* | | | Merge "NuPlayer: check mSource before deferencing it." into lmp-devWei Jia2014-09-091-1/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | NuPlayer: check mSource before deferencing it.Wei Jia2014-09-091-1/+2
* | | | Merge "[audio][nuplayer] Aggregate buffers to reduce power." into lmp-devPhil Burk2014-09-082-4/+94
|\ \ \ \ | |_|_|/ |/| | |
| * | | [audio][nuplayer] Aggregate buffers to reduce power.Phil Burk2014-09-082-4/+94
* | | | 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
| | |/ / | |/| |