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

Timestamp:

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

Author:

hisilicon-htm

Message:

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

Location:

branches/HTM-11.2-dev3-HiSilicon/source/Lib/TLibEncoder

Files:

• TEncSbac.cpp (modified) (5 diffs)
• TEncSearch.cpp (modified) (3 diffs)

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

@@ -2324 +2324 @@
   }
 
+#if HS_DMM_SIGNALLING_I0120
+  UInt uiNumSegments = isDimMode( pcCU->getLumaIntraDir( absPartIdx ) ) ? 2 : 1;
+  UInt dimDeltaDC = 1;
+#else
   UInt uiNumSegments = 0;
   UInt dimDeltaDC = 0;
-
+#endif
+
+#if HS_DMM_SIGNALLING_I0120
+  if( pcCU->isIntra( absPartIdx ) && pcCU->getSDCFlag( absPartIdx ))
+  {
+#else
   if( pcCU->isIntra( absPartIdx ) )
   {
@@ -2334 +2343 @@
     if( pcCU->getSDCFlag( absPartIdx ) )
     {
+#endif
       if( uiNumSegments == 1 )
       {
@@ -2342 +2352 @@
         dimDeltaDC = ( pcCU->getSDCSegmentDCOffset( 0, absPartIdx ) || pcCU->getSDCSegmentDCOffset( 1, absPartIdx ) ) ? 1 : 0;
       }
+#if !HS_DMM_SIGNALLING_I0120
     }
     else
@@ -2347 +2358 @@
       dimDeltaDC = isDimDeltaDC( dir );
     }
+#endif
     m_pcBinIf->encodeBin( dimDeltaDC, m_cDdcFlagSCModel.get( 0, 0, 0 ) );
   }
+#if !HS_DMM_SIGNALLING_I0120
   else //all-zero inter SDC is not allowed
   {
@@ -2354 +2367 @@
     dimDeltaDC = 1;
   }
+#endif
 
   if( dimDeltaDC )

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;
            }