summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* FwdLockConv.c: include what you use.Adam Langley2015-05-131-0/+1
* Merge "stagefright: Prevent crashes in ACodec - part 1" into mnc-devJinsuk Kim2015-05-131-136/+219
|\
| * stagefright: Prevent crashes in ACodec - part 1Jinsuk Kim2015-05-131-136/+219
* | Merge "stagefright: rename usePersistentInputSurface to setInputSurface" into...Chong Zhang2015-05-1324-64/+59
|\ \ | |/ |/|
| * stagefright: rename usePersistentInputSurface to setInputSurfaceChong Zhang2015-05-1324-64/+59
* | Merge "libmediaplayerservice: unlock before trying to reclaim drm session." i...Ronghua Wu2015-05-131-0/+11
|\ \
| * | libmediaplayerservice: unlock before trying to reclaim drm session.Ronghua Wu2015-05-131-0/+11
* | | am 0eb7c793: am b5fbb811: am c8c86c1d: am bcf2becf: am c531d995: am 438217a0:...Lajos Molnar2015-05-133-6/+109
|\ \ \
| * \ \ am b5fbb811: am c8c86c1d: am bcf2becf: am c531d995: am 438217a0: Merge "Add A...Lajos Molnar2015-05-123-6/+109
| |\ \ \
| | * \ \ am c8c86c1d: am bcf2becf: am c531d995: am 438217a0: Merge "Add AUtils::isInRa...Lajos Molnar2015-05-123-6/+109
| | |\ \ \
| | | * \ \ am bcf2becf: am c531d995: am 438217a0: Merge "Add AUtils::isInRange, and use ...Lajos Molnar2015-05-123-6/+109
| | | |\ \ \
| | | | * \ \ am c531d995: am 438217a0: Merge "Add AUtils::isInRange, and use it to detect ...Lajos Molnar2015-05-123-6/+109
| | | | |\ \ \
| | | | | * \ \ am 438217a0: Merge "Add AUtils::isInRange, and use it to detect malformed MPE...Lajos Molnar2015-05-123-6/+109
| | | | | |\ \ \
| | | | | | * \ \ Merge "Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizes"...Lajos Molnar2015-05-123-6/+109
| | | | | | |\ \ \
| | | | | | | * | | Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizesLajos Molnar2015-04-243-6/+109
* | | | | | | | | | Merge "audio flinger: fix record permission check" into mnc-devEric Laurent2015-05-131-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | audio flinger: fix record permission checkEric Laurent2015-05-121-1/+1
* | | | | | | | | | | Merge "camera2: Fix arbitration priority calculation." into mnc-devRuben Brunk2015-05-132-42/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | camera2: Fix arbitration priority calculation.Ruben Brunk2015-05-122-42/+6
* | | | | | | | | | | | Merge "MediaSync: support changing surface on the fly." into mnc-devWei Jia2015-05-122-15/+67
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | MediaSync: support changing surface on the fly.Wei Jia2015-05-112-15/+67
* | | | | | | | | | | | | Merge "Fix new[] vs delete mismatch." into mnc-devEvgenii Stepanov2015-05-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix new[] vs delete mismatch.Evgenii Stepanov2015-05-121-1/+1
* | | | | | | | | | | | | | Merge "mediaplayer: get/set PlaybackRate only when AudioSink has been opened....Wei Jia2015-05-121-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | mediaplayer: get/set PlaybackRate only when AudioSink has been opened.Wei Jia2015-05-121-3/+3
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge "Update sampling rate to 192kHz for devices" into mnc-devAndy Hung2015-05-125-7/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Update sampling rate to 192kHz for devicesAndy Hung2015-05-125-7/+23
* | | | | | | | | | | | | | Merge "Work around bug in offload driver" into mnc-devMarco Nelissen2015-05-121-2/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Work around bug in offload driverMarco Nelissen2015-05-121-2/+12
* | | | | | | | | | | | | | | Merge "mediaresourcemanager: change resource manager service log to use ring ...Ronghua Wu2015-05-126-36/+62
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | mediaresourcemanager: change resource manager service log to use ring buffer.Ronghua Wu2015-05-116-36/+62
| | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Fail gracefully when camera app op is not enabled.Svetoslav2015-05-121-1/+7
* | | | | | | | | | | | | | | Merge "Revert "Add camera app op - camera"" into mnc-devSvetoslav Ganov2015-05-128-112/+79
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Revert "Add camera app op - camera"Svetoslav Ganov2015-05-128-112/+79
* | | | | | | | | | | | | | | | Merge "Support channel index masks for output hal" into mnc-devAndy Hung2015-05-122-40/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Support channel index masks for output halAndy Hung2015-05-062-40/+8
* | | | | | | | | | | | | | | | Merge "Allow 8 channels in RecordThread" into mnc-devAndy Hung2015-05-121-3/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Allow 8 channels in RecordThreadAndy Hung2015-05-051-3/+1
* | | | | | | | | | | | | | | | Merge "audiopolicy: Use AUDIO_OUTPUT_FLAG_TTS for TTS stream" into mnc-devJean-Michel Trivi2015-05-111-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | audiopolicy: Use AUDIO_OUTPUT_FLAG_TTS for TTS streamRavi Kumar Alamanda2015-05-111-0/+3
| | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge "HLS: invoke signalEOS on ATSParser to flush out final samples" into mn...Robert Shih2015-05-113-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | HLS: invoke signalEOS on ATSParser to flush out final samplesRobert Shih2015-05-113-0/+13
* | | | | | | | | | | | | | | 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
| | | | | | | |\ \ \ \ \ \ \ \ \