summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGESteve Block2012-01-0448-155/+155
| | | | | | | See https://android-git.corp.google.com/g/156801 Bug: 5449033 Change-Id: Ib08fe86d23db91ee153e9f91a99a35c42b9208ea
* Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGESteve Block2012-01-0322-91/+91
| | | | | | | See https://android-git.corp.google.com/g/156016 Bug: 5449033 Change-Id: I4c4e33bb9df3e39e11cd985e193e6fbab4635298
* am 21cb1290: Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-200-0/+0
|\ | | | | | | * commit '21cb1290b578a4bceac003c276c00911fcd6c9d4':
| * Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-200-0/+0
| |\ | | | | | | | | | Change-Id: I123bd5ae61ab8c4f6de1a6640faf0bab89f6aa78
| | * merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-160-0/+0
| | |\
* | | \ Merge "Remove dead code"Glenn Kasten2011-12-202-5/+4
|\ \ \ \
| * | | | Remove dead codeGlenn Kasten2011-12-192-6/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: Icf23f7f90fdeb660f4015f22cf239e6d05f5d03c
* | | | | Merge "audio effects: rename configure command"Eric Laurent2011-12-198-76/+264
|\ \ \ \ \
| * | | | | audio effects: rename configure commandEric Laurent2011-12-198-76/+264
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed audio effect library interface command for audio format configuration from EFFECT_CMD_CONFIGURE to EFFECT_CMD_SET_CONFIG. This makes the naming more consistent with other exixsting commands and allow adding a new command to get the configuration (EFFECT_CMD_GET_CONFIG). Same change for reverse channel configuration renamed from EFFECT_CMD_CONFIGURE_REVERSE to EFFECT_CMD_SET_CONFIG_REVERSE. Implemented EFFECT_CMD_GET_CONFIG in exisitng effect libraries. Change-Id: Ia7b1c620f13797fe5aceb3b0b4acbacce09fb067
* | | | | | Merge "Fix for 5754998 testPerformanceTransitionWithEffectOverlapping test ↵Hong Teng2011-12-161-0/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | failed."
| * | | | | | Fix for 5754998 testPerformanceTransitionWithEffectOverlapping test failed.Hong Teng2011-12-161-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Fix the index is out of sync frame array boundary when seeking to end of a 3gp file. Validation only were done for video editor cts test and Movie Studio application. Futher validation may include media player, youtube application,.etc. Change-Id: Ib01314f1768cfab702dbe25c307553ace0b85e77
* | | | | | | Merge "Use constants for 2 and 32"Glenn Kasten2011-12-162-8/+8
|\ \ \ \ \ \ \
| * | | | | | | Use constants for 2 and 32Glenn Kasten2011-12-162-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If820dfd58b6df258570750610a07af99598d9e53
* | | | | | | | Merge "Extract out audio DSP code to utility library"Glenn Kasten2011-12-164-117/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Extract out audio DSP code to utility libraryGlenn Kasten2011-12-164-117/+10
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | Change-Id: Ib8ce72028a7ea30e82baa518e381370e820ebbd0
* | | | | | | Merge "Use switch in AudioMixer::setParameter"Glenn Kasten2011-12-162-36/+49
|\ \ \ \ \ \ \
| * | | | | | | Use switch in AudioMixer::setParameterGlenn Kasten2011-12-162-36/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace series of if/then/elses by easier-to-read switch. Also return void instead of status_t, since callers weren't checking it. Assert on bad input parameters. Change-Id: Ie1f0a297977b28501d20e1af819afed9b4750616
* | | | | | | | deleteTrackName now asserts on bad input parameterGlenn Kasten2011-12-161-17/+16
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is safe, as the input parameter is always track->name(), which must be valid. Change-Id: Iea8ea3a5706c27026335526ba8851030d00681f8
* | | | | | | am 57ea96a4: Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-160-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * commit '57ea96a4b3273aa8592873355a2f79c74b1abec1': SurfaceMediaSource: use the HW_TEXTURE usage bit SurfaceMediaSource: use the HW_TEXTURE usage bit
| * | | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-160-0/+0
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | Change-Id: Ib2cbd92ed2d3567e22921b66ca2202a968fdd0da
| | * | | | | SurfaceMediaSource: use the HW_TEXTURE usage bitJamie Gennis2011-12-151-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes SurfaceMediaSource request Gralloc buffers with the HW_TEXTURE usage bit rather than the VIDEO_ENCODER bit. It is a temporary workaround for what is likely a Gralloc bug. Bug: 5771063 Change-Id: I9cce615e80fc14a1644fae27ba06970c262dd179
| | * | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-151-3/+1
| | | | | | |
| | * | | | | SurfaceMediaSource: use the HW_TEXTURE usage bitJamie Gennis2011-12-151-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes SurfaceMediaSource request Gralloc buffers with the HW_TEXTURE usage bit rather than the VIDEO_ENCODER bit. It is a temporary workaround for what is likely a Gralloc bug. Bug: 5771063 Change-Id: I9cce615e80fc14a1644fae27ba06970c262dd179
| | * | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-12-140-0/+0
| | |\ \ \ \ \
* | | \ \ \ \ \ Merge "setActiveTrack and setBufferProvider can't fail"Glenn Kasten2011-12-162-10/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | setActiveTrack and setBufferProvider can't failGlenn Kasten2011-12-152-10/+9
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return void, not status_t, from setActiveTrack and setBufferProvider. These methods returned status_t, but the callers never checked the return value. Since these aren't externally visible APIs, they now return void, and assert on bad input parameters. Change-Id: I530ed29484596ae41e8659826ca425149c51c2a1
* | | | | | | | Merge "Simplify enable/disable mixing"Glenn Kasten2011-12-163-30/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | Simplify enable/disable mixingGlenn Kasten2011-12-153-30/+15
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The MIXING enum isn't needed, and now returns void instead of status_t. Change-Id: Ibe4ec24081d75ad4ab78b9c7191fc9077959c4e9
* | | | | | | | am 0cc1e42d: am ac279de9: Merge "SurfaceMediaSource: use the HW_TEXTURE ↵Dave Burke2011-12-151-1/+3
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | / / / | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | usage bit" into ics-mr1 * commit '0cc1e42d74e09c259a6da0abc9009d1abf7537b1': SurfaceMediaSource: use the HW_TEXTURE usage bit
| * | | | | | am ac279de9: Merge "SurfaceMediaSource: use the HW_TEXTURE usage bit" into ↵Dave Burke2011-12-151-1/+3
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ics-mr1 * commit 'ac279de9d9fcfd59a336298cfdd5b1f4ab6d038f': SurfaceMediaSource: use the HW_TEXTURE usage bit
| | * | | | | SurfaceMediaSource: use the HW_TEXTURE usage bitJamie Gennis2011-12-151-1/+3
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes SurfaceMediaSource request Gralloc buffers with the HW_TEXTURE usage bit rather than the VIDEO_ENCODER bit. It is a temporary workaround for what is likely a Gralloc bug. Bug: 5771063 Change-Id: I9cce615e80fc14a1644fae27ba06970c262dd179
* | | | | | Merge "Improve resistance to leaks for ConfigEvent"Glenn Kasten2011-12-152-8/+7
|\ \ \ \ \ \
| * | | | | | Improve resistance to leaks for ConfigEventGlenn Kasten2011-12-152-8/+7
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A Vector of pointers is risky, as there is no ownership (and the ThreadBase destructor was not deleting them, so if there were any left over at end it would leak). Replaced by a Vector of values. Change-Id: Iddde72dc30134adfcf724dec26cbe0a742509b8c
* | | | | | Merge "Use NULL not 0 for pointers"Glenn Kasten2011-12-153-29/+29
|\ \ \ \ \ \
| * | | | | | Use NULL not 0 for pointersGlenn Kasten2011-12-153-29/+29
| |/ / / / / | | | | | | | | | | | | | | | | | | Change-Id: Iab3f9abbdab617dc5a599e657ec46a0b0a002eef
* | | | | | Merge "Fix build error when verbose logging is enabled"Glenn Kasten2011-12-151-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fix build error when verbose logging is enabledGlenn Kasten2011-12-151-1/+1
| |/ / / / | | | | | | | | | | | | | | | Change-Id: I30f4e5d35d1b24dce2e6152a13fd0fb61414a3e2
* | | | | Merge "Fix indentation and whitespace"Glenn Kasten2011-12-143-55/+53
|\ \ \ \ \
| * | | | | Fix indentation and whitespaceGlenn Kasten2011-12-143-55/+53
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Use git diff -w to verify. Change-Id: Ib65be0a1ecf65d6cad516110604e3855bf68a638
* | | | | Merge "Improve AudioFlinger error logging"Glenn Kasten2011-12-141-3/+8
|\ \ \ \ \
| * | | | | Improve AudioFlinger error loggingGlenn Kasten2011-12-141-3/+8
| |/ / / / | | | | | | | | | | | | | | | Change-Id: I8ce9aff4038cd7fa0067600faa8080b137db1939
* | | | | Merge "AudioMixer uninitialized simple fields"Glenn Kasten2011-12-141-0/+6
|\ \ \ \ \
| * | | | | AudioMixer uninitialized simple fieldsGlenn Kasten2011-12-141-0/+6
| |/ / / / | | | | | | | | | | | | | | | Change-Id: I47e3849f048d4d990c9634f9c8a2ca2de0339e93
* | | | | Merge "Audio C++ comments"Glenn Kasten2011-12-146-63/+59
|\ \ \ \ \
| * | | | | Audio C++ commentsGlenn Kasten2011-12-146-63/+59
| |/ / / / | | | | | | | | | | | | | | | Change-Id: I84906ebb9dfcfa5b96b287d18364b407f02a30c1
* | | | | am b14436d0: Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-140-0/+0
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * commit 'b14436d0700f6e837e4d6066ddcf672c61d7f033': Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.
| * | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-140-0/+0
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | Change-Id: I1b745b11729a3fda14ffe44f1f44854e087318c7
| | * | | Revert the following patches because they may lead to power regression ↵James Dong2011-12-147-84/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b. 2. Revert "Fixed the false drm recognition." This reverts commit aadbd80b307c817698ce5110ff8e002804d1b230. 3. Revert "Fix drm enumeration order, resolves failure to play forward lock ringtones" This reverts commit a5cbf023e349f2394ba6fc58d73b4375cfec4369. 4. Revert "Fix ANRs due to Widevine DRM plugin sniff taking too long." This reverts commit d0d19db1ca1c289b069db33f4665bcb9386064e9. As a result of the reverting, many ANRs from WV sniffing are back. related-to-bug: 5739618
* | | | | Merge "Remove unnecessary this->"Glenn Kasten2011-12-141-15/+15
|\ \ \ \ \
| * | | | | Remove unnecessary this->Glenn Kasten2011-12-141-15/+15
| | |_|/ / | |/| | | | | | | | | | | | | Change-Id: I72038f5d4568f0633d3e4ab90f4b67e2dd22c332
generated by cgit v1.1 at 2025-11-02 10:57:12 +0000