summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* ulaw and alaw aren't limited to 8kHzMarco Nelissen2015-03-202-2/+2
* Merge commit '56fbb4d7bcb34af71a08cd126891afafdec217f1' into HEADBill Yi2015-02-1922-58/+384
|\
| * 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 69897ae4: am 75afcc1f: Merge "Use define for drm property keys instead of ...Marco Nelissen2015-01-051-5/+5
| |\ \ \ \ \ \
| * \ \ \ \ \ \ 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
| * | | | | | | am 6874ed79: am a9d2f9fb: Merge "stagefright: preserve output format flags on...Lajos Molnar2014-12-081-0/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | stagefright: preserve output format flags on format changeLajos Molnar2014-12-051-0/+1
| * | | | | | | am 390ef843: am f20c4356: Merge "AudioRecord: use audio attributes instead of...Eric Laurent2014-11-273-13/+18
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | AudioRecord: use audio attributes instead of audio source.Eric Laurent2014-11-253-13/+18
| * | | | | | | am bf14c62e: am 72bf901c: Merge "audio policy: new getOutputForAttr() prototy...Eric Laurent2014-11-264-21/+83
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | audio policy: new getOutputForAttr() prototype.Eric Laurent2014-11-254-21/+83
| * | | | | | | am f8c2d166: am a7cf01da: Merge "Fix missing loop count for static tracks." i...Glenn Kasten2014-11-211-1/+8
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Fix missing loop count for static tracks." into lmp-mr1-devGlenn Kasten2014-11-201-1/+8
| | |\ \ \ \ \ \
| | | * | | | | | Fix missing loop count for static tracks.Andy Hung2014-11-181-1/+8
| * | | | | | | | am 568689b1: am 3a2a32b5: Merge "AudioSystem: fix cross deadlock" into lmp-mr...Eric Laurent2014-11-211-2/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | AudioSystem: fix cross deadlockEric Laurent2014-11-201-2/+2
| * | | | | | | | am 902dc42d: am 07715ac3: Merge "C++11 compatibility."Dan Albert2014-11-201-4/+5
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am 4fd641be: am bbda5ce4: Merge "AudioSystem: Add mutex for output cache" int...Eric Laurent2014-11-191-4/+5
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | AudioSystem: Add mutex for output cacheEric Laurent2014-11-191-4/+5
| * | | | | | | | | am d86450b9: am c80b9b83: Merge "Fix struct vs. class mismatches"Chih-hung Hsieh2014-11-171-1/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am 990dad99: Merge "remove AudioSystem::getOutputSamplingRateForAttr()" into ...Eric Laurent2014-11-141-2/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge "remove AudioSystem::getOutputSamplingRateForAttr()" into lmp-mr1-devEric Laurent2014-11-141-2/+0
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | remove AudioSystem::getOutputSamplingRateForAttr()Eric Laurent2014-11-121-2/+0
| * | | | | | | | | | | am 41907c44: am cede28e2: Merge "stagefright: add runtime debug support" into...Lajos Molnar2014-11-142-0/+66
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge "stagefright: add runtime debug support" into lmp-mr1-devLajos Molnar2014-11-142-0/+66
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | stagefright: add runtime debug supportLajos Molnar2014-11-122-0/+66
| | | |/ / / / / / / /
| * | | | | | | | | | am 08961d0b: am 97e6ca1a: Merge "Stagefright: use MediaCodec in async mode fo...Chong Zhang2014-11-141-4/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /