summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 "camera2: Fix video snapshot for HAL 2.* devices." into lmp-devRuben Brunk2014-09-106-2/+53
|\ \ \
| * | | camera2: Fix video snapshot for HAL 2.* devices.Ruben Brunk2014-09-096-2/+53
* | | | Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P" into lmp-devZhijun He2014-09-102-1/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | CamcorderProfile: Add QUALITY_HIGH_SPEED_2160PZhijun He2014-09-092-1/+3
* | | | Merge "audioflinger: fix audio patch release" into lmp-devEric Laurent2014-09-101-3/+3
|\ \ \ \
| * | | | audioflinger: fix audio patch releaseEric Laurent2014-09-091-3/+3
| |/ / /
* | | | Merge "Add error code for insufficient output protection" into lmp-devJeff Tinker2014-09-091-15/+17
|\ \ \ \
| * | | | Add error code for insufficient output protectionJeff Tinker2014-08-281-15/+17
* | | | | 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 policy: fix output stream selection" into lmp-devEric Laurent2014-09-092-6/+27
|\ \ \ \ \
| * | | | | audio policy: fix output stream selectionEric Laurent2014-09-082-6/+27
* | | | | | 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 "Camera2: reconfigure video snapshot size if needed" into lmp-devYin-Chia Yeh2014-09-085-4/+93
|\ \ \ \ \ \
| * | | | | | Camera2: reconfigure video snapshot size if neededYin-Chia Yeh2014-09-085-4/+93
* | | | | | | 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-082-6/+10
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Make IPowerManager native conform to .aidl for onewayGlenn Kasten2014-09-052-6/+10
* | | | | | | Merge "audiopolicy: fix direct output profile probing" into lmp-devEric Laurent2014-09-081-7/+39
|\ \ \ \ \ \ \
| * | | | | | | audiopolicy: fix direct output profile probingEric Laurent2014-09-071-7/+39
* | | | | | | | 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 "Fix "invalid device combination" in system audio mode." into lmp-devJungshik Jang2014-09-061-0/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix "invalid device combination" in system audio mode.Jungshik Jang2014-09-051-0/+7
* | | | | | | | | | 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-052-2/+20
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Cache audio attributes when player not availableJean-Michel Trivi2014-09-052-2/+20
* | | | | | | | | 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
generated by cgit v1.1 at 2024-11-01 03:36:56 +0000