Changeset 792 in 3DVCSoftware for branches/HTM-9.3-dev3-Samsung/source/Lib/TLibDecoder

Timestamp:

23 Jan 2014, 05:06:49 (11 years ago)

Author:

samsung-htm

Message:

Integration of JCT3V-G0101: InterSDC with multiple DC candidates

Location:

branches/HTM-9.3-dev3-Samsung/source/Lib/TLibDecoder

Files:

• TDecCu.cpp (modified) (3 diffs)
• TDecEntropy.cpp (modified) (1 diff)
• TDecSbac.cpp (modified) (1 diff)

branches/HTM-9.3-dev3-Samsung/source/Lib/TLibDecoder/TDecCu.cpp

@@ -652 +652 @@
   UInt  uiWidth      = pcCU->getWidth ( 0 );
   UInt  uiHeight     = pcCU->getHeight( 0 );
+#if !SEC_INTER_SDC_G0101
   UChar* pMask       = pcCU->getInterSDCMask();
 
   memset( pMask, 0, uiWidth*uiHeight );
   pcCU->xSetInterSDCCUMask( pcCU, pMask );
+#endif
 
   Pel  *pResi;
@@ -666 +668 @@
     for( uiPelX = 0; uiPelX < uiWidth; uiPelX++ )
     {
+#if SEC_INTER_SDC_G0101
+      pResi[ uiPelX ] = pcCU->getSDCSegmentDCOffset( 0, 0 );
+#else
       UChar uiSeg = pMask[ uiPelX + uiPelY*uiWidth ];
 #if QC_SDC_UNIFY_G0130
@@ -671 +676 @@
 #else
       pResi[ uiPelX ] = pcCU->getInterSDCSegmentDCOffset( uiSeg, 0 );
+#endif
 #endif
     }

branches/HTM-9.3-dev3-Samsung/source/Lib/TLibDecoder/TDecEntropy.cpp

@@ -814 +814 @@
   }
 
+#if SEC_INTER_SDC_G0101
+  if( !pcCU->getSlice()->getIsDepth() || pcCU->getPartitionSize( uiAbsPartIdx ) != SIZE_2Nx2N || pcCU->isSkipped( uiAbsPartIdx ) )
+#else
   if( !pcCU->getSlice()->getIsDepth() || ( pcCU->isIntra( uiAbsPartIdx ) && pcCU->getPartitionSize( uiAbsPartIdx ) != SIZE_2Nx2N ) || pcCU->isSkipped( uiAbsPartIdx ) )
-  {
-    return;
-  }
-
+#endif
+  {
+    return;
+  }
+
+#if SEC_INTER_SDC_G0101
+  assert( pcCU->getPartitionSize( uiAbsPartIdx ) == SIZE_2Nx2N || ( !pcCU->isIntra( uiAbsPartIdx ) && !pcCU->isSkipped( uiAbsPartIdx ) ) );
+#else
   assert( ( pcCU->isIntra( uiAbsPartIdx ) && pcCU->getPartitionSize( uiAbsPartIdx ) == SIZE_2Nx2N ) || ( !pcCU->isIntra( uiAbsPartIdx ) && !pcCU->isSkipped( uiAbsPartIdx ) ) );
+#endif
 
   m_pcEntropyDecoderIf->parseSDCFlag( pcCU, uiAbsPartIdx, uiDepth );

branches/HTM-9.3-dev3-Samsung/source/Lib/TLibDecoder/TDecSbac.cpp

@@ -2210 +2210 @@
   else
   {
+#if SEC_INTER_SDC_G0101
+    uiNumSegments = 1;
+#else
     PartSize cPartSize = pcCU->getPartitionSize( absPartIdx );
-
     uiNumSegments = ( cPartSize == SIZE_2Nx2N ) ? 1 : ( cPartSize == SIZE_NxN ? 4 : 2 );
+#endif
     symbol = 1;
   }