summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 644afb88: am 9fc2f470: am 8140a2b7: stagefright: report crop rectangle as ...Lajos Molnar2015-01-071-5/+7
|\
| * am 9fc2f470: am 8140a2b7: stagefright: report crop rectangle as codec resolut...Lajos Molnar2015-01-071-5/+7
| |\
| | * stagefright: report crop rectangle as codec resolution if existsLajos Molnar2015-01-061-5/+7
* | | am bb2e3e9d: am fb5d35c0: am 7ae3dfab: Merge "fix record from default input s...Eric Laurent2015-01-071-4/+0
|\ \ \ | |/ /
| * | am fb5d35c0: am 7ae3dfab: Merge "fix record from default input source" into l...Eric Laurent2015-01-071-4/+0
| |\ \ | | |/
| | * fix record from default input sourceEric Laurent2015-01-061-4/+0
* | | SoundPool: Do not stop AudioTrack on EVENT_NEW_IAUDIOTRACKAndy Hung2015-01-061-3/+4
* | | am 991aa3a7: am bef17542: am 5c97c4e1: Merge "Remove hardcoded ICU & OpenSSL ...Narayan Kamath2015-01-052-5/+0
|\ \ \ | |/ /
| * | am bef17542: am 5c97c4e1: Merge "Remove hardcoded ICU & OpenSSL include paths."Narayan Kamath2015-01-052-5/+0
| |\ \
| | * \ am 5c97c4e1: Merge "Remove hardcoded ICU & OpenSSL include paths."Narayan Kamath2015-01-052-5/+0
| | |\ \
| | | * | Remove hardcoded ICU & OpenSSL include paths.Narayan Kamath2015-01-052-5/+0
* | | | | Cleanup annoying whitespace that causes red markersGlenn Kasten2015-01-022-2/+2
* | | | | Merge "Flowchart for handling of AudioTrack client paused"Glenn Kasten2014-12-302-0/+75
|\ \ \ \ \
| * | | | | Flowchart for handling of AudioTrack client pausedGlenn Kasten2014-12-302-0/+75
* | | | | | Line length 100Glenn Kasten2014-12-308-26/+43
|/ / / / /
* | | | | am 545d5c41: am 69bdf92f: am 0d19abb4: Merge "NuPlayer: Do not recreate Audio...Andy Hung2014-12-292-0/+39
|\ \ \ \ \ | |/ / / /
| * | | | am 69bdf92f: am 0d19abb4: Merge "NuPlayer: Do not recreate AudioTrack if not ...Andy Hung2014-12-292-0/+39
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge "NuPlayer: Do not recreate AudioTrack if not needed" into lmp-mr1-devAndy Hung2014-12-232-0/+39
| | |\ \ \
| | | * | | NuPlayer: Do not recreate AudioTrack if not neededAndy Hung2014-12-192-0/+39
* | | | | | am 8564e13b: resolved conflicts for merge of 2efb9566 to lmp-mr1-dev-plus-aospNarayan Kamath2014-12-297-14/+71
|\ \ \ \ \ \ | |/ / / / /
| * | | | | resolved conflicts for merge of 2efb9566 to lmp-mr1-dev-plus-aospNarayan Kamath2014-12-297-14/+71
| |\ \ \ \ \ | | |/ / / /
| | * | | | HLS: QCom enhancementsRobert Shih2014-12-227-14/+71
* | | | | | Fix 64 bit compiler warnings in AudioTrackSharedAndy Hung2014-12-221-3/+3
* | | | | | am af318e28: am 0b87c0d9: am bd08223c: Merge "Fix double close."Marco Nelissen2014-12-222-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 0b87c0d9: am bd08223c: Merge "Fix double close."Marco Nelissen2014-12-222-1/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | am bd08223c: Merge "Fix double close."Marco Nelissen2014-12-222-1/+1
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Merge "Fix double close."Marco Nelissen2014-12-222-1/+1
| | | |\ \ \
| | | | * | | Fix double close.Bao Haojun2014-05-172-1/+1
| | | * | | | DO NOT MERGE - NuPlayer: open audio sink in offload mode when resuming from t...Ronghua Wu2014-12-183-5/+36
| | | * | | | DO NOT MERGE - NuPlayer: invalid anchor time when render is flushed.Ronghua Wu2014-12-182-0/+8
| | |/ / / /
* | | | | | Merge "Remove explicit instantiation of SingleStateQueue"Andy Hung2014-12-224-147/+0
|\ \ \ \ \ \
| * | | | | | Remove explicit instantiation of SingleStateQueueAndy Hung2014-12-194-147/+0
* | | | | | | Add log tag to FileSourceMarco Nelissen2014-12-221-0/+4
* | | | | | | Merge "Replace MidiFile player with a Midi extractor"Marco Nelissen2014-12-2216-940/+441
|\ \ \ \ \ \ \
| * | | | | | | Replace MidiFile player with a Midi extractorMarco Nelissen2014-12-1816-940/+441
* | | | | | | | am bae511e3: am 4af263bd: am ad019236: Merge "NuPlayer: reports paused positi...Wei Jia2014-12-193-7/+67
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | am 4af263bd: am ad019236: Merge "NuPlayer: reports paused position in paused ...Wei Jia2014-12-193-7/+67
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Merge "NuPlayer: reports paused position in paused state." into lmp-mr1-devWei Jia2014-12-193-7/+67
| | |\ \ \ \ \ \
| | | * | | | | | NuPlayer: reports paused position in paused state.Wei Jia2014-12-193-7/+67
| | | | |_|_|_|/ | | | |/| | | |
* | | | | | | | am 01a7aaf2: am 823ee706: am d4b056da: Merge "NuPlayer: Fix failure to stop a...Andy Hung2014-12-191-4/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 823ee706: am d4b056da: Merge "NuPlayer: Fix failure to stop audio playback...Andy Hung2014-12-191-4/+7
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "NuPlayer: Fix failure to stop audio playback" into lmp-mr1-devAndy Hung2014-12-191-4/+7
| | |\ \ \ \ \ \
| | | * | | | | | NuPlayer: Fix failure to stop audio playbackAndy Hung2014-12-181-4/+7
| | | |/ / / / /
* | | | | | | | am a07593a1: am c9330d9a: am 89ee55cb: Merge "OggExtractor: ignore timestamp ...Robert Shih2014-12-191-10/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am c9330d9a: am 89ee55cb: Merge "OggExtractor: ignore timestamp calculation f...Robert Shih2014-12-191-10/+8
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "OggExtractor: ignore timestamp calculation for configuration packets" ...Robert Shih2014-12-191-10/+8
| | |\ \ \ \ \ \
| | | * | | | | | OggExtractor: ignore timestamp calculation for configuration packetsRobert Shih2014-12-181-10/+8
| | | |/ / / / /
* | | | | | | | am fd923e98: am 9dcc312a: am 1391f933: MPEG4Extractor: null check in MPEG4Sou...Robert Shih2014-12-191-0/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 9dcc312a: am 1391f933: MPEG4Extractor: null check in MPEG4Source::parseChunkRobert Shih2014-12-191-0/+3
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | MPEG4Extractor: null check in MPEG4Source::parseChunkRobert Shih2014-12-171-0/+3
| | |/ / / / /