Changeset 1511 in SHVCSoftware for branches

Timestamp:

15 Dec 2015, 18:34:17 (9 years ago)

Author:

seregin

Message:

add chroma format IDC output

Location:

branches/SHM-dev/source

Files:

• App/TAppEncoder/TAppEncCfg.cpp (modified) (3 diffs)
• App/TAppEncoder/TAppEncCfg.h (modified) (1 diff)
• Lib/TLibEncoder/TEncAnalyze.h (modified) (2 diffs)

branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -255 +255 @@
   {"scalable-main10",      Profile::SCALABLEMAIN10     },
 #if SCALABLE_REXT
-  {"scalable-Rext",        Profile::SCALABLEREXT     },
+  {"scalable-RExt",        Profile::SCALABLEREXT     },
 #endif
 #endif
@@ -4308 +4308 @@
                                                                     m_bPCMInputBitDepthFlag ? m_MSBExtendedBitDepth[CHANNEL_TYPE_CHROMA] : m_internalBitDepth[CHANNEL_TYPE_CHROMA] );
 #if SVC_EXTENSION
+  printChromaFormat( m_apcLayerCfg[layerIdx]->m_InputChromaFormatIDC, m_apcLayerCfg[layerIdx]->m_chromaFormatIDC );
     }
 
@@ -4503 +4504 @@
 
 #if SVC_EXTENSION
+Void TAppEncCfg::printChromaFormat( const ChromaFormat inputChromaFormatIDC, const ChromaFormat chromaFormatIDC )
+{
+  std::cout << "Input ChromaFormatIDC                  : ";
+  switch (inputChromaFormatIDC)
+  {
+  case CHROMA_400:  std::cout << "4:0:0"; break;
+  case CHROMA_420:  std::cout << "4:2:0"; break;
+  case CHROMA_422:  std::cout << "4:2:2"; break;
+  case CHROMA_444:  std::cout << "4:4:4"; break;
+  default:
+    std::cerr << "Invalid";
+    exit(1);
+  }
+  std::cout << std::endl;
+
+  std::cout << "Output (internal) ChromaFormatIDC      : ";
+  switch (chromaFormatIDC)
+  {
+  case CHROMA_400:  std::cout << "4:0:0"; break;
+  case CHROMA_420:  std::cout << "4:2:0"; break;
+  case CHROMA_422:  std::cout << "4:2:2"; break;
+  case CHROMA_444:  std::cout << "4:4:4"; break;
+  default:
+    std::cerr << "Invalid";
+    exit(1);
+  }
+  std::cout << "\n" << std::endl;
+}
+
 Void TAppEncCfg::cfgStringToArray(Int **arr, string const cfgString, Int const numEntries, const char* logString)
 {

branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.h

@@ -637 +637 @@
   Bool scanStringToArrayNumEntries(string const cfgString, Int &numEntries, const char* logString, std::vector<Int> &  returnVector);
   Void cfgStringToArrayNumEntries(Int **arr, string const cfgString, Int &numEntries, const char* logString);
+  Void printChromaFormat( const ChromaFormat inputChromaFormatIDC, const ChromaFormat chromaFormatIDC );
 
 #if SCALABLE_REXT

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

@@ -227 +227 @@
         else
         {
+#if SVC_EXTENSION
+          if( layerId == 0 )
+          {
+#endif
           printf( "\tTotal Frames |   "   "Bitrate     "  "Y-PSNR" );
 
@@ -240 +244 @@
           //printf( "\t------------ "  " ----------"   " -------- "  " -------- "  " --------\n" );
 #if SVC_EXTENSION
+          }
+
           printf( "  L%d \t %8d    %c "          "%12.4lf  "    "%8.4lf",
                  layerId,