Index: webrtc/api/android/java/src/org/webrtc/MediaCodecVideoDecoder.java |
diff --git a/webrtc/api/android/java/src/org/webrtc/MediaCodecVideoDecoder.java b/webrtc/api/android/java/src/org/webrtc/MediaCodecVideoDecoder.java |
index 9583667f7ab5e9cd904158f3a4716837c966b7db..053780b9495171295ee6fae11b90c5e93a1f13e0 100644 |
--- a/webrtc/api/android/java/src/org/webrtc/MediaCodecVideoDecoder.java |
+++ b/webrtc/api/android/java/src/org/webrtc/MediaCodecVideoDecoder.java |
@@ -78,16 +78,23 @@ public class MediaCodecVideoDecoder { |
// List of supported HW H.264 decoders. |
private static final String[] supportedH264HwCodecPrefixes = |
{"OMX.qcom.", "OMX.Intel.", "OMX.Exynos." }; |
+ |
// NV12 color format supported by QCOM codec, but not declared in MediaCodec - |
// see /hardware/qcom/media/mm-core/inc/OMX_QCOMExtns.h |
- private static final int |
- COLOR_QCOM_FORMATYUV420PackedSemiPlanar32m = 0x7FA30C04; |
+ private static final int COLOR_QCOM_FORMATYVU420PackedSemiPlanar32m4ka = 0x7FA30C01; |
+ private static final int COLOR_QCOM_FORMATYVU420PackedSemiPlanar16m4ka = 0x7FA30C02; |
+ private static final int COLOR_QCOM_FORMATYVU420PackedSemiPlanar64x32Tile2m8ka = 0x7FA30C03; |
+ private static final int COLOR_QCOM_FORMATYUV420PackedSemiPlanar32m = 0x7FA30C04; |
// Allowable color formats supported by codec - in order of preference. |
private static final List<Integer> supportedColorList = Arrays.asList( |
CodecCapabilities.COLOR_FormatYUV420Planar, |
CodecCapabilities.COLOR_FormatYUV420SemiPlanar, |
CodecCapabilities.COLOR_QCOM_FormatYUV420SemiPlanar, |
+ COLOR_QCOM_FORMATYVU420PackedSemiPlanar32m4ka, |
+ COLOR_QCOM_FORMATYVU420PackedSemiPlanar16m4ka, |
+ COLOR_QCOM_FORMATYVU420PackedSemiPlanar64x32Tile2m8ka, |
COLOR_QCOM_FORMATYUV420PackedSemiPlanar32m); |
+ |
private int colorFormat; |
private int width; |
private int height; |