summaryrefslogtreecommitdiffstats
path: root/include/media
Commit message (Expand)AuthorAgeFilesLines
* am 92990810: am b1231923: am e550d213: am f70b69a8: Merge "stagefright: check...Lajos Molnar2015-10-191-0/+4
|\
| * am e550d213: am f70b69a8: Merge "stagefright: check bounds for MediaCodecList...Lajos Molnar2015-10-191-0/+4
| |\
| | * stagefright: check bounds for MediaCodecList.getCodecInfoLajos Molnar2015-10-121-0/+4
* | | am f106f9e4: am 15e991bd: resolved conflicts for 0b09da7a to lmp-mr1-devWei Jia2015-10-081-0/+6
|\ \ \ | |/ /
| * | resolved conflicts for 0b09da7a to lmp-mr1-devWei Jia2015-10-081-0/+6
| |\ \ | | |/
| | * DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.Wei Jia2015-10-071-0/+6
* | | am 8910f92a: am 2ea335b1: am fecbc5da: am 5b4a5cce: Merge "do not dequeue fro...Jon Larimer2015-08-201-0/+1
|\ \ \ | |/ /
| * | am fecbc5da: am 5b4a5cce: Merge "do not dequeue from native window after we h...Jon Larimer2015-08-181-0/+1
| |\ \ | | |/
| | * do not dequeue from native window after we hit fatal error -- DO NOT MERGEChong Zhang2015-08-171-0/+1
* | | am 0625841d: am dfaea255: am 578d5b66: am 171b5fad: am d6ea7f65: am f26400c9:...Marco Nelissen2015-08-071-1/+1
|\ \ \ | |/ /
| * | am 578d5b66: am 171b5fad: am d6ea7f65: am f26400c9: Fix crash on malformed id3Marco Nelissen2015-08-071-1/+1
| |\ \ | | |/
| | * am d6ea7f65: am f26400c9: Fix crash on malformed id3Marco Nelissen2015-08-071-1/+1
| | |\
| | | * am f26400c9: Fix crash on malformed id3Marco Nelissen2015-08-071-1/+1
| | | |\
| | | | * Fix crash on malformed id3Marco Nelissen2015-08-041-1/+1
| | | * | am 7acac10a: Merge "DO NOT MERGE: Add AUtils::isInRange, and use it to detect...Robert Shih2015-05-111-0/+45
| | | |\ \ | | | | |/
| | | | * DO NOT MERGE: Add AUtils::isInRange, and use it to detect malformed MPEG4 nal...Lajos Molnar2015-04-251-0/+45
* | | | | am b5fbb811: am c8c86c1d: am bcf2becf: am c531d995: am 438217a0: Merge "Add A...Lajos Molnar2015-05-121-0/+22
|\ \ \ \ \ | |/ / / /
| * | | | am c531d995: am 438217a0: Merge "Add AUtils::isInRange, and use it to detect ...Lajos Molnar2015-05-121-0/+22
| |\ \ \ \ | | |/ / /
| | * | | Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizesLajos Molnar2015-04-241-0/+22
| | * | | am 99370d2d: am ae6965ae: am 3aef3560: am e360f0f6: IAudioPolicyService: boun...Eric Laurent2014-11-101-2/+7
| | |\ \ \ | | | |/ /
| | | * | am ae6965ae: am 3aef3560: am e360f0f6: IAudioPolicyService: bound array size ...Eric Laurent2014-11-101-2/+7
| | | |\ \ | | | | |/
| | | | * am 3aef3560: am e360f0f6: IAudioPolicyService: bound array size in queryDefau...Eric Laurent2014-11-101-2/+7
| | | | |\
| | | | | * IAudioPolicyService: bound array size in queryDefaultPreProcessingEric Laurent2014-11-101-2/+7
* | | | | | ulaw and alaw aren't limited to 8kHzMarco Nelissen2015-03-202-2/+2
* | | | | | Merge commit '56fbb4d7bcb34af71a08cd126891afafdec217f1' into HEADBill Yi2015-02-1920-56/+375
|\ \ \ \ \ \
| * \ \ \ \ \ am 4fc5d758: am 0c11f31b: Merge "nuplayer: acquire wakelock during offload pa...Lajos Molnar2015-02-101-0/+68
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | nuplayer: acquire wakelock during offload pause timeoutWeiyin Jiang2015-02-061-0/+68
| * | | | | | am bcd22f0f: am 0662f5b0: Merge "stagefright: add fallback for native flex-YU...Lajos Molnar2015-02-061-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | stagefright: add fallback for native flex-YUV supportLajos Molnar2015-02-041-1/+1
| * | | | | | am 7b66f713: am 57f75272: Merge "stagefright: add support for native flex-YUV...Lajos Molnar2015-02-041-4/+5
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | stagefright: add support for native flex-YUV formatsLajos Molnar2015-02-041-4/+5
| * | | | | | am 6a025acb: am ec0472ba: Merge "Move AString\'s StringPrintf out of the way."Elliott Hughes2015-02-041-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am c9e11696: am 36dca156: Merge "Acodec: Send framerate information to OMX de...Rachad2015-02-021-1/+1
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Acodec: Send framerate information to OMX decoder if availableRachad2015-01-291-1/+1
| * | | | | | | resolved conflicts for merge of b955b722 to lmp-mr1-dev-plus-aospMarco Nelissen2015-01-274-264/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am cec272df: am 724b9ea5: Merge "Replace MidiFile player with a Midi extractor"Marco Nelissen2015-01-133-2/+5
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am 26c73acb: am 0b460ad7: Merge "ACodec: Added support for E-AC3 decoders" in...Rachad2015-01-102-0/+3
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge "ACodec: Added support for E-AC3 decoders" into lmp-mr1-devRachad2015-01-102-0/+3
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | ACodec: Added support for E-AC3 decodersRachad2014-12-232-0/+3
| * | | | | | | | | | resolved conflicts for merge of 2702d5a0 to lmp-mr1-dev-plus-aospMarco Nelissen2015-01-082-3/+48
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am e0344754: am 468977f0: Merge "mark any copyrighted content as protected to...Chong Zhang2015-01-081-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | mark any copyrighted content as protected to disable captureChong Zhang2015-01-071-0/+1
| | | |/ / / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | am 06f99521: am 2aa82e78: Merge "MediaCodecList: handle binder death" into lm...Lajos Molnar2014-12-151-0/+6
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | MediaCodecList: handle binder deathLajos Molnar2014-12-121-0/+6
| * | | | | | | | | | resolved conflicts for merge of 6571ed31 to lmp-mr1-dev-plus-aospLajos Molnar2014-12-111-0/+6
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | stagefright: misc fixes to software video encoders (and decoders)Lajos Molnar2014-12-101-0/+6
| * | | | | | | | | | Merge commit 'f5a968a0' into mmGlenn Kasten2014-12-102-0/+6
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | audio policy: binder calls for dynamic audio policy mixesEric Laurent2014-12-092-0/+6
| * | | | | | | | | | am c49d9cda: am 2dda40d6: Merge "audio policy: add support for custom mixes" ...Eric Laurent2014-12-102-1/+83
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | audio policy: add support for custom mixesEric Laurent2014-12-092-1/+83