Changeset 55 in SHVCSoftware for trunk/source/Lib/TLibEncoder

Timestamp:

4 Mar 2013, 22:43:28 (12 years ago)

Author:

seregin

Message:

Reintegrate SHM-1.1-dev branch into the trunk

Location:

trunk/source

Files:

• . (modified) (1 prop)
• Lib/TLibEncoder/TEncGOP.cpp (modified) (3 diffs)
• Lib/TLibEncoder/TEncSearch.cpp (modified) (2 diffs)
• Lib/TLibEncoder/TEncTop.h (modified) (2 diffs)

trunk/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -337 +337 @@
     pcSlice->setNalUnitType(getNalUnitType(uiPOCCurr));
 #if REF_IDX_FRAMEWORK
-    if (m_layerId > 0 && (uiPOCCurr % m_pcCfg->getIntraPeriod() == 0))
+    if( m_layerId > 0 && (uiPOCCurr % m_pcCfg->getIntraPeriod() == 0) )
+    {
       pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_CRA);
+    }
     if( m_layerId > 0 && !m_pcEncTop->getElRapSliceTypeB() )
     {
       if( (pcSlice->getNalUnitType() >= NAL_UNIT_CODED_SLICE_BLA) &&
           (pcSlice->getNalUnitType() <= NAL_UNIT_CODED_SLICE_CRA) &&
-           pcSlice->getSliceType() == B_SLICE ) 
+           pcSlice->getSliceType() == B_SLICE )
+      {
         pcSlice->setSliceType(P_SLICE);
+      }
     }
 #endif
@@ -466 +470 @@
 
 #if REF_IDX_FRAMEWORK
-    if (pcSlice->getSliceType() == B_SLICE) 
+    if( pcSlice->getSliceType() == B_SLICE )
+    {
       pcSlice->setColFromL0Flag(1-uiColDir);
+    }
 #endif
 
@@ -774 +780 @@
     {
       pcPic->getPicYuvOrg()->copyToPic( pcPic->getPicYuvRec() );
+#if AVC_SYNTAX
+      pcPic->readBLSyntax( m_ppcTEncTop[0]->getBLSyntaxFile(), SYNTAX_BYTES );
+#endif
       return;
     }

trunk/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -1057 +1057 @@
     pcCU->getPattern()->initAdiPattern( pcCU, uiAbsPartIdx, uiTrDepth, m_piYuvExt, m_iYuvExtStride, m_iYuvExtHeight, bAboveAvail, bLeftAvail );
     //===== get prediction signal =====
-#if INTRA_BL
+#if INTRA_BL && !NO_RESIDUAL_FLAG_FOR_BLPRED
     if(pcCU->isIntraBL ( uiAbsPartIdx ) )
     {
@@ -1259 +1259 @@
 
     //===== get prediction signal =====
-#if INTRA_BL
+#if INTRA_BL && !NO_RESIDUAL_FLAG_FOR_BLPRED
   if(pcCU->isIntraBL ( uiAbsPartIdx ) )
   {

trunk/source/Lib/TLibEncoder/TEncTop.h

@@ -77 +77 @@
   static Int              m_iSPSIdCnt;                    ///< next Id number for SPS    
   static Int              m_iPPSIdCnt;                    ///< next Id number for PPS    
+#if AVC_SYNTAX
+  fstream*                m_pBLSyntaxFile;
+#endif
 #endif
   
@@ -223 +226 @@
 
   Void encodePrep( bool bEos, TComPicYuv* pcPicYuvOrg );
+#if AVC_SYNTAX
+  Void      setBLSyntaxFile( fstream* pFile ) { m_pBLSyntaxFile = pFile; }
+  fstream*  getBLSyntaxFile() { return m_pBLSyntaxFile; }
+#endif
 #else
   Void encode( bool bEos, TComPicYuv* pcPicYuvOrg, TComList<TComPicYuv*>& rcListPicYuvRecOut,