Changeset 1533 in SHVCSoftware for branches

Timestamp:

16 Mar 2016, 19:05:53 (9 years ago)

Author:

seregin

Message:

fix syntax naming, ticket #109

Location:

branches/SHM-dev/source/Lib

Files:

• TLibDecoder/TDecCAVLC.cpp (modified) (2 diffs)
• TLibEncoder/TEncCavlc.cpp (modified) (2 diffs)

branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -3653 +3653 @@
         Int deltaY = 0, deltaU = 0, deltaV = 0;
 
-        READ_FLAG( uiCodeVertex, "coded_vertex_flag" );
+        READ_FLAG( uiCodeVertex, "coded_res_flag" );
 
         if( uiCodeVertex )
@@ -3706 +3706 @@
   UInt sign;
 
-  READ_UVLC( prefix, "quotient")  ;
-  READ_CODE (rParam, codeWord, "remainder");
+  READ_UVLC( prefix, "res_coeff_q");
+  READ_CODE (rParam, codeWord, "res_coeff_r");
   rSymbol = (prefix<<rParam) + codeWord;
 
   if(rSymbol)
   {
-    READ_FLAG(sign, "sign");
+    READ_FLAG(sign, "res_coeff_s");
     param = sign ? -(Int)(rSymbol) : (Int)(rSymbol);
   }

branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -2600 +2600 @@
     nFLCbits = nFLCbits >= 0 ? nFLCbits : 0;
 
-    for( Int l = 0 ; l < nYPartNum ; l++ )
-    {
-      Int shift = pc3DAsymLUT->getCurOctantDepth() - nDepth ;
-
-      for( Int nVertexIdx = 0 ; nVertexIdx < 4 ; nVertexIdx++ )
-      {
-        SYUVP sRes = pc3DAsymLUT->getCuboidVertexResTree( yIdx + (l<<shift) , uIdx , vIdx , nVertexIdx );
+    for( Int l = 0; l < nYPartNum; l++ )
+    {
+      Int shift = pc3DAsymLUT->getCurOctantDepth() - nDepth;
+
+      for( Int nVertexIdx = 0; nVertexIdx < 4; nVertexIdx++ )
+      {
+        SYUVP sRes = pc3DAsymLUT->getCuboidVertexResTree( yIdx + (l<<shift), uIdx, vIdx, nVertexIdx );
 
         UInt uiCodeVertex = sRes.Y != 0 || sRes.U != 0 || sRes.V != 0;
-        WRITE_FLAG( uiCodeVertex , "coded_vertex_flag" );
+        WRITE_FLAG( uiCodeVertex, "coded_res_flag" );
         if( uiCodeVertex )
         {
@@ -2627 +2627 @@
 {
   Int codeNumber = abs(param);
-  WRITE_UVLC(codeNumber / (1 << rParam), "quotient");
-  WRITE_CODE((codeNumber % (1 << rParam)), rParam, "remainder");
+  WRITE_UVLC(codeNumber / (1 << rParam), "res_coeff_q");
+  WRITE_CODE((codeNumber % (1 << rParam)), rParam, "res_coeff_r");
   if (abs(param))
-    WRITE_FLAG( param <0, "sign");
+    WRITE_FLAG( param < 0, "res_coeff_s");
 }