summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* opus: Support for > 2 channelsVignesh Venkatasubramanian2015-01-262-3/+31
* am 4beddcf5: am 9e308de9: am 4d4ea7f7: Merge "do not use paused postition if ...Chong Zhang2015-01-161-2/+8
|\
| * am 9e308de9: am 4d4ea7f7: Merge "do not use paused postition if it\'s not ava...Chong Zhang2015-01-161-2/+8
| |\
| | * Merge "do not use paused postition if it's not available" into lmp-mr1-devChong Zhang2015-01-161-2/+8
| | |\
| | | * do not use paused postition if it's not availableChong Zhang2015-01-151-2/+8
| | * | MidiFile: report correct state during transient period when start() is called...Wei Jia2015-01-141-1/+1
| * | | am e680491e: am 1efe46de: Merge "Fix id3 parser crash"Marco Nelissen2015-01-151-2/+9
| |\ \ \
| | * \ \ am 1efe46de: Merge "Fix id3 parser crash"Marco Nelissen2015-01-151-2/+9
| | |\ \ \
| | | * | | Fix id3 parser crashMarco Nelissen2015-01-151-2/+9
| * | | | | am cec272df: am 724b9ea5: Merge "Replace MidiFile player with a Midi extractor"Marco Nelissen2015-01-1316-940/+441
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 724b9ea5: Merge "Replace MidiFile player with a Midi extractor"Marco Nelissen2015-01-1316-940/+441
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "Replace MidiFile player with a Midi extractor"Marco Nelissen2015-01-1316-940/+441
| | | |\ \ \
| | | | * | | Replace MidiFile player with a Midi extractorMarco Nelissen2015-01-0816-940/+441
| | * | | | | am a2d2c48a: Merge "Don\'t signal an error at the end of a short file"Marco Nelissen2015-01-091-19/+11
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "Don't signal an error at the end of a short file"Marco Nelissen2015-01-091-19/+11
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | Don't signal an error at the end of a short fileMarco Nelissen2014-12-231-19/+11
* | | | | | | Merge "Allow AUDIO_FORMAT_PCM_8_BIT AudioTrack buffers"Andy Hung2015-01-151-46/+15
|\ \ \ \ \ \ \
| * | | | | | | Allow AUDIO_FORMAT_PCM_8_BIT AudioTrack buffersAndy Hung2015-01-141-46/+15
* | | | | | | | Fix id3 parser crashMarco Nelissen2015-01-151-2/+9
* | | | | | | | Merge "Fix cumulative error in setPositionNotificationPeriod"Andy Hung2015-01-141-2/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Fix cumulative error in setPositionNotificationPeriodAndy Hung2015-01-071-2/+3
* | | | | | | | Merge "Move roundup from frameworks/av to system/media"Glenn Kasten2015-01-125-37/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Move roundup from frameworks/av to system/mediaGlenn Kasten2015-01-075-37/+5
* | | | | | | | | am 7e85361e: am 26c73acb: am 0b460ad7: Merge "ACodec: Added support for E-AC3...Rachad2015-01-102-0/+68
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | am 26c73acb: am 0b460ad7: Merge "ACodec: Added support for E-AC3 decoders" in...Rachad2015-01-102-0/+68
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| | * | | | | | | Merge "ACodec: Added support for E-AC3 decoders" into lmp-mr1-devRachad2015-01-102-0/+68
| | |\ \ \ \ \ \ \
| | | * | | | | | | ACodec: Added support for E-AC3 decodersRachad2014-12-232-0/+68
* | | | | | | | | | am e6453027: am d8ba6ef1: am 38a97bd7: stagefright: keep alignment restrictio...Lajos Molnar2015-01-101-21/+14
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am d8ba6ef1: am 38a97bd7: stagefright: keep alignment restrictions for SoftVi...Lajos Molnar2015-01-101-21/+14
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | stagefright: keep alignment restrictions for SoftVideoDecoderLajos Molnar2015-01-091-21/+14
* | | | | | | | | | am 9a9c9be1: am d18196a1: am c8c68c88: Merge "Use aligned width and height to...Ronghua Wu2015-01-081-3/+6
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am d18196a1: am c8c68c88: Merge "Use aligned width and height to compute size...Ronghua Wu2015-01-081-3/+6
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge "Use aligned width and height to compute size." into lmp-mr1-devRonghua Wu2015-01-081-3/+6
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Use aligned width and height to compute size.Ronghua Wu2015-01-071-3/+6
| | | |/ / / / / / /
| * | | | | | | | | resolved conflicts for merge of 2702d5a0 to lmp-mr1-dev-plus-aospMarco Nelissen2015-01-087-61/+97
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| | * | | | | | | | am c52af00b: Merge "Use callbacks for Midi I/O"Marco Nelissen2015-01-087-61/+99
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | |
| | | * | | | | | | Use callbacks for Midi I/OMarco Nelissen2015-01-087-61/+99
* | | | | | | | | | am 7993d6b3: am e0344754: am 468977f0: Merge "mark any copyrighted content as...Chong Zhang2015-01-084-1/+18
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am e0344754: am 468977f0: Merge "mark any copyrighted content as protected to...Chong Zhang2015-01-084-1/+18
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge "mark any copyrighted content as protected to disable capture" into lmp...Chong Zhang2015-01-084-1/+18
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | mark any copyrighted content as protected to disable captureChong Zhang2015-01-074-1/+18
| | | | |_|/ / / / / | | | |/| | | | | |
* | | | | | | | | | Merge "Event driven wake for AudioTrackThread notification changes"Andy Hung2015-01-072-3/+38
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | Event driven wake for AudioTrackThread notification changesAndy Hung2015-01-062-3/+38
* | | | | | | | | | Merge "Improve AudioTrack EVENT_LOOP_END and EVENT_BUFFER_END accuracy"Andy Hung2015-01-071-11/+40
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Improve AudioTrack EVENT_LOOP_END and EVENT_BUFFER_END accuracyAndy Hung2015-01-061-11/+40
* | | | | | | | | | Merge "Fix loop and position restoration in static AudioTracks"Andy Hung2015-01-072-46/+74
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Fix loop and position restoration in static AudioTracksAndy Hung2015-01-062-46/+74
* | | | | | | | | | Merge "Fix loop and position setting in static AudioTracks"Andy Hung2015-01-072-61/+140
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | / / / | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Fix loop and position setting in static AudioTracksAndy Hung2015-01-052-61/+140
* | | | | | | | | am 644afb88: am 9fc2f470: am 8140a2b7: stagefright: report crop rectangle as ...Lajos Molnar2015-01-071-5/+7
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |