Changeset 401 in 3DVCSoftware for branches/HTM-DEV-0.1-dev/source/Lib

Timestamp:

13 May 2013, 16:09:14 (12 years ago)

Author:

tech

Message:

• Fixed trace files for MV-HEVC.
• Fixed assertion mismatch due to NumPocTotalCurr.

Location:

branches/HTM-DEV-0.1-dev/source/Lib

Files:

• TLibDecoder/TDecCAVLC.cpp (modified) (4 diffs)
• TLibDecoder/TDecTop.cpp (modified) (1 diff)
• TLibEncoder/TEncBinCoderCABAC.cpp (modified) (4 diffs)
• TLibEncoder/TEncCavlc.cpp (modified) (1 diff)
• TLibEncoder/TEncEntropy.cpp (modified) (1 diff)
• TLibEncoder/TEncGOP.cpp (modified) (3 diffs)

branches/HTM-DEV-0.1-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -578 +578 @@
   {
 #if L0323_DPB
+#if H_MV
+    READ_UVLC ( uiCode, "sps_max_dec_pic_buffering_minus1[i]");
+#else
     READ_UVLC ( uiCode, "sps_max_dec_pic_buffering_minus1");
+#endif
     pcSPS->setMaxDecPicBuffering( uiCode + 1, i);
 #else
@@ -584 +588 @@
     pcSPS->setMaxDecPicBuffering( uiCode, i);
 #endif
+#if H_MV
+    READ_UVLC ( uiCode, "sps_num_reorder_pics[i]" );
+#else
     READ_UVLC ( uiCode, "sps_num_reorder_pics" );
+#endif
     pcSPS->setNumReorderPics(uiCode, i);
+#if H_MV
+    READ_UVLC ( uiCode, "sps_max_latency_increase[i]");
+#else
     READ_UVLC ( uiCode, "sps_max_latency_increase");
+#endif
     pcSPS->setMaxLatencyIncrease( uiCode, i );
 
@@ -694 +706 @@
 {
   UInt  uiCode;
-  
+   
   READ_CODE( 4,  uiCode,  "vps_video_parameter_set_id" );         pcVPS->setVPSId( uiCode );
   READ_CODE( 2,  uiCode,  "vps_reserved_three_2bits" );           assert(uiCode == 3);
@@ -1204 +1216 @@
       }
     }
-    // }
+    // } 
     TComRefPicListModification* refPicListModification = rpcSlice->getRefPicListModification();
+
     if(!rpcSlice->isIntra())
     {

branches/HTM-DEV-0.1-dev/source/Lib/TLibDecoder/TDecTop.cpp

@@ -50 +50 @@
   m_iMaxRefPicNum = 0;
 #if ENC_DEC_TRACE
+#if H_MV
+  if ( g_hTrace == NULL )
+  {
+#endif
   g_hTrace = fopen( "TraceDec.txt", "wb" );
   g_bJustDoIt = g_bEncDecTraceDisable;
   g_nSymbolCounter = 0;
+#if H_MV
+  }
+#endif
 #endif
   m_pocCRA = 0;

branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncBinCoderCABAC.cpp

@@ -185 +185 @@
 {
   {
+#if !H_MV
     DTRACE_CABAC_VL( g_nSymbolCounter++ )
     DTRACE_CABAC_T( "\tstate=" )
@@ -191 +192 @@
     DTRACE_CABAC_V( binValue )
     DTRACE_CABAC_T( "\n" )
+#endif
   }
   m_uiBinsCoded += m_binCountIncrement;
@@ -231 +233 @@
 {
   {
+#if !H_MV
     DTRACE_CABAC_VL( g_nSymbolCounter++ )
     DTRACE_CABAC_T( "\tEPsymbol=" )
     DTRACE_CABAC_V( binValue )
     DTRACE_CABAC_T( "\n" )
+#endif
   }
   m_uiBinsCoded += m_binCountIncrement;
@@ -259 +263 @@
   for ( Int i = 0; i < numBins; i++ )
   {
+#if !H_MV
     DTRACE_CABAC_VL( g_nSymbolCounter++ )
     DTRACE_CABAC_T( "\tEPsymbol=" )
     DTRACE_CABAC_V( ( binValues >> ( numBins - 1 - i ) ) & 1 )
     DTRACE_CABAC_T( "\n" )
+#endif
   }
   

branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -799 +799 @@
       TComReferencePictureSet altRps;
       Bool useAltRps = false;
+#if H_MV
+      if (pcSlice->getRapPicFlag() && ( pcSlice->getLayerId() == 0 ) )
+#else
       if (pcSlice->getRapPicFlag())
+#endif
       {
         for (Int picIdx = 0; !useAltRps && picIdx < rps->getNumberOfPictures(); picIdx++)

branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncEntropy.cpp

@@ -587 +587 @@
   if( pcCU->isIntra(uiAbsPartIdx) )
   {
+#if !H_MV
     DTRACE_CABAC_VL( g_nSymbolCounter++ )
     DTRACE_CABAC_T( "\tdecodeTransformIdx()\tCUDepth=" )
     DTRACE_CABAC_V( uiDepth )
     DTRACE_CABAC_T( "\n" )
+#endif
   }
   else

branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -2846 +2846 @@
   {
     Int numModifications = 0;
-    
+
     for( Int k = 0; k < ge.m_numInterViewRefPics; k++ ) 
     {
@@ -2853 +2853 @@
 
     // set inter-view modifications
+    Bool isModified = false;
+    Int tempList[16];
+    for( Int k = 0; k < 16; k++ ) { tempList[k] = -1; }
+
     if( (maxRefListSize > 1) && (numModifications > 0) )
     {
-      refPicListModification->setRefPicListModificationFlagL( li, true );
-      Int tempList[16];
-      for( Int k = 0; k < 16; k++ ) { tempList[k] = -1; }
-
-      Bool isModified = false;
       for( Int k = 0; k < ge.m_numInterViewRefPics; k++ )
       {
@@ -2878 +2877 @@
         }
       }
-      if( isModified )
-      {
-        Int temporalRefIdx = 0;
-        for( Int i = 0; i < pcSlice->getNumRefIdx( ( li == 0 ) ? REF_PIC_LIST_0 : REF_PIC_LIST_1 ); i++ )
-        {
-          if( tempList[i] >= 0 ) 
-          {
-            refPicListModification->setRefPicSetIdxL( li, i, tempList[i] );
-          }
-          else
-          {
-            refPicListModification->setRefPicSetIdxL( li, i, temporalRefIdx );
-            temporalRefIdx++;
-          }
-        }
-      }
-      else
-      {
-        refPicListModification->setRefPicListModificationFlagL( li, false );
-      }
-    }
+    }
+
+    refPicListModification->setRefPicListModificationFlagL( li, isModified );  
+
+    if( isModified )
+    {
+      Int temporalRefIdx = 0;
+      for( Int i = 0; i < pcSlice->getNumRefIdx( ( li == 0 ) ? REF_PIC_LIST_0 : REF_PIC_LIST_1 ); i++ )
+      {
+        if( tempList[i] >= 0 ) 
+        {
+          refPicListModification->setRefPicSetIdxL( li, i, tempList[i] );
+        }
+        else
+        {
+          refPicListModification->setRefPicSetIdxL( li, i, temporalRefIdx );
+          temporalRefIdx++;
+        }
+      }
+    }    
   }
 }