Changeset 598 in 3DVCSoftware for branches/HTM-DEV-2.0-dev0/source/Lib/TLibDecoder

Timestamp:

29 Aug 2013, 13:55:40 (12 years ago)

Author:

tech

Message:

Merged dev2: DEV-2.0-LG@595

Location:

branches/HTM-DEV-2.0-dev0/source/Lib/TLibDecoder

Files:

• TDecCAVLC.cpp (modified) (2 diffs)
• TDecCAVLC.h (modified) (1 diff)
• TDecCu.cpp (modified) (3 diffs)
• TDecCu.h (modified) (1 diff)
• TDecEntropy.cpp (modified) (2 diffs)
• TDecEntropy.h (modified) (2 diffs)
• TDecGop.cpp (modified) (1 diff)
• TDecSbac.cpp (modified) (4 diffs)
• TDecSbac.h (modified) (2 diffs)

branches/HTM-DEV-2.0-dev0/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -1073 +1073 @@
             }
 #endif
+#if LGE_INTER_SDC_E0156
+            READ_FLAG( uiCode, "depth_inter_SDC_flag" );              pcVPS->setInterSDCFlag( i, uiCode ? true : false );
+#endif
           }
         }
@@ -2033 +2036 @@
 }
 #endif
+#if LGE_INTER_SDC_E0156
+Void TDecCavlc::parseInterSDCFlag    ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
+{
+  assert(0);
+}
+
+Void TDecCavlc::parseInterSDCResidualData ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, UInt uiPart )
+{
+  assert(0);
+}
+#endif
 // ====================================================================================================================
 // Protected member functions

branches/HTM-DEV-2.0-dev0/source/Lib/TLibDecoder/TDecCAVLC.h

@@ -102 +102 @@
   Void  parseICFlag         ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
 #endif
+#if LGE_INTER_SDC_E0156
+  Void  parseInterSDCFlag    ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
+  Void  parseInterSDCResidualData ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, UInt uiPart );
+#endif
   Void parseSplitFlag       ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
   Void parsePartSize        ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );

branches/HTM-DEV-2.0-dev0/source/Lib/TLibDecoder/TDecCu.cpp

@@ -437 +437 @@
   m_pcEntropyDecoder->decodeARPW    ( pcCU , uiAbsPartIdx , uiDepth );  
 #endif  
+#if LGE_INTER_SDC_E0156
+  m_pcEntropyDecoder->decodeInterSDCFlag( pcCU, uiAbsPartIdx, uiDepth );
+#endif
   // Coefficient decoding
   Bool bCodeDQP = getdQPFlag();
@@ -501 +504 @@
   {
     case MODE_INTER:
+#if LGE_INTER_SDC_E0156
+      if( m_ppcCU[uiDepth]->getInterSDCFlag( 0 ) )
+      {
+        xReconInterSDC( m_ppcCU[uiDepth], uiAbsPartIdx, uiDepth );
+      }
+      else
+      {
+#endif
       xReconInter( m_ppcCU[uiDepth], uiDepth );
+#if LGE_INTER_SDC_E0156
+      }
+#endif
       break;
     case MODE_INTRA:
@@ -542 +556 @@
   }
 }
+
+#if LGE_INTER_SDC_E0156
+Void TDecCu::xReconInterSDC( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
+{
+  // inter prediction
+  m_pcPrediction->motionCompensation( pcCU, m_ppcYuvReco[uiDepth] );
+
+  UInt  uiWidth      = pcCU->getWidth ( 0 );
+  UInt  uiHeight     = pcCU->getHeight( 0 );
+  UChar* pMask       = pcCU->getInterSDCMask();
+
+  memset( pMask, 0, uiWidth*uiHeight );
+  pcCU->xSetInterSDCCUMask( pcCU, pMask );
+
+  Pel  *pResi;
+  UInt uiPelX, uiPelY;
+  UInt uiResiStride = m_ppcYuvResi[uiDepth]->getStride();
+
+  pResi = m_ppcYuvResi[uiDepth]->getLumaAddr( 0 );
+  for( uiPelY = 0; uiPelY < uiHeight; uiPelY++ )
+  {
+    for( uiPelX = 0; uiPelX < uiWidth; uiPelX++ )
+    {
+      UChar uiSeg = pMask[ uiPelX + uiPelY*uiWidth ];
+
+      pResi[ uiPelX ] = pcCU->getInterSDCSegmentDCOffset( uiSeg, 0 );;
+    }
+    pResi += uiResiStride;
+  }
+
+  m_ppcYuvReco[uiDepth]->addClip( m_ppcYuvReco[uiDepth], m_ppcYuvResi[uiDepth], 0, pcCU->getWidth( 0 ) );
+
+  // clear UV
+  UInt  uiStrideC     = m_ppcYuvReco[uiDepth]->getCStride();
+  Pel   *pRecCb       = m_ppcYuvReco[uiDepth]->getCbAddr();
+  Pel   *pRecCr       = m_ppcYuvReco[uiDepth]->getCrAddr();
+
+  for (Int y = 0; y < uiHeight/2; y++)
+  {
+    for (Int x = 0; x < uiWidth/2; x++)
+    {
+      pRecCb[x] = (Pel)( 1 << ( g_bitDepthC - 1 ) );
+      pRecCr[x] = (Pel)( 1 << ( g_bitDepthC - 1 ) );
+    }
+
+    pRecCb += uiStrideC;
+    pRecCr += uiStrideC;
+  }
+}
+#endif
 
 Void

branches/HTM-DEV-2.0-dev0/source/Lib/TLibDecoder/TDecCu.h

@@ -118 +118 @@
   Void xReconIntraSDC           ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
 #endif
+#if LGE_INTER_SDC_E0156
+  Void xReconInterSDC           ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
+#endif
 };
 

