Changeset 1447 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibEncoder

Timestamp:

13 Aug 2015, 20:44:52 (10 years ago)

Author:

seregin

Message:

fix printing out layerId

File:

• branches/SHM-dev/source/Lib/TLibEncoder/TEncAnalyze.h (modified) (10 diffs)

branches/SHM-dev/source/Lib/TLibEncoder/TEncAnalyze.h

@@ -137 +137 @@
 
 #if SVC_EXTENSION
-  Void    printOut ( TChar cDelim, const ChromaFormat chFmt, const Bool printMSEBasedSNR, const Bool printSequenceMSE, const BitDepths &bitDepths, UInt layer = 0 )
+  Void    printOut ( TChar cDelim, const ChromaFormat chFmt, const Bool printMSEBasedSNR, const Bool printSequenceMSE, const BitDepths &bitDepths, UInt layerId = 0 )
 #else
   Void    printOut ( TChar cDelim, const ChromaFormat chFmt, const Bool printMSEBasedSNR, const Bool printSequenceMSE, const BitDepths &bitDepths )
@@ -173 +173 @@
         {
 #if SVC_EXTENSION
-          if( layer == 0 )
+          if( layerId == 0 )
           {
 #endif
@@ -192 +192 @@
 
           printf( "Average:  L%d \t %8d    %c "          "%12.4lf  "    "%8.4lf",
-                 layer,
+                 layerId,
 
 #else
@@ -212 +212 @@
 #if SVC_EXTENSION
           printf( "From MSE:  L%d \t %8d    %c "          "%12.4lf  "    "%8.4lf\n",
-                 layer,
+                 layerId,
 #else
           printf( "From MSE:\t %8d    %c "          "%12.4lf  "    "%8.4lf\n",
@@ -236 +236 @@
 #if SVC_EXTENSION
           printf( "  L%d \t %8d    %c "          "%12.4lf  "    "%8.4lf",
-                 layer,
+                 layerId,
 #else
           printf( "\t %8d    %c "          "%12.4lf  "    "%8.4lf",
@@ -266 +266 @@
           {
 #if SVC_EXTENSION
-            if( layer == 0 )
+            if( layerId == 0 )
             {
 #endif
@@ -284 +284 @@
             }
             printf( "Average:  L%d \t %8d    %c "          "%12.4lf  "    "%8.4lf  "   "%8.4lf  "    "%8.4lf  "   "%8.4lf",
-                   layer,
+                   layerId,
 #else
             printf( "Average: \t %8d    %c "          "%12.4lf  "    "%8.4lf  "   "%8.4lf  "    "%8.4lf  "   "%8.4lf",
@@ -310 +310 @@
 #if SVC_EXTENSION
             printf( "From MSE:  L%d \t %8d    %c "          "%12.4lf  "    "%8.4lf  "   "%8.4lf  "    "%8.4lf  "   "%8.4lf\n",
-                   layer,
+                   layerId,
 #else
             printf( "From MSE:\t %8d    %c "          "%12.4lf  "    "%8.4lf  "   "%8.4lf  "    "%8.4lf  "   "%8.4lf\n",
@@ -324 +324 @@
           {
 #if SVC_EXTENSION
-            if( layer == 0 )
+            if( layerId == 0 )
             {
 #endif
@@ -342 +342 @@
             }
             printf( "  L%d \t %8d    %c "          "%12.4lf  "    "%8.4lf  "   "%8.4lf  "    "%8.4lf  "   "%8.4lf",
-                   layer,
+                   layerId,
 #else
             printf( "\t %8d    %c "          "%12.4lf  "    "%8.4lf  "   "%8.4lf  "    "%8.4lf  "   "%8.4lf",