Ticket #1: FIX_TRACE.patch

Lib/TLibCommon/TComRom.h

@@ -207 +207 @@
 extern       Char   g_aucConvertToBit  [ MAX_CU_SIZE+1 ];   // from width to log2(width)-2
 
 #ifndef ENC_DEC_TRACE
-# define ENC_DEC_TRACE 0
+# define ENC_DEC_TRACE 1
 #endif
 
 #if ENC_DEC_TRACE

Lib/TLibCommon/TypeDef.h

@@ -41 +41 @@
 //! \ingroup TLibCommon
 //! \{
 
+#define FIX_TRACE 1
 ///////////////////////////////////////////////////////////
 // Contribution COM16–C806 (QUALCOMM) defines section start
 ///////////////////////////////////////////////////////////

Lib/TLibDecoder/SEIread.cpp

@@ -122 +122 @@
   } while (m_pcBitstream->getNumBitsLeft() > 8);
 
   UInt rbspTrailingBits;
+#if ENC_DEC_TRACE && FIX_TRACE
+  // omit trace text to match encoder side
+  xReadCode(8, rbspTrailingBits);
+#else
   READ_CODE(8, rbspTrailingBits, "rbsp_trailing_bits");
+#endif
   assert(rbspTrailingBits == 0x80);
 }
 

Lib/TLibDecoder/TDecBinCoderCABAC.cpp

@@ -101 +101 @@
 Void TDecBinCABAC::decodeBin( UInt& ruiBin, ContextModel &rcCtxModel )
 {
   UShort uiLPS = TComCABACTables::sm_aucLPSTable[rcCtxModel.getState()>>6][(m_uiRange>>2)-64];
-#if DEBUG
+#if DEBUG && !FIX_TRACE
   {
     DTRACE_CABAC_VL( g_nSymbolCounter++ )
     DTRACE_CABAC_T( "\tstate=" )

Lib/TLibDecoder/TDecCAVLC.cpp

@@ -1317 +1317 @@
 #if QC_SUB_PU_TMVP &&!MERGE_CAND_NUM_PATCH
       READ_UVLC( uiCode, rpcSlice->getSPS()->getAtmvpEnableFlag() ? "six_minus_max_num_merge_cand": "five_minus_max_num_merge_cand");
       rpcSlice->setMaxNumMergeCand(MRG_MAX_NUM_CANDS - ( rpcSlice->getSPS()->getAtmvpEnableFlag() ? 0 : 1) - uiCode);
-      
 #else 
+#if MERGE_CAND_NUM_PATCH && FIX_TRACE
+      READ_UVLC( uiCode, "MAX_minus_slice_max_num_merge_cand");
+#else
       READ_UVLC( uiCode, "five_minus_max_num_merge_cand");
+#endif
       rpcSlice->setMaxNumMergeCand(MRG_MAX_NUM_CANDS - uiCode);
 #endif
 

Lib/TLibDecoder/TDecTop.cpp

@@ -381 +381 @@
   m_apcSlicePilot->setReferenced(true); // Putting this as true ensures that picture is referenced the first time it is in an RPS
   m_apcSlicePilot->setTLayerInfo(nalu.m_temporalId);
 
+#if ENC_DEC_TRACE && FIX_TRACE
+  const UInt64 originalSymbolCount = g_nSymbolCounter;
+#endif
+
   m_cEntropyDecoder.decodeSliceHeader (m_apcSlicePilot, &m_parameterSetManagerDecoder);
 
 #if QC_AC_ADAPT_WDOW
@@ -481 +485 @@
     if (m_prevPOC >= m_pocRandomAccess)
     {
       m_prevPOC = m_apcSlicePilot->getPOC();
+#if ENC_DEC_TRACE && FIX_TRACE
+      //rewind the trace counter since we didn't actually decode the slice
+      g_nSymbolCounter = originalSymbolCount;
+#endif
       return true;
     }
     m_prevPOC = m_apcSlicePilot->getPOC();

Lib/TLibEncoder/TEncBinCoderCABAC.cpp

@@ -238 +238 @@
   }
 #endif
   UShort uiLPS = TComCABACTables::sm_aucLPSTable[rcCtxModel.getState()>>6][(m_uiRange>>2)-64];
-#if DEBUG
+#if DEBUG && !FIX_TRACE
   {
     DTRACE_CABAC_VL( g_nSymbolCounter++ )
     DTRACE_CABAC_T( "\tstate=" )
@@ -285 +285 @@
 #else
 Void TEncBinCABAC::encodeBin( UInt binValue, ContextModel &rcCtxModel )
 {
+#if !FIX_TRACE
   {
     DTRACE_CABAC_VL( g_nSymbolCounter++ )
     DTRACE_CABAC_T( "\tstate=" )
@@ -293 +294 @@
     DTRACE_CABAC_V( binValue )
     DTRACE_CABAC_T( "\n" )
   }
+#endif
   m_uiBinsCoded += m_binCountIncrement;
   rcCtxModel.setBinsCoded( 1 );
   
@@ -332 +334 @@
  */
 Void TEncBinCABAC::encodeBinEP( UInt binValue )
 {
-#if !DEBUG 
+#if !DEBUG && !FIX_TRACE
   {
     DTRACE_CABAC_VL( g_nSymbolCounter++ )
     DTRACE_CABAC_T( "\tEPsymbol=" )
@@ -360 +362 @@
 Void TEncBinCABAC::encodeBinsEP( UInt binValues, Int numBins )
 {
   m_uiBinsCoded += numBins & -m_binCountIncrement;
- #if !DEBUG  
+ #if !DEBUG && !FIX_TRACE 
   for ( Int i = 0; i < numBins; i++ )
   {
     DTRACE_CABAC_VL( g_nSymbolCounter++ )

Lib/TLibEncoder/TEncCavlc.cpp

@@ -460 +460 @@
     }
   }
 #if QC_IC
+#if FIX_TRACE
+  WRITE_FLAG( pcSPS->getICFlag()? 1: 0, "illumination_comp_enabled_flag");
+#else
   WRITE_FLAG( pcSPS->getICFlag()? 1: 0, "illumination_comp_flag");
 #endif
+#endif
 #if QC_SUB_PU_TMVP
   WRITE_FLAG( pcSPS->getAtmvpEnableFlag() ? 1: 0, "atmvp_flag");
   WRITE_CODE( pcSPS->getSubPUTLog2Size(), 3, "log2_sub_pu_tmvp_size" );