Changeset 1460 in SHVCSoftware for branches/SHM-dev/source/App/TAppEncoder

Timestamp:

20 Aug 2015, 20:54:17 (9 years ago)

Author:

seregin

Message:

port rev 4594

Location:

branches/SHM-dev/source/App/TAppEncoder

Files:

• TAppEncCfg.cpp (modified) (6 diffs)
• TAppEncCfg.h (modified) (2 diffs)
• TAppEncLayerCfg.cpp (modified) (2 diffs)
• TAppEncLayerCfg.h (modified) (1 diff)
• TAppEncTop.cpp (modified) (4 diffs)

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

@@ -774 +774 @@
   Int*    cfg_maxTidIlRefPicsPlus1[MAX_LAYERS]; 
 #if Q0074_COLOUR_REMAPPING_SEI
-  string* cfg_colourRemapSEIFileName[MAX_LAYERS];
+  string* cfg_colourRemapSEIFileRoot[MAX_LAYERS];
 #endif
   Bool*   cfg_entropyCodingSyncEnabledFlag[MAX_LAYERS];
@@ -793 +793 @@
     cfg_fQP[layer]          = &m_apcLayerCfg[layer]->m_fQP;
 #if Q0074_COLOUR_REMAPPING_SEI
-    cfg_colourRemapSEIFileName[layer] = &m_apcLayerCfg[layer]->m_colourRemapSEIFileName;
+    cfg_colourRemapSEIFileRoot[layer] = &m_apcLayerCfg[layer]->m_colourRemapSEIFileRoot;
 #endif
     cfg_repFormatIdx[layer]         = &m_apcLayerCfg[layer]->m_repFormatIdx;
@@ -1073 +1073 @@
   ("PhaseVerChroma%d",                              cfg_phaseVerChromaPtr,            string(""), m_numLayers, "chroma shift in the vertical   direction used in resampling proces")
 #if Q0074_COLOUR_REMAPPING_SEI
-  ("SEIColourRemappingInfoFileRoot%d",              cfg_colourRemapSEIFileName,       string(""), m_numLayers, "Colour Remapping Information SEI parameters file name for layer %d")
+  ("SEIColourRemappingInfoFileRoot%d,-cri",         cfg_colourRemapSEIFileRoot,       string(""), m_numLayers, "Colour Remapping Information SEI parameters root file name (wo num ext)")
 #endif
   ("InputBitDepth%d",                                cfg_InputBitDepth[CHANNEL_TYPE_LUMA],     8, m_numLayers, "Bit-depth of input file for layer %d")
@@ -1141 +1141 @@
 #if !SVC_EXTENSION
   ("FrameRate,-fr",                                   m_iFrameRate,                                         0, "Frame rate")
-#if Q0074_COLOUR_REMAPPING_SEI
-  ("SEIColourRemappingInfoFileRoot",                  m_colourRemapSEIFileName,                    string(""), "Colour Remapping Information SEI parameters file name")
-#endif
-#endif //SVC_EXTENSION
+#endif
   ("FrameSkip,-fs",                                   m_FrameSkip,                                         0u, "Number of frames to skip at start of input YUV")
   ("FramesToBeEncoded,f",                             m_framesToBeEncoded,                                  0, "Number of frames to be encoded (default=all)")
@@ -1462 +1459 @@
   ("Log2MaxMvLengthHorizontal",                       m_log2MaxMvLengthHorizontal,                         15, "Indicate the maximum absolute value of a decoded horizontal MV component in quarter-pel luma units")
   ("Log2MaxMvLengthVertical",                         m_log2MaxMvLengthVertical,                           15, "Indicate the maximum absolute value of a decoded vertical MV component in quarter-pel luma units")
+#if !SVC_EXTENSION
+#if Q0074_COLOUR_REMAPPING_SEI
+  ("SEIColourRemappingInfoFileRoot,-cri",             m_colourRemapSEIFileRoot,                    string(""), "Colour Remapping Information SEI parameters root file name (wo num ext)")
+#endif
+#endif
   ("SEIRecoveryPoint",                                m_recoveryPointSEIEnabled,                        false, "Control generation of recovery point SEI messages")
   ("SEIBufferingPeriod",                              m_bufferingPeriodSEIEnabled,                      false, "Control generation of buffering period SEI messages")
@@ -1566 +1568 @@
   ("SEIMasteringDisplayPrimaries",                    cfg_DisplayPrimariesCode,       cfg_DisplayPrimariesCode, "Mastering display primaries for all three colour planes in CIE xy coordinates in increments of 1/50000 (results in the ranges 0 to 50000 inclusive)")
   ("SEIMasteringDisplayWhitePoint",                   cfg_DisplayWhitePointCode,     cfg_DisplayWhitePointCode, "Mastering display white point CIE xy coordinates in normalised increments of 1/50000 (e.g. 0.333 = 16667)")
- 
+
 #if LAYERS_NOT_PRESENT_SEI
   ("SEILayersNotPresent",                             m_layersNotPresentSEIEnabled,             0, "Control generation of layers not present SEI message")

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

@@ -457 +457 @@
   Int       m_log2MaxMvLengthHorizontal;                      ///< Indicate the maximum absolute value of a decoded horizontal MV component in quarter-pel luma units
   Int       m_log2MaxMvLengthVertical;                        ///< Indicate the maximum absolute value of a decoded vertical MV component in quarter-pel luma units
+#if !SVC_EXTENSION
+#if Q0074_COLOUR_REMAPPING_SEI
+  std::string m_colourRemapSEIFileRoot;
+#endif
+#endif
 
   std::string m_summaryOutFilename;                           ///< filename to use for producing summary output file.
@@ -486 +491 @@
   Bool      m_elRapSliceBEnabled;
 #endif
