Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | stagefright: don't use AAtomizer in AMessage | Lajos Molnar | 2014-09-10 | 2 | -31/+98 | |
* | | | | | | | | | | | | | | | | | | | | | | | am ebea445f: am b9b87fe9: mediaplayer: release MediaBuffer in stale input buf... | Lajos Molnar | 2014-09-11 | 1 | -0/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | am b9b87fe9: mediaplayer: release MediaBuffer in stale input buffers | Lajos Molnar | 2014-09-11 | 1 | -0/+11 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | mediaplayer: release MediaBuffer in stale input buffers | Lajos Molnar | 2014-09-10 | 1 | -0/+11 | |
* | | | | | | | | | | | | | | | | | | | | | | | resolved conflicts for merge of 42db212e to master | Wei Jia | 2014-09-11 | 1 | -6/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | am e4c8b32f: Merge "NuPlayerDriver: do not set to paused state when receiving... | Wei Jia | 2014-09-10 | 1 | -5/+8 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | Merge "NuPlayerDriver: do not set to paused state when receiving playback com... | Wei Jia | 2014-09-10 | 1 | -5/+8 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | NuPlayerDriver: do not set to paused state when receiving playback complete a... | Wei Jia | 2014-09-10 | 1 | -5/+8 | |
* | | | | | | | | | | | | | | | | | | | | | | | | am 3eef436c: am 43f2e3cf: Merge "Revert "Fix AAC timestamps for multiple aac ... | Marco Nelissen | 2014-09-11 | 2 | -194/+128 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | am 43f2e3cf: Merge "Revert "Fix AAC timestamps for multiple aac frames per in... | Marco Nelissen | 2014-09-10 | 2 | -194/+128 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "Fix AAC timestamps for multiple aac frames per input buffer"" ... | Marco Nelissen | 2014-09-10 | 2 | -194/+128 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | Revert "Fix AAC timestamps for multiple aac frames per input buffer" | Marco Nelissen | 2014-09-10 | 2 | -194/+128 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | am f2745669: am 74848665: Merge "fix failure in MediaCodecTest#testException"... | Chong Zhang | 2014-09-11 | 1 | -1/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | am 74848665: Merge "fix failure in MediaCodecTest#testException" into lmp-dev | Chong Zhang | 2014-09-10 | 1 | -1/+14 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge "fix failure in MediaCodecTest#testException" into lmp-dev | Chong Zhang | 2014-09-10 | 1 | -1/+14 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | fix failure in MediaCodecTest#testException | Chong Zhang | 2014-09-10 | 1 | -1/+14 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | am 55e9e267: am b606de81: Merge "mediaplayer: limit number of outstanding buf... | Lajos Molnar | 2014-09-11 | 1 | -6/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | am b606de81: Merge "mediaplayer: limit number of outstanding buffer requests"... | Lajos Molnar | 2014-09-10 | 1 | -6/+7 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge "mediaplayer: limit number of outstanding buffer requests" into lmp-dev | Lajos Molnar | 2014-09-10 | 1 | -6/+7 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | mediaplayer: limit number of outstanding buffer requests | Lajos Molnar | 2014-09-09 | 1 | -6/+7 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | am b788e3d3: am 4bcbb07b: Merge "camera2: Fix video snapshot for HAL 2.* devi... | Ruben Brunk | 2014-09-11 | 6 | -2/+53 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | am 4bcbb07b: Merge "camera2: Fix video snapshot for HAL 2.* devices." into lm... | Ruben Brunk | 2014-09-10 | 6 | -2/+53 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge "camera2: Fix video snapshot for HAL 2.* devices." into lmp-dev | Ruben Brunk | 2014-09-10 | 6 | -2/+53 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | camera2: Fix video snapshot for HAL 2.* devices. | Ruben Brunk | 2014-09-09 | 6 | -2/+53 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | am ef2e3619: am 83ee5564: Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_216... | Zhijun He | 2014-09-10 | 2 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | am 83ee5564: Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P" into lmp-dev | Zhijun He | 2014-09-10 | 2 | -1/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P" into lmp-dev | Zhijun He | 2014-09-10 | 2 | -1/+3 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P | Zhijun He | 2014-09-09 | 2 | -1/+3 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | am 5bec1b72: am c99d333f: Merge "audioflinger: fix audio patch release" into ... | Eric Laurent | 2014-09-10 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | am c99d333f: Merge "audioflinger: fix audio patch release" into lmp-dev | Eric Laurent | 2014-09-10 | 1 | -3/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge "audioflinger: fix audio patch release" into lmp-dev | Eric Laurent | 2014-09-10 | 1 | -3/+3 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | audioflinger: fix audio patch release | Eric Laurent | 2014-09-09 | 1 | -3/+3 | |
| | | |/ / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | am 9b14dd23: am 9caf1f56: Merge "Add error code for insufficient output prote... | Jeff Tinker | 2014-09-10 | 1 | -15/+17 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | am 9caf1f56: Merge "Add error code for insufficient output protection" into l... | Jeff Tinker | 2014-09-10 | 1 | -15/+17 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge "Add error code for insufficient output protection" into lmp-dev | Jeff Tinker | 2014-09-09 | 1 | -15/+17 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | Add error code for insufficient output protection | Jeff Tinker | 2014-08-28 | 1 | -15/+17 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | am 59424ee1: am 8716e3f3: Merge "NuPlayer: make previous decoders obsolete wh... | Wei Jia | 2014-09-10 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | am 8716e3f3: Merge "NuPlayer: make previous decoders obsolete when reset is d... | Wei Jia | 2014-09-10 | 1 | -0/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge "NuPlayer: make previous decoders obsolete when reset is done." into lm... | Wei Jia | 2014-09-09 | 1 | -0/+3 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | NuPlayer: make previous decoders obsolete when reset is done. | Wei Jia | 2014-09-09 | 1 | -0/+3 | |
| | | | |/ / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | am ba8711db: am 47a13d45: Merge "[media][nuplayer] Remove debug message EWOUL... | Phil Burk | 2014-09-10 | 1 | -1/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | am 47a13d45: Merge "[media][nuplayer] Remove debug message EWOULDBLOCK" into ... | Phil Burk | 2014-09-10 | 1 | -1/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge "[media][nuplayer] Remove debug message EWOULDBLOCK" into lmp-dev | Phil Burk | 2014-09-09 | 1 | -1/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | [media][nuplayer] Remove debug message EWOULDBLOCK | Phil Burk | 2014-09-09 | 1 | -1/+0 | |
| | | |/ / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | am cce5397d: am 95861b33: Merge " NuPlayer::Renderer::onPause() - Converted C... | Rachad | 2014-09-09 | 1 | -2/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | am 95861b33: Merge " NuPlayer::Renderer::onPause() - Converted CHECK(!mPaused... | Rachad | 2014-09-09 | 1 | -2/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge " NuPlayer::Renderer::onPause() - Converted CHECK(!mPaused) to a warnin... | Rachad | 2014-09-09 | 1 | -2/+4 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | NuPlayer::Renderer::onPause() - Converted CHECK(!mPaused) to a warning. | Rachad | 2014-09-09 | 1 | -2/+4 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | am 95821a0f: am 8270e1d1: Merge "Fix AAC timestamps for multiple aac frames p... | Marco Nelissen | 2014-09-09 | 2 | -128/+194 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | am 8270e1d1: Merge "Fix AAC timestamps for multiple aac frames per input buff... | Marco Nelissen | 2014-09-09 | 2 | -128/+194 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / |