summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge "Move roundup from frameworks/av to system/media"Glenn Kasten2015-01-123-33/+2
|\ \ \ \ \
| * | | | | Move roundup from frameworks/av to system/mediaGlenn Kasten2015-01-073-33/+2
* | | | | | am 7e85361e: am 26c73acb: am 0b460ad7: Merge "ACodec: Added support for E-AC3...Rachad2015-01-102-0/+3
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | 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
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Use callbacks for Midi I/OMarco Nelissen2015-01-082-3/+48
* | | | | | | am 7993d6b3: am e0344754: am 468977f0: Merge "mark any copyrighted content as...Chong Zhang2015-01-081-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | 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
| | | |/ / | | |/| |
* | | | | Event driven wake for AudioTrackThread notification changesAndy Hung2015-01-061-1/+4
* | | | | Improve AudioTrack EVENT_LOOP_END and EVENT_BUFFER_END accuracyAndy Hung2015-01-061-0/+4
* | | | | Fix loop and position restoration in static AudioTracksAndy Hung2015-01-062-9/+34
* | | | | Fix loop and position setting in static AudioTracksAndy Hung2015-01-052-41/+47
| |_|_|/ |/| | |
* | | | am 51281663: am 69897ae4: am 75afcc1f: Merge "Use define for drm property key...Marco Nelissen2015-01-051-5/+5
|\ \ \ \ | |/ / /
| * | | am 69897ae4: am 75afcc1f: Merge "Use define for drm property keys instead of ...Marco Nelissen2015-01-051-5/+5
| |\ \ \ | | | |/ | | |/|
| | * | Use define for drm property keys instead of defining as char pointersMartin Storsjo2014-12-181-5/+5
* | | | Cleanup annoying whitespace that causes red markersGlenn Kasten2015-01-021-1/+1
* | | | Line length 100Glenn Kasten2014-12-306-8/+15
* | | | Merge "Add done() to SingleStateQueue"Andy Hung2014-12-221-4/+28
|\ \ \ \
| * | | | Add done() to SingleStateQueueAndy Hung2014-12-221-4/+28
* | | | | Merge "Remove explicit instantiation of SingleStateQueue"Andy Hung2014-12-221-12/+66
|\ \ \ \ \ | |/ / / /
| * | | | Remove explicit instantiation of SingleStateQueueAndy Hung2014-12-191-12/+66
* | | | | Replace MidiFile player with a Midi extractorMarco Nelissen2014-12-183-2/+5
* | | | | Merge "Use callbacks for Midi I/O"Marco Nelissen2014-12-162-3/+48
|\ \ \ \ \
| * | | | | Use callbacks for Midi I/OMarco Nelissen2014-12-162-3/+48
| |/ / / /
* | | | | am d7aa535f: am 06f99521: am 2aa82e78: Merge "MediaCodecList: handle binder d...Lajos Molnar2014-12-151-0/+6
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | 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
* | | | am 3e08ca67: resolved conflicts for merge of 6571ed31 to lmp-mr1-dev-plus-aospLajos Molnar2014-12-111-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
* | | | am 66b17e9d: Merge commit \'f5a968a0\' into mmGlenn Kasten2014-12-102-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 b279f5ad: am c49d9cda: am 2dda40d6: Merge "audio policy: add support for c...Eric Laurent2014-12-102-1/+83
|\ \ \ \ | |/ / /
| * | | 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
* | | | Remove filename based writer constructorsMarco Nelissen2014-12-108-10/+0
* | | | am e09bf824: am 6874ed79: am a9d2f9fb: Merge "stagefright: preserve output fo...Lajos Molnar2014-12-091-0/+1
|\ \ \ \ | |/ / /
| * | | 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 61280541: am 390ef843: am f20c4356: Merge "AudioRecord: use audio attribut...Eric Laurent2014-11-273-13/+18
|\ \ \ \ | |/ / /
| * | | 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 121143d5: am bf14c62e: am 72bf901c: Merge "audio policy: new getOutputForA...Eric Laurent2014-11-264-21/+83
|\ \ \ \ | |/ / /
| * | | 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
|\ \ \ \ | |/ / /
generated by cgit v1.1 at 2024-04-29 00:08:21 +0000