branches/HTM-DEV-2.0-dev0/source/Lib/TLibDecoder/TDecEntropy.cpp

@@ -675 +675 @@
 #endif
   
+#if LGE_INTER_SDC_E0156
+  if( pcCU->getInterSDCFlag( uiAbsPartIdx ) )
+  {
+    assert( !pcCU->isSkipped( uiAbsPartIdx ) );
+    assert( !pcCU->isIntra( uiAbsPartIdx) );
+    assert( pcCU->getSlice()->getIsDepth() );
+
+    decodeInterSDCResidualData( pcCU, uiAbsPartIdx, uiDepth );
+    return;
+  }
+#endif
+
   if( pcCU->isIntra(uiAbsPartIdx) )
   {
@@ -696 +708 @@
 }
 
+#if LGE_INTER_SDC_E0156
+Void TDecEntropy::decodeInterSDCFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
+{
+  pcCU->setInterSDCFlagSubParts( false, uiAbsPartIdx, 0, uiDepth);
+
+  if( !pcCU->getSlice()->getVPS()->getInterSDCFlag( pcCU->getSlice()->getLayerIdInVps() ) )
+  {
+    return;
+  }
+
+  if( !pcCU->getSlice()->getIsDepth() || pcCU->isIntra( uiAbsPartIdx ) || pcCU->isSkipped( uiAbsPartIdx ) )
+  {
+    return;
+  }
+
+  m_pcEntropyDecoderIf->parseInterSDCFlag( pcCU, uiAbsPartIdx, uiDepth );
+}
+
+Void TDecEntropy::decodeInterSDCResidualData( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
+{
+  if( !pcCU->getSlice()->getVPS()->getInterSDCFlag( pcCU->getSlice()->getLayerIdInVps() ) )
+  {
+    return;
+  }
+
+  if( !pcCU->getSlice()->getIsDepth() || pcCU->isIntra( uiAbsPartIdx ) || !pcCU->getInterSDCFlag( uiAbsPartIdx ) )
+  {
+    return;
+  }
+
+  UInt uiNumSegments = ( pcCU->getPartitionSize( uiAbsPartIdx ) == SIZE_2Nx2N ) ? 1 : ( pcCU->getPartitionSize( uiAbsPartIdx ) == SIZE_NxN ? 4 : 2 );
+
+  // decode residual data for each segment
+  for( UInt uiSeg = 0; uiSeg < uiNumSegments; uiSeg++ )
+  {
+    m_pcEntropyDecoderIf->parseInterSDCResidualData( pcCU, uiAbsPartIdx, uiDepth, uiSeg );
+  }
+}
+#endif
+
 //! \}

branches/HTM-DEV-2.0-dev0/source/Lib/TLibDecoder/TDecEntropy.h

@@ -91 +91 @@
   virtual Void parseICFlag        ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth ) = 0;
 #endif
+#if LGE_INTER_SDC_E0156
+  virtual Void parseInterSDCFlag  ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth ) = 0;
+  virtual Void parseInterSDCResidualData ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, UInt uiPart ) = 0;
+#endif
   virtual Void parsePartSize      ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth ) = 0;
   virtual Void parsePredMode      ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth ) = 0;
@@ -166 +170 @@
   Void decodeICFlag            ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
 #endif
-
+#if LGE_INTER_SDC_E0156
+  Void decodeInterSDCFlag      ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
+  Void decodeInterSDCResidualData ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
+#endif
   Void decodeIPCMInfo          ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
 

branches/HTM-DEV-2.0-dev0/source/Lib/TLibDecoder/TDecGop.cpp

@@ -226 +226 @@
     rpcPic->destroyNonDBFilterInfo();
   }
-
+#if MTK_SONY_PROGRESSIVE_MV_COMPRESSION_E0170
+  rpcPic->compressMotion(2); 
+#endif
 #if !H_3D
   rpcPic->compressMotion(); 

branches/HTM-DEV-2.0-dev0/source/Lib/TLibDecoder/TDecSbac.cpp

