Changeset 521 in 3DVCSoftware for branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncCavlc.cpp

Timestamp:

4 Jul 2013, 21:00:23 (11 years ago)

Author:

tech

Message:

Integrated following changes:

• H_MV_FIX1071, fix of encoder side reference list construction on IRAP pictures, same as in HM11.
• H_3D_VSO_FIX_BORDRE_EXTENSION, fixed uninitialized borders for org-yuvs in VSO
• H_MV_ENC_DEC_TRAC, added cu/pu level trace ( only enabled when ENC_DEC_TRACE is enabled)

File:

• branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncCavlc.cpp (modified) (6 diffs)

branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -39 +39 @@
 #include "TEncCavlc.h"
 #include "SEIwrite.h"
+#include "../TLibCommon/TypeDef.h"
 
 //! \ingroup TLibEncoder
@@ -47 +48 @@
 Void  xTraceSPSHeader (TComSPS *pSPS)
 {
+#if H_MV_ENC_DEC_TRAC
+  fprintf( g_hTrace, "=========== Sequence Parameter Set ===========\n" );
+#else
   fprintf( g_hTrace, "=========== Sequence Parameter Set ID: %d ===========\n", pSPS->getSPSId() );
+#endif
 }
 
 Void  xTracePPSHeader (TComPPS *pPPS)
 {
+#if H_MV_ENC_DEC_TRAC
+  fprintf( g_hTrace, "=========== Picture Parameter Set ===========\n" );
+#else
   fprintf( g_hTrace, "=========== Picture Parameter Set ID: %d ===========\n", pPPS->getPPSId() );
+#endif
 }
 
@@ -838 +847 @@
     //   colour_plane_id                                      u(2)
 
-#if H_MV
+#if H_MV && !H_MV_FIX1071
     // Temporary fix for FIX1071 should be removed later
     TComReferencePictureSet* rps = pcSlice->getRPS();
@@ -846 +855 @@
       Int picOrderCntLSB = (pcSlice->getPOC()-pcSlice->getLastIDR()+(1<<pcSlice->getSPS()->getBitsForPOC()))%(1<<pcSlice->getSPS()->getBitsForPOC());
       WRITE_CODE( picOrderCntLSB, pcSlice->getSPS()->getBitsForPOC(), "pic_order_cnt_lsb");
-#if !H_MV
-      // Temporary fix for FIX1071 should be removed later
+#if !H_MV || H_MV_FIX1071
       TComReferencePictureSet* rps = pcSlice->getRPS();
 #endif      
-#if FIX1071
+#if FIX1071 && H_MV_FIX1071
+      // check for bitstream restriction stating that:
+      // If the current picture is a BLA or CRA picture, the value of NumPocTotalCurr shall be equal to 0.
+      // Ideally this process should not be repeated for each slice in a picture
+      if (pcSlice->isIRAP())
+      {
+          for (Int picIdx = 0; picIdx < rps->getNumberOfPictures(); picIdx++)
+          {
+          assert (!rps->getUsed(picIdx));
+          }
+        }
+#endif
+#if FIX1071 && !H_MV_FIX1071
       // Deal with bitstream restriction stating that:
       // – If the current picture is a BLA or CRA picture, the value of NumPocTotalCurr shall be equal to 0.
@@ -872 +892 @@
         }
       }
-
       if(pcSlice->getRPSidx() < 0 || useAltRps)
 #else
@@ -1009 +1028 @@
       pcSlice->setNumRefIdx(REF_PIC_LIST_1, 0);
     }
-#if H_MV
+#if H_MV && !H_MV_FIX1071
     // Temporary fix for FIX1071 should be removed later
     if( pcSlice->getPPS()->getListsModificationPresentFlag() && pcSlice->getNumRpsCurrTempList( rps ) > 1)