summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2013-11-27 04:47:14 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2013-11-27 04:47:14 -0800
commit40560b02b3ea9417a7f50016b5d4dcfeabf406e9 (patch)
tree997330172e944ef8b31b3f5d976f4be243f08878
parentf1239bc6773c6b25c5016c39138f85c2e6b5372a (diff)
parentcdf08c04fb839f39a85a50bf6487dfc927ef9168 (diff)
downloadandroid_hardware_qcom_media-40560b02b3ea9417a7f50016b5d4dcfeabf406e9.tar.gz
android_hardware_qcom_media-40560b02b3ea9417a7f50016b5d4dcfeabf406e9.tar.bz2
android_hardware_qcom_media-40560b02b3ea9417a7f50016b5d4dcfeabf406e9.zip
Merge "mm-video: venc: Correct a typo in variable name"
-rw-r--r--mm-video/vidc/venc/src/video_encoder_device.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/mm-video/vidc/venc/src/video_encoder_device.cpp b/mm-video/vidc/venc/src/video_encoder_device.cpp
index a66f2620..96facccf 100644
--- a/mm-video/vidc/venc/src/video_encoder_device.cpp
+++ b/mm-video/vidc/venc/src/video_encoder_device.cpp
@@ -1613,7 +1613,7 @@ void venc_dev::venc_config_print()
multislice.mslice_size);
DEBUG_PRINT_HIGH("\nENC_CONFIG: EntropyMode: %d, CabacModel: %d",
- entropy.longentropysel, entropy.cabacmodel);
+ entropy.entropysel, entropy.cabacmodel);
DEBUG_PRINT_HIGH("\nENC_CONFIG: DB-Mode: %d, alpha: %d, Beta: %d\n",
dbkfilter.db_mode, dbkfilter.slicealpha_offset,
@@ -2447,7 +2447,7 @@ bool venc_dev::venc_set_entropy_config(OMX_BOOL enable, OMX_U32 i_cabac_level)
DEBUG_PRINT_LOW("\n 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;
}
@@ -2467,7 +2467,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("\nInvalid Entropy mode for Baseline Profile");
@@ -2481,7 +2481,7 @@ bool venc_dev::venc_set_entropy_config(OMX_BOOL enable, OMX_U32 i_cabac_level)
DEBUG_PRINT_ERROR("\nERROR: Request for setting entropy config failed");
return false;
}
- entropy.longentropysel = entropy_cfg.longentropysel;
+ entropy.entropysel = entropy_cfg.entropysel;
entropy.cabacmodel = entropy_cfg.cabacmodel;
return true;
}