commit 8725ae03a5f9c097837054abc7bd1d2df2c504e7
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Fri Aug 31 10:33:56 2018 -0700
committer Wonsik Kim <wonsik@google.com> Mon Dec 17 16:02:53 2018 -0800
tree 6c1ab8039fc327b9d6e97a19b25c5fe8b728bf5e
parent e21f3418be2e323ad1ed64d79f862474f2c98c76

C2SoftAVCEnc: Enable CABAC for main profile encoding

Bug: 113677531
Test: Modified screenrecord application to force main profile and verified the
generated bitstream manually

Change-Id: Icab0c7fa1c60bb7ae8fbdef45a170cf2d3c6d541

media/codec2/components/avc/C2SoftAvcEnc.cpp

diff --git a/media/codec2/components/avc/C2SoftAvcEnc.cpp b/media/codec2/components/avc/C2SoftAvcEnc.cpp
index ee5cf27..cf06623 100644
--- a/media/codec2/components/avc/C2SoftAvcEnc.cpp
+++ b/media/codec2/components/avc/C2SoftAvcEnc.cpp
@@ -768,7 +768,11 @@
     s_profile_params_ip.e_sub_cmd = IVE_CMD_CTL_SET_PROFILE_PARAMS;
 
     s_profile_params_ip.e_profile = mIntf->getProfile_l();
-    s_profile_params_ip.u4_entropy_coding_mode = mEntropyMode;
+    if (s_profile_params_ip.e_profile == IV_PROFILE_BASE) {
+        s_profile_params_ip.u4_entropy_coding_mode = 0;
+    } else {
+        s_profile_params_ip.u4_entropy_coding_mode = 1;
+    }
     s_profile_params_ip.u4_timestamp_high = -1;
     s_profile_params_ip.u4_timestamp_low = -1;