summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | | | | | | | | | | | | | | | | | | stagefright: don't use AAtomizer in AMessageLajos Molnar2014-09-102-31/+98
* | | | | | | | | | | | | | | | | | | | | | | am ebea445f: am b9b87fe9: mediaplayer: release MediaBuffer in stale input buf...Lajos Molnar2014-09-111-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | am b9b87fe9: mediaplayer: release MediaBuffer in stale input buffersLajos Molnar2014-09-111-0/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | mediaplayer: release MediaBuffer in stale input buffersLajos Molnar2014-09-101-0/+11
* | | | | | | | | | | | | | | | | | | | | | | resolved conflicts for merge of 42db212e to masterWei Jia2014-09-111-6/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | am e4c8b32f: Merge "NuPlayerDriver: do not set to paused state when receiving...Wei Jia2014-09-101-5/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | | | | | | | am 3eef436c: am 43f2e3cf: Merge "Revert "Fix AAC timestamps for multiple aac ...Marco Nelissen2014-09-112-194/+128
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | am 43f2e3cf: Merge "Revert "Fix AAC timestamps for multiple aac frames per in...Marco Nelissen2014-09-102-194/+128
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | | | | | | | | am f2745669: am 74848665: Merge "fix failure in MediaCodecTest#testException"...Chong Zhang2014-09-111-1/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | am 74848665: Merge "fix failure in MediaCodecTest#testException" into lmp-devChong Zhang2014-09-101-1/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | Merge "fix failure in MediaCodecTest#testException" into lmp-devChong Zhang2014-09-101-1/+14
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | fix failure in MediaCodecTest#testExceptionChong Zhang2014-09-101-1/+14
* | | | | | | | | | | | | | | | | | | | | | | | | am 55e9e267: am b606de81: Merge "mediaplayer: limit number of outstanding buf...Lajos Molnar2014-09-111-6/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | am b606de81: Merge "mediaplayer: limit number of outstanding buffer requests"...Lajos Molnar2014-09-101-6/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | | | | | | | | am b788e3d3: am 4bcbb07b: Merge "camera2: Fix video snapshot for HAL 2.* devi...Ruben Brunk2014-09-116-2/+53
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | am 4bcbb07b: Merge "camera2: Fix video snapshot for HAL 2.* devices." into lm...Ruben Brunk2014-09-106-2/+53
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | | | | | | | | am ef2e3619: am 83ee5564: Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_216...Zhijun He2014-09-102-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | am 83ee5564: Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P" into lmp-devZhijun He2014-09-102-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | | | | | | | | am 5bec1b72: am c99d333f: Merge "audioflinger: fix audio patch release" into ...Eric Laurent2014-09-101-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | am c99d333f: Merge "audioflinger: fix audio patch release" into lmp-devEric Laurent2014-09-101-3/+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
| | | |/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | am 9b14dd23: am 9caf1f56: Merge "Add error code for insufficient output prote...Jeff Tinker2014-09-101-15/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | am 9caf1f56: Merge "Add error code for insufficient output protection" into l...Jeff Tinker2014-09-101-15/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | | | | | | | | am 59424ee1: am 8716e3f3: Merge "NuPlayer: make previous decoders obsolete wh...Wei Jia2014-09-101-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | am 8716e3f3: Merge "NuPlayer: make previous decoders obsolete when reset is d...Wei Jia2014-09-101-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | 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
| | | | |/ / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | am ba8711db: am 47a13d45: Merge "[media][nuplayer] Remove debug message EWOUL...Phil Burk2014-09-101-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | am 47a13d45: Merge "[media][nuplayer] Remove debug message EWOULDBLOCK" into ...Phil Burk2014-09-101-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | 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
| | | |/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | am cce5397d: am 95861b33: Merge " NuPlayer::Renderer::onPause() - Converted C...Rachad2014-09-091-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | am 95861b33: Merge " NuPlayer::Renderer::onPause() - Converted CHECK(!mPaused...Rachad2014-09-091-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | | | | | | | | am 95821a0f: am 8270e1d1: Merge "Fix AAC timestamps for multiple aac frames p...Marco Nelissen2014-09-092-128/+194
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | am 8270e1d1: Merge "Fix AAC timestamps for multiple aac frames per input buff...Marco Nelissen2014-09-092-128/+194
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / /