Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | am e7a53499: am 0a45cda6: am 187b196e: Merge changes Ic51e92e9,Ie808aa82,I74f... | Lajos Molnar | 2015-04-16 | 11 | -11/+3668 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | ||||||
| | * | | | | | | | am 0a45cda6: am 187b196e: Merge changes Ic51e92e9,Ie808aa82,I74f5f4a1 | Lajos Molnar | 2015-04-16 | 11 | -11/+3668 | |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | ||||||
| | | * | | | | | | am 187b196e: Merge changes Ic51e92e9,Ie808aa82,I74f5f4a1 | Lajos Molnar | 2015-04-16 | 11 | -11/+3668 | |
| | | |\ \ \ \ \ \ | | | | |/ / / / / | ||||||
| | | | * | | | | | Merge changes Ic51e92e9,Ie808aa82,I74f5f4a1 | Lajos Molnar | 2015-04-16 | 11 | -11/+3668 | |
| | | | |\ \ \ \ \ | | | | | |/ / / / | | | | |/| | | | | ||||||
| | | | | * | | | | stagefright: add SoftAVCEnc using libavc | Venkatarama Avadhani | 2015-04-15 | 5 | -6/+1680 | |
| | | | | * | | | | stagefright: add SoftAVCDec using libavc | Venkatarama Avadhani | 2015-04-15 | 5 | -5/+1017 | |
| | | | | * | | | | stagefright: add SoftMPEG2 decoder using libmpeg2 | Venkatarama Avadhani | 2015-04-15 | 5 | -0/+971 | |
| | | | |/ / / / | ||||||
* | | | | | | | | Merge "camera2: remove unnecessary flashlight error messages" | Chien-Yu Chen | 2015-04-16 | 1 | -15/+18 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | camera2: remove unnecessary flashlight error messages | Chien-Yu Chen | 2015-04-15 | 1 | -15/+18 | |
* | | | | | | | | | Merge "Camera3: allow reconfiguring the input stream" | Chien-Yu Chen | 2015-04-15 | 1 | -5/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Camera3: allow reconfiguring the input stream | Chien-Yu Chen | 2015-04-15 | 1 | -5/+1 | |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | ||||||
* | | | | | | | | | audio policy: add binder calls for audio source control | Eric Laurent | 2015-04-15 | 10 | -0/+147 | |
| |/ / / / / / / |/| | | | | | | | ||||||
* | | | | | | | | Merge "fix NuPlayerDecoder discontinuity handling with async mode" | Chong Zhang | 2015-04-15 | 1 | -4/+0 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | fix NuPlayerDecoder discontinuity handling with async mode | Chong Zhang | 2015-04-15 | 1 | -4/+0 | |
* | | | | | | | | | Merge "AudioPolicyManager: notification of dynamic policy mix activity" | Jean-Michel Trivi | 2015-04-15 | 12 | -6/+139 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | AudioPolicyManager: notification of dynamic policy mix activity | Jean-Michel Trivi | 2015-04-14 | 12 | -6/+139 | |
* | | | | | | | | | | Merge "Camera: allow non-supported template" | Yin-Chia Yeh | 2015-04-15 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Camera: allow non-supported template | Yin-Chia Yeh | 2015-04-14 | 1 | -3/+3 | |
* | | | | | | | | | | | Merge "Camera: fix invalid access of static_camera_characteristics" | Yin-Chia Yeh | 2015-04-15 | 1 | -0/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Camera: fix invalid access of static_camera_characteristics | Yin-Chia Yeh | 2015-04-15 | 1 | -0/+6 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge "skip parsing of 'hdlr' atom when parsing QT meta" | Chong Zhang | 2015-04-15 | 1 | -1/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | skip parsing of 'hdlr' atom when parsing QT meta | Chong Zhang | 2015-04-15 | 1 | -1/+6 | |
| | |_|/ / / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge "camera: Actually pass device errors to client for Camera2Device." | Ruben Brunk | 2015-04-15 | 2 | -0/+36 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | camera: Actually pass device errors to client for Camera2Device. | Ruben Brunk | 2015-04-15 | 2 | -0/+36 | |
* | | | | | | | | | | | Merge "Camera2: Add prepare for output streams" | Eino-Ville Talvala | 2015-04-15 | 24 | -39/+694 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Camera2: Add prepare for output streams | Eino-Ville Talvala | 2015-04-15 | 24 | -39/+694 | |
* | | | | | | | | | | | | Merge "Revert "stagefright: define CB_CODEC_RELEASED and ReleaseReason enum."" | Ronghua Wu | 2015-04-15 | 1 | -7/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Revert "stagefright: define CB_CODEC_RELEASED and ReleaseReason enum." | Ronghua Wu | 2015-04-14 | 1 | -7/+1 | |
* | | | | | | | | | | | | Merge "media: use ResourceManagerService with MediaCodec" | Ronghua Wu | 2015-04-15 | 5 | -31/+380 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | media: use ResourceManagerService with MediaCodec | Ronghua Wu | 2015-04-14 | 5 | -31/+380 | |
* | | | | | | | | | | | | | Merge "HLS: parse stream resolution and set maxWidth/maxHeight" | Chong Zhang | 2015-04-15 | 5 | -0/+66 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | HLS: parse stream resolution and set maxWidth/maxHeight | Chong Zhang | 2015-04-14 | 5 | -0/+66 | |
* | | | | | | | | | | | | | | Merge "stagefright: metadata retriever changes for capture fps" | Chong Zhang | 2015-04-14 | 5 | -20/+163 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | stagefright: metadata retriever changes for capture fps | Chong Zhang | 2015-04-13 | 5 | -20/+163 | |
| |/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge "mpeg2ts: Set SAMPLE_FLAG_SYNC for mpeg2ts stream" | Jinsuk Kim | 2015-04-14 | 2 | -0/+34 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | mpeg2ts: Set SAMPLE_FLAG_SYNC for mpeg2ts stream | Terry Heo | 2015-04-14 | 2 | -0/+34 | |
* | | | | | | | | | | | | | Merge "camera2: add reprocess support" | Chien-Yu Chen | 2015-04-14 | 17 | -37/+393 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | camera2: add reprocess support | Chien-Yu Chen | 2015-04-13 | 17 | -37/+393 | |
* | | | | | | | | | | | | | | Merge "AudioRecord::obtainBuffer() can return nonContig like AudioTrack" | Glenn Kasten | 2015-04-14 | 3 | -4/+27 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | AudioRecord::obtainBuffer() can return nonContig like AudioTrack | Glenn Kasten | 2015-04-13 | 3 | -4/+27 | |
* | | | | | | | | | | | | | | media: handle overrides and measure max codec instance. | Ronghua Wu | 2015-04-13 | 11 | -33/+1018 | |
* | | | | | | | | | | | | | | Merge "libstagefright: parse global settings from codec xml file." | Ronghua Wu | 2015-04-14 | 2 | -10/+86 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | libstagefright: parse global settings from codec xml file. | Ronghua Wu | 2015-04-13 | 2 | -10/+86 | |
* | | | | | | | | | | | | | | | Merge "camera: Fix client eviction/disconnect race." | Ruben Brunk | 2015-04-14 | 3 | -4/+75 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | camera: Fix client eviction/disconnect race. | Ruben Brunk | 2015-04-13 | 3 | -4/+75 | |
* | | | | | | | | | | | | | | | Merge "TimestretchBufferProvider integration with Sonic Library" | Ricardo Garcia | 2015-04-14 | 5 | -15/+38 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | TimestretchBufferProvider integration with Sonic Library | Ricardo Garcia | 2015-04-13 | 5 | -15/+38 | |
| | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge "Remove deprecated image defines" | Lajos Molnar | 2015-04-14 | 1 | -7/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Remove deprecated image defines | Johann | 2015-04-10 | 1 | -7/+7 | |
* | | | | | | | | | | | | | | | | Merge "audio polciy: remove FM audio capture permission." | Eric Laurent | 2015-04-13 | 4 | -12/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |