mm-video: venc: Correct a typo in variable name

A kernel variable was to be defined as unsigned long but
it is mistakenly defined as unsigned only, the space is
missing after long. This bug is silent because unsigned
is also a valid data type by itself.
Corresponding to kernel fix, similar correction is done
in userspace code.

Change-Id: Ie58f275149dc9c85553f75e02594113b1a03ddcf
CRs-fixed: 556771

3 files changed, 8 insertions, 8 deletions

diff --git a/mm-video-v4l2/vidc/venc/inc/video_encoder_device_v4l2.h b/mm-video-v4l2/vidc/venc/inc/video_encoder_device_v4l2.h
index 682edc59..57d83a0d 100644
--- a/mm-video-v4l2/vidc/venc/inc/video_encoder_device_v4l2.h
+++ b/mm-video-v4l2/vidc/venc/inc/video_encoder_device_v4l2.h
@@ -113,7 +113,7 @@ struct msm_venc_capability {
 };
 
 struct msm_venc_entropycfg {
-    unsigned longentropysel;
+    unsigned long entropysel;
     unsigned long    cabacmodel;
 };
 
diff --git a/mm-video-v4l2/vidc/venc/src/video_encoder_device.cpp b/mm-video-v4l2/vidc/venc/src/video_encoder_device.cpp
index af8e977f..fe0389bc 100644
--- a/mm-video-v4l2/vidc/venc/src/video_encoder_device.cpp
+++ b/mm-video-v4l2/vidc/venc/src/video_encoder_device.cpp
@@ -1637,7 +1637,7 @@ void venc_dev::venc_config_print()
             multislice.mslice_size);
 
     DEBUG_PRINT_HIGH("ENC_CONFIG: EntropyMode: %d, CabacModel: %d",
-            entropy.longentropysel, entropy.cabacmodel);
+            entropy.entropysel, entropy.cabacmodel);
 
     DEBUG_PRINT_HIGH("ENC_CONFIG: DB-Mode: %d, alpha: %d, Beta: %d",
             dbkfilter.db_mode, dbkfilter.slicealpha_offset,
@@ -2392,7 +2392,7 @@ bool venc_dev::venc_set_entropy_config(OMX_BOOL enable, OMX_U32 i_cabac_level)
     DEBUG_PRINT_LOW("venc_set_entropy_config: CABAC = %u level: %u", enable, i_cabac_level);
 
     if (enable &&(codec_profile.profile != VEN_PROFILE_H264_BASELINE)) {
-        entropy_cfg.longentropysel = VEN_ENTROPY_MODEL_CABAC;
+        entropy_cfg.entropysel = VEN_ENTROPY_MODEL_CABAC;
 
         if (i_cabac_level == 0) {
             entropy_cfg.cabacmodel = VEN_CABAC_MODEL_0;
@@ -2413,7 +2413,7 @@ bool venc_dev::venc_set_entropy_config(OMX_BOOL enable, OMX_U32 i_cabac_level)
 
 #endif
     } else if (!enable) {
-        entropy_cfg.longentropysel = VEN_ENTROPY_MODEL_CAVLC;
+        entropy_cfg.entropysel = VEN_ENTROPY_MODEL_CAVLC;
     } else {
         DEBUG_PRINT_ERROR("Invalid Entropy mode for Baseline Profile");
         return false;
@@ -2427,7 +2427,7 @@ bool venc_dev::venc_set_entropy_config(OMX_BOOL enable, OMX_U32 i_cabac_level)
         return false;
     }
 
-    entropy.longentropysel = entropy_cfg.longentropysel;
+    entropy.entropysel = entropy_cfg.entropysel;
     entropy.cabacmodel  = entropy_cfg.cabacmodel;
     return true;
 }
diff --git a/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp b/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp
index 00b5b52c..644a1d33 100644
--- a/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp
+++ b/mm-video-v4l2/vidc/venc/src/video_encoder_device_v4l2.cpp
@@ -2160,7 +2160,7 @@ void venc_dev::venc_config_print()
             multislice.mslice_size);
 
     DEBUG_PRINT_HIGH("ENC_CONFIG: EntropyMode: %d, CabacModel: %ld",
-            entropy.longentropysel, entropy.cabacmodel);
+            entropy.entropysel, entropy.cabacmodel);
 
     DEBUG_PRINT_HIGH("ENC_CONFIG: DB-Mode: %ld, alpha: %ld, Beta: %ld",
             dbkfilter.db_mode, dbkfilter.slicealpha_offset,
@@ -3324,7 +3324,7 @@ bool venc_dev::venc_set_entropy_config(OMX_BOOL enable, OMX_U32 i_cabac_level)
         }
 
         DEBUG_PRINT_LOW("Success IOCTL set control for id=%d, value=%d", control.id, control.value);
-        entropy.longentropysel = control.value;
+        entropy.entropysel = control.value;
 
         if (i_cabac_level == 0) {
             control.value = V4L2_CID_MPEG_VIDC_VIDEO_H264_CABAC_MODEL_0;
@@ -3358,7 +3358,7 @@ bool venc_dev::venc_set_entropy_config(OMX_BOOL enable, OMX_U32 i_cabac_level)
         }
 
         DEBUG_PRINT_LOW("Success IOCTL set control for id=%d, value=%d", control.id, control.value);
-        entropy.longentropysel=control.value;
+        entropy.entropysel=control.value;
     } else {
         DEBUG_PRINT_ERROR("Invalid Entropy mode for Baseline Profile");
         return false;