summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* 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
* | 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
* | | | 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
* | | | | 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
* | | | | 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
| |/ / / /
* | | | | 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 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 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 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
| |/ / /
* | | | am 1c2e3113: am 6f3b732b: Merge "Fix wrong int argument of FOURCC."Chih-Hung Hsieh2014-12-181-4/+4
|\ \ \ \ | | |/ / | |/| |
| * | | Fix wrong int argument of FOURCC.Chih-Hung Hsieh2014-12-161-4/+4
* | | | am 562b98ec: am e48cf5b8: Fix bounds checking for GetPartialObject commandMike Lockwood2014-12-171-2/+8
|\ \ \ \ | | |/ / | |/| |
| * | | Fix bounds checking for GetPartialObject commandMike Lockwood2014-12-171-2/+8
* | | | am d33712d7: am 145cf5d8: Merge "audioflinger: implement pause/resume for dir...Eric Laurent2014-12-171-0/+5
|\ \ \ \ | |/ / /
| * | | Merge "audioflinger: implement pause/resume for direct outputs" into lmp-mr1-devEric Laurent2014-12-171-0/+5
| |\ \ \
| | * | | audioflinger: implement pause/resume for direct outputsEric Laurent2014-12-161-0/+5
* | | | | am 5c82407e: am 184e63ff: Merge "ESQueue: change warning message of one buffe...Wei Jia2014-12-161-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge "ESQueue: change warning message of one buffer containing multiple ADTS...Wei Jia2014-12-161-1/+1
| |\ \ \ \
| | * | | | ESQueue: change warning message of one buffer containing multiple ADTS frames...Wei Jia2014-12-161-1/+1
| | |/ / /
* | | | | am 7ebc1670: am 8975220e: Merge "Fix for Bundled Effects level compensation" ...Ricardo Garcia2014-12-162-104/+144
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Fix for Bundled Effects level compensation" into lmp-mr1-devRicardo Garcia2014-12-162-104/+144
| |\ \ \ \
| | * | | | Fix for Bundled Effects level compensationRicardo Garcia2014-12-092-104/+144
* | | | | | am 42818cca: am 9f932418: Merge "Fix for apps that forget to use widevine:// ...Jeff Tinker2014-12-151-0/+8
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Fix for apps that forget to use widevine:// urls" into lmp-mr1-devJeff Tinker2014-12-151-0/+8
| |\ \ \ \ \
| | * | | | | Fix for apps that forget to use widevine:// urlsJeff Tinker2014-12-151-0/+8
* | | | | | | am 06f99521: am 2aa82e78: Merge "MediaCodecList: handle binder death" into lm...Lajos Molnar2014-12-151-1/+12
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "MediaCodecList: handle binder death" into lmp-mr1-devLajos Molnar2014-12-151-1/+12
| |\ \ \ \ \ \
| | * | | | | | MediaCodecList: handle binder deathLajos Molnar2014-12-121-1/+12
| | | |_|/ / / | | |/| | | |
* | | | | | | am a0b3a0a4: am 6e430fbd: Merge "NuPlayer: send NOT_SEEKABLE media info to cl...Wei Jia2014-12-152-2/+6
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "NuPlayer: send NOT_SEEKABLE media info to client when the source is no...Wei Jia2014-12-152-2/+6
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | NuPlayer: send NOT_SEEKABLE media info to client when the source is not seeka...Wei Jia2014-12-122-2/+6
* | | | | | | am aff13ad4: am 8ddb0223: Merge "Tunneled video Playback/Max resolution: Call...Rachad2014-12-131-1/+15
|\ \ \ \ \ \ \ | |/ / / / / /