-#if Q0074_COLOUR_REMAPPING_SEI
-#if !SVC_EXTENSION
-  string    m_colourRemapSEIFileName;
-#endif
-#endif
+
   // internal member functions
 #if SVC_EXTENSION

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

@@ -31 +31 @@
 , m_repFormatIdx(-1)
 {
-#if Q0074_COLOUR_REMAPPING_SEI
-  memset( m_colourRemapSEIPreLutCodedValue,   0, sizeof(m_colourRemapSEIPreLutCodedValue) );
-  memset( m_colourRemapSEIPreLutTargetValue,  0, sizeof(m_colourRemapSEIPreLutTargetValue) );
-  memset( m_colourRemapSEIPostLutCodedValue,  0, sizeof(m_colourRemapSEIPostLutCodedValue) );
-  memset( m_colourRemapSEIPostLutTargetValue, 0, sizeof(m_colourRemapSEIPostLutTargetValue) );
-#endif
   m_confWinLeft = m_confWinRight = m_confWinTop = m_confWinBottom = 0;
   m_aiPad[1] = m_aiPad[0] = 0;
@@ -64 +58 @@
     delete[] m_aidQP;
   }
-#if Q0074_COLOUR_REMAPPING_SEI
-  for( Int c=0 ; c<3 ; c++)
-  {
-    if ( m_colourRemapSEIPreLutCodedValue[c] )
-    {
-      delete[] m_colourRemapSEIPreLutCodedValue[c];
-    }
-    if ( m_colourRemapSEIPreLutTargetValue[c] )
-    {
-      delete[] m_colourRemapSEIPreLutTargetValue[c];
-    }
-    if ( m_colourRemapSEIPostLutCodedValue[c] )
-    {
-      delete[] m_colourRemapSEIPostLutCodedValue[c];
-    }
-    if ( m_colourRemapSEIPostLutTargetValue[c] )
-    {
-      delete[] m_colourRemapSEIPostLutTargetValue[c];
-    }
-  }
-#endif
 }
 

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

@@ -135 +135 @@
   Int       m_repFormatIdx;
 #if Q0074_COLOUR_REMAPPING_SEI
-  string    m_colourRemapSEIFileName;                         ///< Colour Remapping Information SEI message parameters file
-  Int       m_colourRemapSEIId;
-  Bool      m_colourRemapSEICancelFlag;
-  Bool      m_colourRemapSEIPersistenceFlag;
-  Bool      m_colourRemapSEIVideoSignalInfoPresentFlag;
-  Bool      m_colourRemapSEIFullRangeFlag;
-  Int       m_colourRemapSEIPrimaries;
-  Int       m_colourRemapSEITransferFunction;
-  Int       m_colourRemapSEIMatrixCoefficients;
-  Int       m_colourRemapSEIInputBitDepth;
-  Int       m_colourRemapSEIBitDepth;
-  Int       m_colourRemapSEIPreLutNumValMinus1[3];
-  Int*      m_colourRemapSEIPreLutCodedValue[3];
-  Int*      m_colourRemapSEIPreLutTargetValue[3];
-  Bool      m_colourRemapSEIMatrixPresentFlag;
-  Int       m_colourRemapSEILog2MatrixDenom;
-  Int       m_colourRemapSEICoeffs[3][3];
-  Int       m_colourRemapSEIPostLutNumValMinus1[3];
-  Int*      m_colourRemapSEIPostLutCodedValue[3];
-  Int*      m_colourRemapSEIPostLutTargetValue[3];
+  string    m_colourRemapSEIFileRoot;
 #endif
 

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

@@ -505 +505 @@
     Bool&          m_bUseSAO                                    = m_apcLayerCfg[layer]->m_bUseSAO;
 
-    string&        m_colourRemapSEIFileName                     = m_apcLayerCfg[layer]->m_colourRemapSEIFileName;
-
     GOPEntry*      m_GOPList                                    = m_apcLayerCfg[layer]->m_GOPList;
     Int&           m_extraRPSs                                  = m_apcLayerCfg[layer]->m_extraRPSs;
     Int&           m_maxTempLayer                               = m_apcLayerCfg[layer]->m_maxTempLayer;
+
+#if Q0074_COLOUR_REMAPPING_SEI
+    string&        m_colourRemapSEIFileRoot                     = m_apcLayerCfg[layer]->m_colourRemapSEIFileRoot;
+#endif
 #endif
 
@@ -542 +544 @@
   m_cTEncTop.setGopList                                           ( m_GOPList );
   m_cTEncTop.setExtraRPSs                                         ( m_extraRPSs );
-
   for(Int i = 0; i < MAX_TLAYER; i++)
   {
@@ -765 +766 @@
   m_cTEncTop.setKneeSEIInputKneePoint                             ( m_kneeSEIInputKneePoint );
   m_cTEncTop.setKneeSEIOutputKneePoint                            ( m_kneeSEIOutputKneePoint );
+#if Q0074_COLOUR_REMAPPING_SEI
+  m_cTEncTop.setColourRemapInfoSEIFileRoot                        ( m_colourRemapSEIFileRoot );
+#endif
   m_cTEncTop.setMasteringDisplaySEI                               ( m_masteringDisplay );
 
@@ -842 +846 @@
   m_cTEncTop.setSummaryVerboseness                                ( m_summaryVerboseness );
 
-#if Q0074_COLOUR_REMAPPING_SEI
-  m_cTEncTop.xSetCRISEIFileRoot                                   ( m_colourRemapSEIFileName );
-#endif
 #if LAYERS_NOT_PRESENT_SEI
   m_cTEncTop.setLayersNotPresentSEIEnabled                        ( m_layersNotPresentSEIEnabled );