commit 972f653af6288f8dbb3ebd205c599e0cbb23456a
author Doney Alex <doney.alex@ittiam.com> Fri Mar 11 18:07:41 2016 +0530
committer Hangyu Kuang <hkuang@google.com> Mon Mar 14 17:34:54 2016 +0000
tree 20863fdc2ff61cd248767d9cf341edeaac886d51
parent 9515aca0c07a32128a65a68749bda3ea6851c109

DO NOT MERGE SoftAvcEnc:Configured constrained_intra_pred flag in internalSetParameter

Change-Id: Idbc2a0ee413651e2b6b1c82b7496507906c222c2

media/libstagefright/codecs/avcenc/SoftAVCEnc.cpp

diff --git a/media/libstagefright/codecs/avcenc/SoftAVCEnc.cpp b/media/libstagefright/codecs/avcenc/SoftAVCEnc.cpp
index 2008574..6ec8c41 100644
--- a/media/libstagefright/codecs/avcenc/SoftAVCEnc.cpp
+++ b/media/libstagefright/codecs/avcenc/SoftAVCEnc.cpp
@@ -1020,6 +1020,7 @@
             }
 
             mIInterval = avcType->nPFrames + avcType->nBFrames;
+            mConstrainedIntraFlag = avcType->bconstIpred;
 
             if (OMX_VIDEO_AVCLoopFilterDisable == avcType->eLoopFilterMode)
                 mDisableDeblkLevel = 4;
@@ -1029,7 +1030,6 @@
                     || avcType->nRefIdx10ActiveMinus1 != 0
                     || avcType->nRefIdx11ActiveMinus1 != 0
                     || avcType->bWeightedPPrediction != OMX_FALSE
-                    || avcType->bconstIpred != OMX_FALSE
                     || avcType->bDirect8x8Inference != OMX_FALSE
                     || avcType->bDirectSpatialTemporal != OMX_FALSE
                     || avcType->nCabacInitIdc != 0) {