Changeset 1487 in SHVCSoftware for branches/SHM-dev/source/App

Timestamp:

24 Nov 2015, 03:13:36 (9 years ago)

Author:

fujitsu

Message:

Added support of scalable range extension profiles. Also corrected few issues such as the confWindow wrong initialization. Code is controlled by the macro SCALABLE_REXT.

Location:

branches/SHM-dev/source/App/TAppEncoder

Files:

• TAppEncCfg.cpp (modified) (17 diffs)
• TAppEncCfg.h (modified) (2 diffs)
• TAppEncLayerCfg.cpp (modified) (1 diff)

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

@@ -57 +57 @@
 
 
-
+#if !SCALABLE_REXT
 enum ExtendedProfileName // this is used for determining profile strings, where multiple profiles map to a single profile idc with various constraint flag combinations
 {
@@ -70 +70 @@
   SCALABLEMAIN = 7,
   SCALABLEMAIN10 = 8,
+#if SCALABLE_REXT
+  SCALABLEREXT = 10,
+#endif
 #endif
   // The following are RExt profiles, which would map to the MAINREXT profile idc.
@@ -75 +78 @@
   //                           the chroma format in the next digit
   //                           the intra constraint in the next digit
-  //                           If it is a RExt still picture, there is a '1' for the top digit.
+  //                           If it is a RExt still picture, there is a '1' for the next digit,
+  //                           If it is a Scalable Rext profile, there is a '1' for the top digit.
   MONOCHROME_8      = 1008,
   MONOCHROME_12     = 1012,
@@ -97 +101 @@
   MAIN_444_STILL_PICTURE = 11308,
   MAIN_444_16_STILL_PICTURE = 12316
+#if SCALABLE_REXT
+  ,
+  SCALABLE_MONOCHROME_8   = 101008,
+  SCALABLE_MONOCHROME_12  = 101012,
+  SCALABLE_MONOCHROME_16  = 101016,
+  SCALABLE_MAIN_444       = 101308
+#endif
 };
+#endif
 
 
@@ -257 +269 @@
   {"scalable-main",        Profile::SCALABLEMAIN       },
   {"scalable-main10",      Profile::SCALABLEMAIN10     },
+#if SCALABLE_REXT
+  {"scalable-Rext",        Profile::SCALABLEREXT     },
+#endif
 #endif
 };
@@ -305 +320 @@
     {"scalable-main",             SCALABLEMAIN     },
     {"scalable-main10",           SCALABLEMAIN10   },
+#if SCALABLE_REXT
+    {"scalable-monochrome",       SCALABLE_MONOCHROME_8   },
+    {"scalable-monochrome12",     SCALABLE_MONOCHROME_12  },
+    {"scalable-monochrome16",     SCALABLE_MONOCHROME_16  },
+    {"scalable-main_444",         SCALABLE_MAIN_444       },
+#endif
 #endif
 };
@@ -1074 +1095 @@
   ("OutputBitDepth%d",                               cfg_OutputBitDepth[CHANNEL_TYPE_LUMA],    0, m_numLayers, "Bit-depth of output file (default:InternalBitDepth)")
   ("InputBitDepthC%d",                               cfg_InputBitDepth[CHANNEL_TYPE_CHROMA],   0, m_numLayers, "As per InputBitDepth but for chroma component. (default:InputBitDepth) for layer %d")
-  ("InternalBitDepthC%d",                            cfg_InternalBitDepth[CHANNEL_TYPE_CHROMA],0, m_numLayers, "As per InternalBitDepth but for chroma component. (default:IntrenalBitDepth) for layer %d")
+  ("InternalBitDepthC%d",                            cfg_InternalBitDepth[CHANNEL_TYPE_CHROMA],0, m_numLayers, "As per InternalBitDepth but for chroma component. (default:InternalBitDepth) for layer %d")
   ("OutputBitDepthC%d",                              cfg_OutputBitDepth[CHANNEL_TYPE_CHROMA],  0, m_numLayers, "As per OutputBitDepth but for chroma component. (default:InternalBitDepthC)")
 
