commit f886997e5528d30386f4973a57a09cf531042b77
author Hangyu Kuang <hkuang@google.com> Mon Mar 14 20:06:49 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 14 20:06:49 2016 +0000
tree 3786e7f53e14a7d2d8560f8d9b357dfdcb71bd57
parent b77d03b62cb743d0faf74b54aa466b4d220b5e61
parent 972f653af6288f8dbb3ebd205c599e0cbb23456a

Merge "DO NOT MERGE SoftAvcEnc:Configured constrained_intra_pred flag in internalSetParameter" into nyc-dev

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) {