From: Jan Altensen <info@stricted.net>
Date: Sat, 3 Oct 2020 05:19:29 +0000 (+0200)
Subject: libvideocodec: resolve compilation errors when building for 54xx
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7f02917753f634d7a8c33611f854b90e4626f3f3;p=GitHub%2FLineageOS%2Fandroid_hardware_samsung_slsi_exynos.git

libvideocodec: resolve compilation errors when building for 54xx

Change-Id: Id518b48b008f9dcf6e3e166ffcf67e2daedecf61
---

diff --git a/libvideocodec/Android.mk b/libvideocodec/Android.mk
index 346313c..ffc9d5d 100644
--- a/libvideocodec/Android.mk
+++ b/libvideocodec/Android.mk
@@ -30,7 +30,9 @@ endif
 
 # since 3.10 kernel
 ifneq ($(filter-out 3.4, $(TARGET_LINUX_KERNEL_VERSION)),)
+ifneq ($(TARGET_SOC), exynos5433)
 LOCAL_CFLAGS += -DCID_SUPPORT
+endif
 LOCAL_CFLAGS += -DUSE_DEFINE_H264_SEI_TYPE
 LOCAL_CFLAGS += -DUSE_ORIGINAL_HEADER
 endif
diff --git a/libvideocodec/dec/ExynosVideoDecoder.c b/libvideocodec/dec/ExynosVideoDecoder.c
index 6d7bff7..d0ae6d2 100644
--- a/libvideocodec/dec/ExynosVideoDecoder.c
+++ b/libvideocodec/dec/ExynosVideoDecoder.c
@@ -1173,7 +1173,10 @@ static ExynosVideoErrorType MFC_Decoder_Get_Geometry_Outbuf(
 
     struct v4l2_format fmt;
     struct v4l2_crop   crop;
-    int i, value;
+    int i;
+#ifdef V4L2_CID_MPEG_MFC_GET_10BIT_INFO
+    int value;
+#endif
 
     if (pCtx == NULL) {
         ALOGE("%s: Video context info must be supplied", __func__);
@@ -1219,6 +1222,7 @@ static ExynosVideoErrorType MFC_Decoder_Get_Geometry_Outbuf(
 #endif
         bufferConf->bInterlaced = VIDEO_FALSE;
 
+#ifdef V4L2_CID_MPEG_MFC_GET_10BIT_INFO
     exynos_v4l2_g_ctrl(pCtx->hDec, V4L2_CID_MPEG_MFC_GET_10BIT_INFO, &value);
     if (value == 1) {
         bufferConf->eFilledDataType = DATA_8BIT_WITH_2BIT;
@@ -1234,6 +1238,7 @@ static ExynosVideoErrorType MFC_Decoder_Get_Geometry_Outbuf(
 #endif
         }
     }
+#endif
 
     /* Get planes aligned buffer size */
     for (i = 0; i < pCtx->nOutbufPlanes; i++)