@@ -1791 +1812 @@
   
 #if SVC_EXTENSION
+#if SCALABLE_REXT
+  Int cfgTmpConstraintChromaFormat = tmpConstraintChromaFormat;
+#endif
   for( Int layer = 0; layer < m_numLayers; layer++ )
   {
@@ -1854 +1878 @@
       m_profileList[layerPTLIdx] = Profile::MAINREXT;            
 
+#if SCALABLE_REXT
+      if(m_numLayers > 1 && layer == 0 )
+      {
+        m_profileList[0] = extendedToShortProfileName(extendedProfile[0]);
+      }
+
+      if( m_apcLayerCfg[layer]->m_bitDepthConstraint != 0 || cfgTmpConstraintChromaFormat != 0)
+#else
       if( m_apcLayerCfg[layer]->m_bitDepthConstraint != 0 || tmpConstraintChromaFormat != 0)
+#endif
       {
         fprintf(stderr, "Error: The bit depth and chroma format constraints are not used when an explicit RExt profile is specified\n");
@@ -1869 +1902 @@
       }
     }
+#if SCALABLE_REXT
+    else if(extendedProfile[layerPTLIdx] >= 101008 && extendedProfile[layerPTLIdx] <= 101308)
+    {
+      m_profileList[layerPTLIdx] = Profile::SCALABLEREXT;
+      
+      if( m_apcLayerCfg[layer]->m_bitDepthConstraint != 0 || cfgTmpConstraintChromaFormat != 0)
+      {
+        fprintf(stderr, "Error: The bit depth and chroma format constraints are not used when an explicit Scalabe-RExt profile is specified\n");
+        exit(EXIT_FAILURE);
+      }
+      m_apcLayerCfg[layer]->m_bitDepthConstraint  = (extendedProfile[layerPTLIdx]%100);
+      m_apcLayerCfg[layer]->m_intraConstraintFlag = 0; // no all-intra constraint for scalable-Rext profiles 
+      switch ((extendedProfile[layerPTLIdx]/100)%10)
+      {
+        case 0:  tmpConstraintChromaFormat=400; break;
+        case 1:  tmpConstraintChromaFormat=420; break;
+        case 2:  tmpConstraintChromaFormat=422; break;
+        default: tmpConstraintChromaFormat=444; break;
+      }
+    }
+#endif
     else
     {
       if( layer == 0 )
       {
+#if SCALABLE_REXT
+        m_profileList[0] = extendedToShortProfileName(extendedProfile[0]);
+#else
         m_profileList[0] = Profile::Name(extendedProfile[0]);
+#endif
       }
 
@@ -1884 +1942 @@
       m_apcLayerCfg[layer]->m_chromaFormatConstraint = (tmpConstraintChromaFormat == 0) ? CHROMA_444 : numberToChromaFormat(tmpConstraintChromaFormat);
     }
+#if SCALABLE_REXT
+    else if( m_profileList[layerPTLIdx] == Profile::MAINREXT || m_profileList[layerPTLIdx] == Profile::SCALABLEREXT )
+#else
     else if( m_profileList[layerPTLIdx] == Profile::MAINREXT )
+#endif
     {
       if( m_apcLayerCfg[layer]->m_bitDepthConstraint == 0 && tmpConstraintChromaFormat == 0 )
@@ -1923 +1985 @@
       m_apcLayerCfg[layer]->m_bitDepthConstraint = (m_profileList[layerPTLIdx] == Profile::MAIN10 || m_profileList[layerPTLIdx] == Profile::SCALABLEMAIN10) ? 10 : 8;
     }
