summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* audio policy: add binder calls for audio source controlEric Laurent2015-04-1510-0/+147
* Merge "fix NuPlayerDecoder discontinuity handling with async mode"Chong Zhang2015-04-151-4/+0
|\
| * fix NuPlayerDecoder discontinuity handling with async modeChong Zhang2015-04-151-4/+0
* | Merge "AudioPolicyManager: notification of dynamic policy mix activity"Jean-Michel Trivi2015-04-1512-6/+139
|\ \
| * | AudioPolicyManager: notification of dynamic policy mix activityJean-Michel Trivi2015-04-1412-6/+139
* | | Merge "Camera: allow non-supported template"Yin-Chia Yeh2015-04-151-3/+3
|\ \ \
| * | | Camera: allow non-supported templateYin-Chia Yeh2015-04-141-3/+3
* | | | Merge "Camera: fix invalid access of static_camera_characteristics"Yin-Chia Yeh2015-04-151-0/+6
|\ \ \ \
| * | | | Camera: fix invalid access of static_camera_characteristicsYin-Chia Yeh2015-04-151-0/+6
| |/ / /
* | | | Merge "skip parsing of 'hdlr' atom when parsing QT meta"Chong Zhang2015-04-151-1/+6
|\ \ \ \
| * | | | skip parsing of 'hdlr' atom when parsing QT metaChong Zhang2015-04-151-1/+6
| | |_|/ | |/| |
* | | | Merge "camera: Actually pass device errors to client for Camera2Device."Ruben Brunk2015-04-152-0/+36
|\ \ \ \
| * | | | camera: Actually pass device errors to client for Camera2Device.Ruben Brunk2015-04-152-0/+36
* | | | | Merge "Camera2: Add prepare for output streams"Eino-Ville Talvala2015-04-1524-39/+694
|\ \ \ \ \
| * | | | | Camera2: Add prepare for output streamsEino-Ville Talvala2015-04-1524-39/+694
* | | | | | Merge "Revert "stagefright: define CB_CODEC_RELEASED and ReleaseReason enum.""Ronghua Wu2015-04-151-7/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Revert "stagefright: define CB_CODEC_RELEASED and ReleaseReason enum."Ronghua Wu2015-04-141-7/+1
* | | | | | Merge "media: use ResourceManagerService with MediaCodec"Ronghua Wu2015-04-155-31/+380
|\ \ \ \ \ \
| * | | | | | media: use ResourceManagerService with MediaCodecRonghua Wu2015-04-145-31/+380
* | | | | | | Merge "HLS: parse stream resolution and set maxWidth/maxHeight"Chong Zhang2015-04-155-0/+66
|\ \ \ \ \ \ \
| * | | | | | | HLS: parse stream resolution and set maxWidth/maxHeightChong Zhang2015-04-145-0/+66
* | | | | | | | Merge "stagefright: metadata retriever changes for capture fps"Chong Zhang2015-04-145-20/+163
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | stagefright: metadata retriever changes for capture fpsChong Zhang2015-04-135-20/+163
| |/ / / / / /
* | | | | | | Merge "mpeg2ts: Set SAMPLE_FLAG_SYNC for mpeg2ts stream"Jinsuk Kim2015-04-142-0/+34
|\ \ \ \ \ \ \
| * | | | | | | mpeg2ts: Set SAMPLE_FLAG_SYNC for mpeg2ts streamTerry Heo2015-04-142-0/+34
* | | | | | | | Merge "camera2: add reprocess support"Chien-Yu Chen2015-04-1417-37/+393
|\ \ \ \ \ \ \ \
| * | | | | | | | camera2: add reprocess supportChien-Yu Chen2015-04-1317-37/+393
* | | | | | | | | Merge "AudioRecord::obtainBuffer() can return nonContig like AudioTrack"Glenn Kasten2015-04-143-4/+27
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | AudioRecord::obtainBuffer() can return nonContig like AudioTrackGlenn Kasten2015-04-133-4/+27
* | | | | | | | | media: handle overrides and measure max codec instance.Ronghua Wu2015-04-1311-33/+1018
* | | | | | | | | Merge "libstagefright: parse global settings from codec xml file."Ronghua Wu2015-04-142-10/+86
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | libstagefright: parse global settings from codec xml file.Ronghua Wu2015-04-132-10/+86
* | | | | | | | | | Merge "camera: Fix client eviction/disconnect race."Ruben Brunk2015-04-143-4/+75
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | camera: Fix client eviction/disconnect race.Ruben Brunk2015-04-133-4/+75
* | | | | | | | | | Merge "TimestretchBufferProvider integration with Sonic Library"Ricardo Garcia2015-04-145-15/+38
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | TimestretchBufferProvider integration with Sonic LibraryRicardo Garcia2015-04-135-15/+38
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge "Remove deprecated image defines"Lajos Molnar2015-04-141-7/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove deprecated image definesJohann2015-04-101-7/+7
* | | | | | | | | | | Merge "audio polciy: remove FM audio capture permission."Eric Laurent2015-04-134-12/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | audio polciy: remove FM audio capture permission.Eric Laurent2015-04-134-12/+2
* | | | | | | | | | | Merge "MediaCodec: add DeathNotifier to BatteryNotifier"Chong Zhang2015-04-131-10/+74
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | MediaCodec: add DeathNotifier to BatteryNotifierChong Zhang2015-04-101-10/+74
* | | | | | | | | | | | Merge "NuPlayerRenderer: adjust delay of posting drain audio message based on...Wei Jia2015-04-131-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | NuPlayerRenderer: adjust delay of posting drain audio message based on playba...Wei Jia2015-04-101-0/+3
* | | | | | | | | | | | am 52806313: am e1650d00: am 85bb3235: am 8eae9223: am a05bd3c1: am 2f47bb53:...Nick Kralevich2015-04-110-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ am e1650d00: am 85bb3235: am 8eae9223: am a05bd3c1: am 2f47bb53: am eb204f82:...Nick Kralevich2015-04-111-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ am 85bb3235: am 8eae9223: am a05bd3c1: am 2f47bb53: am eb204f82: am b919a3a3:...Nick Kralevich2015-04-111-0/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ am 8eae9223: am a05bd3c1: am 2f47bb53: am eb204f82: am b919a3a3: am 64290793:...Nick Kralevich2015-04-111-0/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ am a05bd3c1: am 2f47bb53: am eb204f82: am b919a3a3: am 64290793: Merge "Fix i...Nick Kralevich2015-04-111-0/+6
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ am 2f47bb53: am eb204f82: am b919a3a3: am 64290793: Merge "Fix integer underf...Nick Kralevich2015-04-111-0/+6
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \