Changeset 1313 in 3DVCSoftware for trunk/source/Lib/TLibEncoder/SyntaxElementWriter.cpp

Timestamp:

13 Aug 2015, 17:38:13 (9 years ago)

Author:

tech

Message:

Merged 14.1-update-dev1@1312.

File:

• trunk/source/Lib/TLibEncoder/SyntaxElementWriter.cpp (modified) (8 diffs)

trunk/source/Lib/TLibEncoder/SyntaxElementWriter.cpp

@@ -2 +2 @@
  * License, included below. This software may be subject to other third party
  * and contributor rights, including patent rights, and no such rights are
- * granted under this license.  
+ * granted under this license.
  *
-* Copyright (c) 2010-2015, ITU/ISO/IEC
+ * Copyright (c) 2010-2015, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -52 +52 @@
     if ( !g_disableNumbering )
     {
-#endif
+      incSymbolCounter();
+      fprintf( g_hTrace, "%8lld  ", g_nSymbolCounter );
+    }
+#else
     fprintf( g_hTrace, "%8lld  ", g_nSymbolCounter++ );
-#if H_MV_ENC_DEC_TRAC
-    }
 #endif
 
     if( length<10 )
     {
-      fprintf( g_hTrace, "%-50s u(%d)  : %d\n", pSymbolName, length, value ); 
+      fprintf( g_hTrace, "%-50s u(%d)  : %d\n", pSymbolName, length, value );
     }
     else
     {
-      fprintf( g_hTrace, "%-50s u(%d) : %d\n", pSymbolName, length, value ); 
+      fprintf( g_hTrace, "%-50s u(%d) : %d\n", pSymbolName, length, value );
     }
   }
@@ -77 +78 @@
     if ( !g_disableNumbering )
     {
-#endif
+      incSymbolCounter(); 
+      fprintf( g_hTrace, "%8lld  ", g_nSymbolCounter );
+    }
+#else
     fprintf( g_hTrace, "%8lld  ", g_nSymbolCounter++ );
-#if H_MV_ENC_DEC_TRAC
-    }
 #endif
 
-    fprintf( g_hTrace, "%-50s ue(v) : %d\n", pSymbolName, value ); 
+    fprintf( g_hTrace, "%-50s ue(v) : %d\n", pSymbolName, value );
   }
 }
@@ -95 +97 @@
     if ( !g_disableNumbering )
     {
-#endif
+      incSymbolCounter(); 
+      fprintf( g_hTrace, "%8lld  ", g_nSymbolCounter );
+    }
+#else
     fprintf( g_hTrace, "%8lld  ", g_nSymbolCounter++ );
-#if H_MV_ENC_DEC_TRAC
-    }
 #endif
 
-    fprintf( g_hTrace, "%-50s se(v) : %d\n", pSymbolName, value ); 
+    fprintf( g_hTrace, "%-50s se(v) : %d\n", pSymbolName, value );
   }
 }
@@ -113 +116 @@
     if ( !g_disableNumbering )
     {
+      incSymbolCounter();
+      fprintf( g_hTrace, "%8lld  ", g_nSymbolCounter );
+    }
+#else
+     fprintf( g_hTrace, "%8lld  ", g_nSymbolCounter++ );
 #endif
-    fprintf( g_hTrace, "%8lld  ", g_nSymbolCounter++ );
-#if H_MV_ENC_DEC_TRAC
-    }
-#endif
-    fprintf( g_hTrace, "%-50s u(1)  : %d\n", pSymbolName, value ); 
+
+    fprintf( g_hTrace, "%-50s u(1)  : %d\n", pSymbolName, value );
   }
 }
@@ -135 +140 @@
   UInt uiLength = 1;
   UInt uiTemp = ++uiCode;
-  
+
   assert ( uiTemp );
-  
+
   while( 1 != uiTemp )
   {
@@ -151 +156 @@
 {
   UInt uiCode;
-  
+
   uiCode = xConvertToUInt( iCode );
   xWriteUvlc( uiCode );
@@ -161 +166 @@
 }
 
+Void SyntaxElementWriter::xWriteRbspTrailingBits()
+{
+  WRITE_FLAG( 1, "rbsp_stop_one_bit");
+  Int cnt = 0;
+  while (m_pcBitIf->getNumBitsUntilByteAligned())
+  {
+    WRITE_FLAG( 0, "rbsp_alignment_zero_bit");
+    cnt++;
+  }
+  assert(cnt<8);
+}
+
 //! \}