+#if FORMATIDX_CHECK
+    for(Int compareLayer = layer+1; compareLayer < m_numLayers; compareLayer++ )
+    {
+      if(m_apcLayerCfg[layer]->m_repFormatIdx == m_apcLayerCfg[compareLayer]->m_repFormatIdx && (
+           m_apcLayerCfg[layer]->m_chromaFormatIDC != m_apcLayerCfg[compareLayer]->m_chromaFormatIDC
+           // separate_colour_plane_flag not supported yet but if supported insert check here
+           || m_apcLayerCfg[layer]->m_iSourceWidth != m_apcLayerCfg[compareLayer]->m_iSourceWidth
+           || m_apcLayerCfg[layer]->m_iSourceHeight != m_apcLayerCfg[compareLayer]->m_iSourceHeight
+           || m_apcLayerCfg[layer]->m_internalBitDepth != m_apcLayerCfg[compareLayer]->m_internalBitDepth
+           || m_apcLayerCfg[layer]->m_confWinLeft != m_apcLayerCfg[compareLayer]->m_confWinLeft
+           || m_apcLayerCfg[layer]->m_confWinRight != m_apcLayerCfg[compareLayer]->m_confWinRight
+           || m_apcLayerCfg[layer]->m_confWinTop != m_apcLayerCfg[compareLayer]->m_confWinTop
+           || m_apcLayerCfg[layer]->m_confWinBottom != m_apcLayerCfg[compareLayer]->m_confWinBottom
+        ))
+      {
+        fprintf(stderr, "Error: Two layers using the same FormatIdx value must share the same values of the related parameters\n");
+        exit(EXIT_FAILURE);
+      }
+    }
+#endif
   }
 #else
@@ -2558 +2640 @@
     ChromaFormat& m_chromaFormatIDC = m_apcLayerCfg[layer]->m_chromaFormatIDC;
 
+#if SCALABLE_REXT
+    Int& m_confWinLeft              = m_apcLayerCfg[layer]->m_confWinLeft;
+    Int& m_confWinRight             = m_apcLayerCfg[layer]->m_confWinRight;
+    Int& m_confWinTop               = m_apcLayerCfg[layer]->m_confWinTop;
+    Int& m_confWinBottom            = m_apcLayerCfg[layer]->m_confWinBottom;
+#else
     Int& m_confWinLeft              = m_apcLayerCfg[layer]->m_confWinLeft;
     Int& m_confWinRight             = m_apcLayerCfg[layer]->m_confWinLeft;
     Int& m_confWinTop               = m_apcLayerCfg[layer]->m_confWinLeft;
     Int& m_confWinBottom            = m_apcLayerCfg[layer]->m_confWinLeft;
+#endif
     Int* m_aiPad                    = m_apcLayerCfg[layer]->m_aiPad;
     Int* m_aidQP                    = m_apcLayerCfg[layer]->m_aidQP;
@@ -3110 +3199 @@
   xConfirmPara(m_chromaFormatConstraint<m_chromaFormatIDC, "The chroma format used must not be greater than the chromaFormatConstraint value");
 
+#if SCALABLE_REXT
+  if (m_profile==Profile::MAINREXT || m_profile==Profile::HIGHTHROUGHPUTREXT || m_profile==Profile::SCALABLEREXT)
+#else
   if (m_profile==Profile::MAINREXT || m_profile==Profile::HIGHTHROUGHPUTREXT)
