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

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/TLibDecoder

Files:

• TDecCAVLC.cpp (modified) (4 diffs)
• TDecTop.cpp (modified) (1 diff)

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;