@@ -100 +100 @@
 #endif
 #endif
+#if LGE_INTER_SDC_E0156
+, m_cInterSDCFlagSCModel             ( 1,             1,  NUM_INTER_SDC_FLAG_CTX           , m_contextModels + m_numContextModels, m_numContextModels)
+, m_cInterSDCResidualSCModel         ( 1,             1,  NUM_INTER_SDC_RESIDUAL_CTX       , m_contextModels + m_numContextModels, m_numContextModels)
+, m_cInterSDCResidualSignFlagSCModel ( 1,             1,  NUM_INTER_SDC_SIGN_FLAG_CTX      , m_contextModels + m_numContextModels, m_numContextModels)
+#endif
 {
   assert( m_numContextModels <= MAX_NUM_CTX_MOD );
@@ -182 +187 @@
   m_cSDCResidualSCModel.initBuffer        ( sliceType, qp, (UChar*)INIT_SDC_RESIDUAL );
 #endif
+#endif
+#if LGE_INTER_SDC_E0156
+  m_cInterSDCFlagSCModel.initBuffer       ( sliceType, qp, (UChar*)INIT_INTER_SDC_FLAG );
+  m_cInterSDCResidualSCModel.initBuffer   ( sliceType, qp, (UChar*)INIT_INTER_SDC_RESIDUAL );
+  m_cInterSDCResidualSignFlagSCModel.initBuffer ( sliceType, qp, (UChar*)INIT_INTER_SDC_SIGN_FLAG );
 #endif
   m_uiLastDQpNonZero  = 0;
@@ -251 +261 @@
   m_cSDCResidualSCModel.initBuffer        ( eSliceType, iQp, (UChar*)INIT_SDC_RESIDUAL );
 #endif
+#endif
+#if LGE_INTER_SDC_E0156
+  m_cInterSDCFlagSCModel.initBuffer       ( eSliceType, iQp, (UChar*)INIT_INTER_SDC_FLAG );
+  m_cInterSDCResidualSCModel.initBuffer   ( eSliceType, iQp, (UChar*)INIT_INTER_SDC_RESIDUAL );
+  m_cInterSDCResidualSignFlagSCModel.initBuffer ( eSliceType, iQp, (UChar*)INIT_INTER_SDC_SIGN_FLAG );
 #endif
   m_pcTDecBinIf->start();
@@ -2237 +2252 @@
 #endif
 
+#if LGE_INTER_SDC_E0156
+Void TDecSbac::parseInterSDCFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
+{
+  UInt uiSymbol = 0;
+  UInt uiCtxInterSDCFlag = pcCU->getCtxInterSDCFlag( uiAbsPartIdx );
+
+  m_pcTDecBinIf->decodeBin( uiSymbol, m_cInterSDCFlagSCModel.get( 0, 0, uiCtxInterSDCFlag ) );
+
+  if( uiSymbol )
+  {
+    pcCU->setInterSDCFlagSubParts( true, uiAbsPartIdx, 0, uiDepth );
+    pcCU->setTrIdxSubParts( 0, uiAbsPartIdx, uiDepth );
+    pcCU->setCbfSubParts( 1, 1, 1, uiAbsPartIdx, uiDepth );
+  }
+  else
+  {
+    pcCU->setInterSDCFlagSubParts( false, uiAbsPartIdx, 0, uiDepth);
+  }
+}
+
+Void TDecSbac::parseInterSDCResidualData ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, UInt uiSegment )
+{
+  UInt uiAbsIdx   = 0;
+  UInt uiSign     = 0;
+  Int  iIdx       = 0;
+
+  xReadExGolombLevel( uiAbsIdx, m_cInterSDCResidualSCModel.get( 0, 0, 0 ) );
+
+  uiAbsIdx++;
+  m_pcTDecBinIf->decodeBin( uiSign, m_cInterSDCResidualSignFlagSCModel.get( 0, 0, 0 ) );
+  iIdx = (Int)( uiSign ? -1 : 1 ) * uiAbsIdx;
+
+  pcCU->setInterSDCSegmentDCOffset( iIdx, uiSegment, uiAbsPartIdx );
+}
+#endif
+
 //! \}

branches/HTM-DEV-2.0-dev0/source/Lib/TLibDecoder/TDecSbac.h

@@ -112 +112 @@
 #endif
 #endif
+#if LGE_INTER_SDC_E0156
+  Void  parseInterSDCFlag    ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
+  Void  parseInterSDCResidualData ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, UInt uiPart );
+#endif
 private:
   TComInputBitstream* m_pcBitstream;
@@ -221 +225 @@
 #endif
 #endif
+#if LGE_INTER_SDC_E0156
+  ContextModel3DBuffer m_cInterSDCFlagSCModel;
+  ContextModel3DBuffer m_cInterSDCResidualSCModel;
+  ContextModel3DBuffer m_cInterSDCResidualSignFlagSCModel;
+#endif
 };