summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | am e7a53499: am 0a45cda6: am 187b196e: Merge changes Ic51e92e9,Ie808aa82,I74f...Lajos Molnar2015-04-1611-11/+3668
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am 0a45cda6: am 187b196e: Merge changes Ic51e92e9,Ie808aa82,I74f5f4a1Lajos Molnar2015-04-1611-11/+3668
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | am 187b196e: Merge changes Ic51e92e9,Ie808aa82,I74f5f4a1Lajos Molnar2015-04-1611-11/+3668
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | Merge changes Ic51e92e9,Ie808aa82,I74f5f4a1Lajos Molnar2015-04-1611-11/+3668
| | | | |\ \ \ \ \ | | | | | |/ / / / | | | | |/| | | |
| | | | | * | | | stagefright: add SoftAVCEnc using libavcVenkatarama Avadhani2015-04-155-6/+1680
| | | | | * | | | stagefright: add SoftAVCDec using libavcVenkatarama Avadhani2015-04-155-5/+1017
| | | | | * | | | stagefright: add SoftMPEG2 decoder using libmpeg2Venkatarama Avadhani2015-04-155-0/+971
| | | | |/ / / /
* | | | | | | | Merge "camera2: remove unnecessary flashlight error messages"Chien-Yu Chen2015-04-161-15/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | camera2: remove unnecessary flashlight error messagesChien-Yu Chen2015-04-151-15/+18
* | | | | | | | | Merge "Camera3: allow reconfiguring the input stream"Chien-Yu Chen2015-04-151-5/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Camera3: allow reconfiguring the input streamChien-Yu Chen2015-04-151-5/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |