summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "audio policy: add rules to select audio parameters"Eric Laurent2014-07-103-31/+176
|\
| * audio policy: add rules to select audio parametersEric Laurent2014-07-113-31/+176
* | stagefright: Return correct play position after EOSaarti jadhav-gaikwad2014-07-111-0/+5
|/
* Merge "MediaCodec async callbacks"Chong Zhang2014-07-102-91/+192
|\
| * MediaCodec async callbacksChong Zhang2014-07-112-91/+192
* | stagefright: Pass audio aac sub formats in offloadinfoaarti jadhav-gaikwad2014-07-115-14/+73
|/
* stagefright: add indexed buffer and format getters to MediaCodecLajos Molnar2014-07-112-5/+75
* Merge "Check meta before dereferencing it."Wei Jia2014-07-101-0/+3
|\
| * Check meta before dereferencing it.Wei Jia2014-07-101-0/+3
* | Merge "Return negotiated format with HAL in AudioFlinger"Andy Hung2014-07-102-5/+11
|\ \
| * | Return negotiated format with HAL in AudioFlingerAndy Hung2014-07-102-5/+11
| |/
* | Merge "DNG: Update TiffWriter to handle thumbnails and SubIfds."Ruben Brunk2014-07-1017-149/+938
|\ \
| * | DNG: Update TiffWriter to handle thumbnails and SubIfds.Ruben Brunk2014-07-1017-149/+938
* | | Revamp HDMI-CEC system audio mode integration with audio service.Jungshik Jang2014-07-101-21/+5
| |/ |/|
* | resolved conflicts for merge of 373e21cc to masterElliott Hughes2014-07-091-2/+2
|\ \
| * \ am be44e0e0: am 0bffd2e6: Merge "Switch frameworks/av/media/libmedia to the n...Elliott Hughes2014-07-101-1/+1
| |\ \
| | * \ am 0bffd2e6: Merge "Switch frameworks/av/media/libmedia to the new icu."Elliott Hughes2014-07-101-1/+1
| | |\ \
| | | * \ Merge "Switch frameworks/av/media/libmedia to the new icu."Elliott Hughes2014-07-091-1/+1
| | | |\ \
| | | | * | Switch frameworks/av/media/libmedia to the new icu.Elliott Hughes2014-07-091-1/+1
* | | | | | Add support of audio offloading for NuPlayer.Wei Jia2014-07-0910-46/+641
* | | | | | Merge "Add floating point volume handling to AudioMixer"Andy Hung2014-07-0813-114/+291
|\ \ \ \ \ \
| * | | | | | Add floating point volume handling to AudioMixerAndy Hung2014-07-0813-114/+291
* | | | | | | Merge "Enable extended precision PCM output in AudioFlinger"Andy Hung2014-07-091-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Enable extended precision PCM output in AudioFlingerAndy Hung2014-07-081-1/+1
* | | | | | | | am aae3f86c: (-s ours) DO NOT MERGE: Fix build for libstagefrightLajos Molnar2014-07-090-0/+0
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | DO NOT MERGE: Fix build for libstagefrightLajos Molnar2014-07-092-18/+6
* | | | | | | | Merge "Revise speaker volume curve for media on devices with speaker DRC"Jean-Michel Trivi2014-07-091-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Revise speaker volume curve for media on devices with speaker DRCJean-Michel Trivi2014-07-091-1/+1
* | | | | | | | | Merge "Cleanup unused parameters or variable in EffectBundle"Jean-Michel Trivi2014-07-091-4/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Cleanup unused parameters or variable in EffectBundleJean-Michel Trivi2014-07-081-4/+3
* | | | | | | | | | am 782be1ec: am 1c1b5e51: am c37eaa32: Merge "m4v_h263_enc: Use uint32_t for ...Narayan Kamath2014-07-094-7/+7
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | am 1c1b5e51: am c37eaa32: Merge "m4v_h263_enc: Use uint32_t for ULong"Narayan Kamath2014-07-094-7/+7
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| | * | | | | | | | am c37eaa32: Merge "m4v_h263_enc: Use uint32_t for ULong"Narayan Kamath2014-07-094-7/+7
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | |
| | | * | | | | | | Merge "m4v_h263_enc: Use uint32_t for ULong"Narayan Kamath2014-07-024-7/+7
| | | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | |
| | | | * | | | | | m4v_h263_enc: Use uint32_t for ULongAshok Bhat2014-07-024-7/+7
| | | |/ / / / / /
* | | | | | | | | Merge "Restore the LOOPING flag in onAudioTearDownEvent"Sungsoo Lim2014-07-021-0/+4
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Restore the LOOPING flag in onAudioTearDownEventSungsoo Lim2014-06-271-0/+4
* | | | | | | | | Merge "audio policy: add new input audio device"Terry Heo2014-07-021-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | audio policy: add new input audio deviceTerry Heo2014-07-041-0/+1
* | | | | | | | | | Merge "HLS: do not discard packets when queuing explicit discontinuity"Chong Zhang2014-07-076-31/+41
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | HLS: do not discard packets when queuing explicit discontinuityChong Zhang2014-06-266-31/+41
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge "handle emulation_prevention_three_bytes for AVC"Chong Zhang2014-07-083-5/+89
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | handle emulation_prevention_three_bytes for AVCChong Zhang2014-07-083-5/+89
| |/ / / / / / / / /
* | | | | | | | | | Merge "AString: add startsWithIgnoreCase and endsWithIgnoreCase"Lajos Molnar2014-07-082-0/+16
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | AString: add startsWithIgnoreCase and endsWithIgnoreCaseLajos Molnar2014-06-182-0/+16
* | | | | | | | | | | sound trigger: update HALEric Laurent2014-07-081-14/+11
* | | | | | | | | | | Merge "Replace int bitDepth with audio_format_t in Resampler"Andy Hung2014-07-0711-59/+54
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Replace int bitDepth with audio_format_t in ResamplerAndy Hung2014-07-0711-59/+54
* | | | | | | | | | | | Camera3: Add capture intent for ZSL captureZhijun He2014-07-084-10/+56
* | | | | | | | | | | | stagefright: update ACodec to use CodecBase enumerations directlyLajos Molnar2014-07-073-45/+24