summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* audiopolicy: Use AUDIO_OUTPUT_FLAG_TTS for TTS streamRavi Kumar Alamanda2015-05-111-0/+3
* am a4b4ca50: (-s ours) am bfcd6e64: am 9a0cc7e4: am 07e80f7a: am e635f070: am...Robert Shih2015-05-110-0/+0
|\
| * am bfcd6e64: am 9a0cc7e4: am 07e80f7a: am e635f070: am 6d2281b9: am a3e8f60f:...Robert Shih2015-05-110-0/+0
| |\
| | * am 9a0cc7e4: am 07e80f7a: am e635f070: am 6d2281b9: am a3e8f60f: (-s ours) am...Robert Shih2015-05-110-0/+0
| | |\
| | | * am 07e80f7a: am e635f070: am 6d2281b9: am a3e8f60f: (-s ours) am 7acac10a: Me...Robert Shih2015-05-110-0/+0
| | | |\
| | | | * am e635f070: am 6d2281b9: am a3e8f60f: (-s ours) am 7acac10a: Merge "DO NOT M...Robert Shih2015-05-110-0/+0
| | | | |\
| | | | | * am 6d2281b9: am a3e8f60f: (-s ours) am 7acac10a: Merge "DO NOT MERGE: Add AUt...Robert Shih2015-05-110-0/+0
| | | | | |\
| | | | | | * am a3e8f60f: (-s ours) am 7acac10a: Merge "DO NOT MERGE: Add AUtils::isInRang...Robert Shih2015-05-110-0/+0
| | | | | | |\
| | | | | | | * am 7acac10a: Merge "DO NOT MERGE: Add AUtils::isInRange, and use it to detect...Robert Shih2015-05-113-6/+169
| | | | | | | |\
| | | | | | | | * Merge "DO NOT MERGE: Add AUtils::isInRange, and use it to detect malformed MP...Robert Shih2015-05-113-6/+169
| | | | | | | | |\
| | | | | | | | | * DO NOT MERGE: Add AUtils::isInRange, and use it to detect malformed MPEG4 nal...Lajos Molnar2015-04-253-6/+169
* | | | | | | | | | stagefright: fix legacy-adaptive experimentLajos Molnar2015-05-081-34/+35
* | | | | | | | | | Merge "AudioMixer: fix for volume ramp in float mode" into mnc-devEric Laurent2015-05-091-1/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | AudioMixer: fix for volume ramp in float modeEric Laurent2015-05-081-1/+2
* | | | | | | | | | | Merge "Revert "Revert "Enable full floating point path in AudioMixer""" into ...Eric Laurent2015-05-091-3/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Revert "Revert "Enable full floating point path in AudioMixer""Eric Laurent2015-05-081-3/+3
* | | | | | | | | | | | Merge "audio flinger: fix fuzz test crash" into mnc-devEric Laurent2015-05-083-7/+22
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | audio flinger: fix fuzz test crashEric Laurent2015-05-083-7/+22
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "libstagefright: report special error when codec is released by resourc...Ronghua Wu2015-05-082-13/+51
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | libstagefright: report special error when codec is released by resource manager.Ronghua Wu2015-05-082-13/+51
* | | | | | | | | | | | | Merge changes from topic 'codec-surface' into mnc-devLajos Molnar2015-05-085-18/+158
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | stagefright: enable experimentsLajos Molnar2015-05-075-4/+110
| * | | | | | | | | | | | | stagefright: allow connecting to surfaces that attach buffersLajos Molnar2015-05-071-15/+49
* | | | | | | | | | | | | | Fix comparison sign warnings.Dan Albert2015-05-081-3/+3
* | | | | | | | | | | | | | libstagefright: config resource manager with secure codec co-existing policy.Ronghua Wu2015-05-088-19/+62
* | | | | | | | | | | | | | Merge "Prevent integer overflow when processing covr MPEG4 atoms" into mnc-devNick Kralevich2015-05-081-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Prevent integer overflow when processing covr MPEG4 atomsJoshua J. Drake2015-05-071-0/+4
* | | | | | | | | | | | | | | Merge "Kill a new user of stlport." into mnc-devDan Albert2015-05-081-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Kill a new user of stlport.Dan Albert2015-05-071-2/+0
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge "Fix integer overflow when handling MPEG4 tx3g atom" into mnc-devNick Kralevich2015-05-081-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix integer overflow when handling MPEG4 tx3g atomJoshua J. Drake2015-05-071-0/+4
* | | | | | | | | | | | | | | Merge "Prevent integer underflow if size is below 6" into mnc-devNick Kralevich2015-05-081-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Prevent integer underflow if size is below 6Joshua J. Drake2015-05-071-0/+4
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge "Fix integer underflow in covr MPEG4 processing" into mnc-devNick Kralevich2015-05-081-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fix integer underflow in covr MPEG4 processingJoshua J. Drake2015-05-071-0/+4
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge "mediaresourcemanager: add ServiceLog to track the calling history for ...Ronghua Wu2015-05-087-13/+222
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | mediaresourcemanager: add ServiceLog to track the calling history for dumpsys.Ronghua Wu2015-05-077-13/+222
* | | | | | | | | | | | | | | | Merge "Prevent reading past the end of the buffer in 3GPP" into mnc-devNick Kralevich2015-05-081-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Prevent reading past the end of the buffer in 3GPPJoshua J. Drake2015-05-071-2/+3
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge "libstagefright: export profiling results directly to xml." into mnc-devRonghua Wu2015-05-085-371/+123
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | libstagefright: export profiling results directly to xml.Ronghua Wu2015-05-055-371/+123
* | | | | | | | | | | | | | | | Merge "Revert "Enable full floating point path in AudioMixer"" into mnc-devEric Laurent2015-05-071-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Revert "Enable full floating point path in AudioMixer"Eric Laurent2015-05-071-3/+3
* | | | | | | | | | | | | | | | Merge "nuplayer: fixes for subtitle pause/resume" into mnc-devChong Zhang2015-05-074-8/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | nuplayer: fixes for subtitle pause/resumeChong Zhang2015-05-064-8/+29
* | | | | | | | | | | | | | | | Merge changes from topic 'codec-setsurface' into mnc-devLajos Molnar2015-05-079-441/+288
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | stagefright: support push-blank-buffers-on-shutdown for SW rendererLajos Molnar2015-05-072-0/+15
| * | | | | | | | | | | | | | | | ACodec: blank surface when switching to another surfaceLajos Molnar2015-05-071-0/+5
| * | | | | | | | | | | | | | | | stagefright: move native window helpers into SurfaceUtilsLajos Molnar2015-05-077-441/+268
| | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge "Fix build" into mnc-devMarco Nelissen2015-05-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \