summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* media/mtp: Add missing LOCAL_C_INCLUDESDavid 'Digit' Turner2012-01-131-0/+3
* libmedia new can't fail on AndroidGlenn Kasten2012-01-116-28/+1
* Merge "Fix race in AudioSystem::getInputBufferSize"Glenn Kasten2012-01-111-9/+14
|\
| * Fix race in AudioSystem::getInputBufferSizeGlenn Kasten2012-01-101-9/+14
* | Merge "Fix bug in JetPlayer::loadFromFile"Glenn Kasten2012-01-111-2/+2
|\ \
| * | Fix bug in JetPlayer::loadFromFileGlenn Kasten2012-01-101-2/+2
| |/
* | Merge "Simplify range check for audio_mode_t"Glenn Kasten2012-01-111-1/+1
|\ \
| * | Simplify range check for audio_mode_tGlenn Kasten2012-01-101-1/+1
| |/
* | am 05985a2e: am c15cf3d2: Merge "stagefright: limit audio gap for looped play...Eric Laurent2012-01-111-0/+4
|\ \
| * | stagefright: limit audio gap for looped playbackEric Laurent2012-01-091-0/+4
* | | Merge "Declare IAudioTrack methods in binder opcode order"Glenn Kasten2012-01-111-12/+12
|\ \ \
| * | | Declare IAudioTrack methods in binder opcode orderGlenn Kasten2012-01-061-12/+12
* | | | Merge "Fix missing tag in mediaserver ServiceManager: log"Glenn Kasten2012-01-111-0/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix missing tag in mediaserver ServiceManager: logGlenn Kasten2012-01-061-0/+2
| |/ /
* | | Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGESteve Block2012-01-091-1/+1
* | | Merge "Clean up AudioTrack::mActive and stopped()"Glenn Kasten2012-01-091-15/+18
|\ \ \
| * | | Clean up AudioTrack::mActive and stopped()Glenn Kasten2012-01-051-15/+18
| |/ /
* | | Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-0888-579/+579
* | | Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGESteve Block2012-01-0649-178/+178
* | | Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE"Steve Block2012-01-0542-144/+144
|\ \ \ | |/ / |/| |
| * | Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGESteve Block2012-01-0442-144/+144
* | | Merge "Use the standard CC_LIKELY and CC_UNLIKELY macros"Glenn Kasten2012-01-057-39/+30
|\ \ \ | |/ / |/| |
| * | Use the standard CC_LIKELY and CC_UNLIKELY macrosGlenn Kasten2012-01-057-39/+30
* | | Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGESteve Block2012-01-0312-42/+42
|/ /
* | Merge "audio effects: rename configure command"Eric Laurent2011-12-197-75/+263
|\ \
| * | audio effects: rename configure commandEric Laurent2011-12-197-75/+263
* | | Merge "Fix for 5754998 testPerformanceTransitionWithEffectOverlapping test fa...Hong Teng2011-12-161-0/+7
|\ \ \
| * | | Fix for 5754998 testPerformanceTransitionWithEffectOverlapping test failed.Hong Teng2011-12-161-0/+7
* | | | am 0cc1e42d: am ac279de9: Merge "SurfaceMediaSource: use the HW_TEXTURE usage...Dave Burke2011-12-151-1/+3
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | SurfaceMediaSource: use the HW_TEXTURE usage bitJamie Gennis2011-12-151-1/+3
* | | 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
* | | Merge "Fix indentation and whitespace"Glenn Kasten2011-12-141-1/+0
|\ \ \
| * | | Fix indentation and whitespaceGlenn Kasten2011-12-141-1/+0
| |/ /
* | | Merge "Audio C++ comments"Glenn Kasten2011-12-141-1/+1
|\ \ \
| * | | Audio C++ commentsGlenn Kasten2011-12-141-1/+1
| |/ /
* | | Merge "Remove unnecessary this->"Glenn Kasten2011-12-141-15/+15
|\ \ \
| * | | Remove unnecessary this->Glenn Kasten2011-12-141-15/+15
| |/ /
* | | Merge "Delete obsolete includes"Glenn Kasten2011-12-141-6/+0
|\ \ \
| * | | Delete obsolete includesGlenn Kasten2011-12-121-6/+0
| |/ /
* | | Merge "Remove redundant clear()"Glenn Kasten2011-12-141-2/+0
|\ \ \
| * | | Remove redundant clear()Glenn Kasten2011-12-141-2/+0
| |/ /
* | | Merge "AudioTrack::setVolume check range"Glenn Kasten2011-12-141-1/+1
|\ \ \
| * | | AudioTrack::setVolume check rangeGlenn Kasten2011-12-141-1/+1
| |/ /
* | | am 3f6a7d1e: am d70c64db: Revert the following patches because they may lead ...James Dong2011-12-146-81/+25
|\ \ \ | | |/ | |/|
| * | Revert the following patches because they may lead to power regression becaus...James Dong2011-12-146-81/+25
| * | DO NOT MERGE: Support for parsing of "folded" RTSP header valuesAndreas Huber2011-12-132-9/+31
* | | am dc44e06e: am ef664f62: Merge "Fix drm flag setting missed in false drm rec...Jeff Tinker2011-12-121-0/+1
|\ \ \ | |/ /
| * | Fix drm flag setting missed in false drm recognition fix.Jeff Tinker2011-12-091-0/+1
* | | am 406dd5d1: am aadbd80b: Fixed the false drm recognition.James Dong2011-12-122-10/+17
|\ \ \ | |/ /