+#endif
   {
     xConfirmPara(m_lowerBitRateConstraintFlag==false && m_intraConstraintFlag==false, "The lowerBitRateConstraint flag cannot be false when intraConstraintFlag is false");
     xConfirmPara(m_cabacBypassAlignmentEnabledFlag && m_profile!=Profile::HIGHTHROUGHPUTREXT, "AlignCABACBeforeBypass must not be enabled unless the high throughput profile is being used.");
+#if SCALABLE_REXT
+    if (m_profile == Profile::MAINREXT || m_profile==Profile::SCALABLEREXT)
+#else
     if (m_profile == Profile::MAINREXT)
+#endif
     {
       const UInt intraIdx = m_intraConstraintFlag ? 1:0;
@@ -3162 +3259 @@
     xConfirmPara(m_bitDepthConstraint!=((m_profile==Profile::MAIN10)?10:8), "BitDepthConstraint must be 8 for MAIN profile and 10 for MAIN10 profile.");
 #endif
+#if SCALABLE_REXT // changes below are only about displayed text
+    xConfirmPara(m_chromaFormatConstraint!=CHROMA_420, "ChromaFormatConstraint must be 420 for non main-RExt and non scalable-Rext profiles.");
+    xConfirmPara(m_intraConstraintFlag==true, "IntraConstraintFlag must be false for non main_RExt and non scalable-Rext profiles.");
+    xConfirmPara(m_lowerBitRateConstraintFlag==false, "LowerBitrateConstraintFlag must be true for non main-RExt and non scalable-Rext profiles.");
+    xConfirmPara(m_profile == Profile::MAINSTILLPICTURE && m_framesToBeEncoded > 1, "Number of frames to be encoded must be 1 when main still picture profile is used.");
+
+    xConfirmPara(m_crossComponentPredictionEnabledFlag==true, "CrossComponentPrediction must not be used for non main-RExt and non scalable-Rext profiles.");
+    xConfirmPara(m_log2MaxTransformSkipBlockSize!=2, "Transform Skip Log2 Max Size must be 2 for V1 profiles.");
+    xConfirmPara(m_transformSkipRotationEnabledFlag==true, "UseResidualRotation must not be enabled for non main-RExt and non scalable-Rext profiles.");
+    xConfirmPara(m_transformSkipContextEnabledFlag==true, "UseSingleSignificanceMapContext must not be enabled for non main-RExt nand on scalable-Rext profiles.");
+    xConfirmPara(m_rdpcmEnabledFlag[RDPCM_SIGNAL_IMPLICIT]==true, "ImplicitResidualDPCM must not be enabled for non main-RExt and non scalable-Rext profiles.");
+    xConfirmPara(m_rdpcmEnabledFlag[RDPCM_SIGNAL_EXPLICIT]==true, "ExplicitResidualDPCM must not be enabled for non main-RExt and non scalable-Rext profiles.");
+    xConfirmPara(m_persistentRiceAdaptationEnabledFlag==true, "GolombRiceParameterAdaption must not be enabled for non main-RExt and non scalable-Rext profiles.");
+    xConfirmPara(m_extendedPrecisionProcessingFlag==true, "UseExtendedPrecision must not be enabled for non main-RExt and non scalable-Rext profiles.");
+    xConfirmPara(m_highPrecisionOffsetsEnabledFlag==true, "UseHighPrecisionPredictionWeighting must not be enabled for non main-RExt and non scalable-Rext profiles.");
+    xConfirmPara(m_enableIntraReferenceSmoothing==false, "EnableIntraReferenceSmoothing must be enabled for non main-RExt and non scalable-Rext profiles.");
+    xConfirmPara(m_cabacBypassAlignmentEnabledFlag, "AlignCABACBeforeBypass cannot be enabled for non main-RExt and non scalable-Rext profiles.");
+#else
     xConfirmPara(m_chromaFormatConstraint!=CHROMA_420, "ChromaFormatConstraint must be 420 for non main-RExt profiles.");
     xConfirmPara(m_intraConstraintFlag==true, "IntraConstraintFlag must be false for non main_RExt profiles.");
@@ -3178 +3293 @@
     xConfirmPara(m_enableIntraReferenceSmoothing==false, "EnableIntraReferenceSmoothing must be enabled for non main-RExt profiles.");
     xConfirmPara(m_cabacBypassAlignmentEnabledFlag, "AlignCABACBeforeBypass cannot be enabled for non main-RExt profiles.");
+#endif
   }
 
@@ -4029 +4145 @@
     UInt& m_uiMaxCUDepth                   = m_apcLayerCfg[layerIdx]->m_uiMaxCUDepth;
 
+#if SCALABLE_REXT
+    Int& m_confWinLeft                     = m_apcLayerCfg[layerIdx]->m_confWinLeft;
+    Int& m_confWinRight                    = m_apcLayerCfg[layerIdx]->m_confWinRight;
+    Int& m_confWinTop                      = m_apcLayerCfg[layerIdx]->m_confWinTop;
+    Int& m_confWinBottom                   = m_apcLayerCfg[layerIdx]->m_confWinBottom;
+#else
     Int& m_confWinLeft                     = m_apcLayerCfg[layerIdx]->m_confWinLeft;
     Int& m_confWinRight                    = m_apcLayerCfg[layerIdx]->m_confWinLeft;
     Int& m_confWinTop                      = m_apcLayerCfg[layerIdx]->m_confWinLeft;
     Int& m_confWinBottom                   = m_apcLayerCfg[layerIdx]->m_confWinLeft;
+#endif
 
     Int& m_iSourceWidth                    = m_apcLayerCfg[layerIdx]->m_iSourceWidth;

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

@@ -49 +49 @@
 //! \ingroup TAppEncoder
 //! \{
+
+#if SCALABLE_REXT
+enum ExtendedProfileName // this is used for determining profile strings, where multiple profiles map to a single profile idc with various constraint flag combinations
+{
+  NONE = 0,
+  MAIN = 1,
+  MAIN10 = 2,
+  MAINSTILLPICTURE = 3,
+  MAINREXT = 4,
+  HIGHTHROUGHPUTREXT = 5, // Placeholder profile for development
+#if SVC_EXTENSION
+  MULTIVIEWMAIN = 6,
+  SCALABLEMAIN = 7,
+  SCALABLEMAIN10 = 8,
+#if SCALABLE_REXT
+  SCALABLEREXT = 10,
+#endif
+#endif
+  // The following are RExt profiles, which would map to the MAINREXT profile idc.
+  // The enumeration indicates the bit-depth constraint in the bottom 2 digits
+  //                           the chroma format in the next digit
+  //                           the intra constraint in the next digit
+  //                           If it is a RExt still picture, there is a '1' for the next digit,
+  //                           If it is a Scalable Rext profile, there is a '1' for the top digit.
+  MONOCHROME_8      = 1008,
+  MONOCHROME_12     = 1012,
+  MONOCHROME_16     = 1016,
+  MAIN_12           = 1112,
+  MAIN_422_10       = 1210,
+  MAIN_422_12       = 1212,
+  MAIN_444          = 1308,
+  MAIN_444_10       = 1310,
+  MAIN_444_12       = 1312,
+  MAIN_444_16       = 1316, // non-standard profile definition, used for development purposes
+  MAIN_INTRA        = 2108,
+  MAIN_10_INTRA     = 2110,
+  MAIN_12_INTRA     = 2112,
+  MAIN_422_10_INTRA = 2210,
+  MAIN_422_12_INTRA = 2212,
+  MAIN_444_INTRA    = 2308,
+  MAIN_444_10_INTRA = 2310,
+  MAIN_444_12_INTRA = 2312,
+  MAIN_444_16_INTRA = 2316,
+  MAIN_444_STILL_PICTURE = 11308,
+  MAIN_444_16_STILL_PICTURE = 12316
+#if SCALABLE_REXT
+  ,
+  SCALABLE_MONOCHROME_8   = 101008,
+  SCALABLE_MONOCHROME_12  = 101012,
+  SCALABLE_MONOCHROME_16  = 101016,
+  SCALABLE_MAIN_444       = 101308
+#endif
+};
+#endif
 
 // ====================================================================================================================
@@ -583 +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);
+
+#if SCALABLE_REXT
+  Profile::Name extendedToShortProfileName(ExtendedProfileName uiExtendedProfileName)
+  {
+    if(uiExtendedProfileName < MONOCHROME_8)
+    {
+      return Profile::Name(uiExtendedProfileName);
+    }
+    else if(uiExtendedProfileName < SCALABLE_MONOCHROME_8)
+    {
+      return Profile::MAINREXT;
+    }
+    else
+    {
+      return Profile::SCALABLEREXT;
+    }
+  }
+#endif
 #endif
 };// END CLASS DEFINITION TAppEncCfg

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

@@ -50 +50 @@
   ::memset(m_phaseHorChroma, 0, sizeof(m_phaseHorChroma));
   ::memset(m_phaseVerChroma, 0, sizeof(m_phaseVerChroma));
+#if SCALABLE_REXT
+  // variables uninitialized otherwise
+  m_intraConstraintFlag = false;
+  m_lowerBitRateConstraintFlag = false;
+  m_onePictureOnlyConstraintFlag = false; 
+#endif
 }