Changeset 994 in 3DVCSoftware for branches/HTM-11.2-dev3-HiSilicon/source/Lib/TLibEncoder/TEncSearch.cpp

Timestamp:

15 Jul 2014, 15:44:07 (10 years ago)

Author:

hisilicon-htm

Message:

Integration of JCT3V-I0120 Remove "depth_dc_flag" signalling in DMM cases

File:

• branches/HTM-11.2-dev3-HiSilicon/source/Lib/TLibEncoder/TEncSearch.cpp (modified) (3 diffs)

branches/HTM-11.2-dev3-HiSilicon/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -3157 +3157 @@
             pcCU->setDimDeltaDC( dmmType, 1, uiPartOffset, deltaDC2 );
 
+#if HS_DMM_SIGNALLING_I0120
+            uiRdModeList[ numModesForFullRD++ ] = (dmmType  +DIM_OFFSET);
+#else
             uiRdModeList[ numModesForFullRD++ ] = (2*dmmType  +DIM_OFFSET);
             uiRdModeList[ numModesForFullRD++ ] = (2*dmmType+1+DIM_OFFSET);
+#endif
 
             if( DMM4_IDX == dmmType ) { biSegmentation->destroy(); delete biSegmentation; }
@@ -3213 +3217 @@
       if (uiMode < numModesForFullRD)
       {   
-           uiOrgMode = uiRdModeList[uiMode];
+         uiOrgMode = uiRdModeList[uiMode];
       }
       else
@@ -3226 +3230 @@
            {
               if (uiOrgMode != uiBestPUModeConv && uiOrgMode != uiSecondBestPUModeConv && uiOrgMode != uiThirdBestPUModeConv 
-                 && uiOrgMode > 1 && uiOrgMode < NUM_INTRA_MODE && varCU < 4) 
+                  && uiOrgMode > 1 && uiOrgMode < NUM_INTRA_MODE && varCU < 4) 
               continue;
            }