Changeset 481 in SHVCSoftware for branches

Timestamp:

15 Nov 2013, 23:50:28 (11 years ago)

Author:

seregin

Message:

update auto setting for representation format

Location:

branches/SHM-4.0-dev/source/App/TAppEncoder

Files:

• TAppEncLayerCfg.h (modified) (8 diffs)
• TAppEncTop.cpp (modified) (1 diff)

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

@@ -6 +6 @@
 #define __TAPPENCLAYERCFG__
 
+#if SVC_EXTENSION
 #include "TLibCommon/CommonDef.h"
 #include "TLibEncoder/TEncCfg.h"
@@ -11 +12 @@
 
 using namespace std;
-#if SVC_EXTENSION
 class TAppEncCfg;
-#endif
 //! \ingroup TAppEncoder
 //! \{
@@ -43 +42 @@
   Int       m_iIntraPeriod;                                   ///< period of I-slice (random access period)
   Double    m_fQP;                                            ///< QP value of key-picture (floating point)
-#if SVC_EXTENSION
 #if AUXILIARY_PICTURES
   ChromaFormat m_chromaFormatIDC;
@@ -91 +89 @@
 #endif 
   Int       m_iWaveFrontSubstreams; //< If iWaveFrontSynchro, this is the number of substreams per frame (dependent tiles) or per tile (independent tiles).
-#endif //SVC_EXTENSION
 
   Int       m_iQP;                                            ///< QP value of key-picture (integer)
@@ -97 +94 @@
   Int*      m_aidQP;                                          ///< array of slice QP values
   TAppEncCfg* m_cAppEncCfg;                                   ///< pointer to app encoder config
-#if SVC_EXTENSION
   Int       m_numScaledRefLayerOffsets  ;
   Int       m_scaledRefLayerLeftOffset  [MAX_LAYERS];
@@ -114 +110 @@
   Int       m_repFormatIdx;
 #endif
-#endif //SVC_EXTENSION
 public:
   TAppEncLayerCfg();
@@ -154 +149 @@
   Int     getIntQP()                  {return m_iQP;              } 
   Int*    getdQPs()                   {return m_aidQP;            }
-#if SVC_EXTENSION
 #if VPS_EXTN_DIRECT_REF_LAYERS
 #if M0457_PREDICTION_INDICATIONS
@@ -192 +186 @@
 #endif 
 #if LAYER_CTB
-  UInt getMaxCUWidth()             {return m_uiMaxCUWidth;      }
-  UInt getMaxCUHeight()            {return m_uiMaxCUHeight;     }
-  UInt getMaxCUDepth()             {return m_uiMaxCUDepth;      }
+  UInt    getMaxCUWidth()             {return m_uiMaxCUWidth;      }
+  UInt    getMaxCUHeight()            {return m_uiMaxCUHeight;     }
+  UInt    getMaxCUDepth()             {return m_uiMaxCUDepth;      }
 #endif
+}; // END CLASS DEFINITION TAppEncLayerCfg
+
 #endif //SVC_EXTENSION
-}; // END CLASS DEFINITION TAppEncLayerCfg
 
 //! \}

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

@@ -98 +98 @@
     // Auto generation of the format index
     if( m_acLayerCfg[layer].getRepFormatIdx() == -1 )
-    {
-      // Currently only picture width and height are considred. It has to be updated if different chroma format and bit-depth will are used.
+    {      
       Bool found = false;
       for( UInt idx = 0; idx < layer; idx++ )
       {
+        if( m_acLayerCfg[layer].getSourceWidth() == m_acLayerCfg[idx].getSourceWidth() && m_acLayerCfg[layer].getSourceHeight() == m_acLayerCfg[idx].getSourceHeight()
 #if AUXILIARY_PICTURES
-        if( m_acLayerCfg[layer].getSourceWidth() == m_acLayerCfg[idx].getSourceWidth() && m_acLayerCfg[layer].getSourceHeight() == m_acLayerCfg[idx].getSourceHeight() &&
-            m_acLayerCfg[layer].getChromaFormatIDC() == m_acLayerCfg[idx].getChromaFormatIDC() )
-#else
-        if( m_acLayerCfg[layer].getSourceWidth() == m_acLayerCfg[idx].getSourceWidth() && m_acLayerCfg[layer].getSourceHeight() == m_acLayerCfg[idx].getSourceHeight() )
-#endif
+          && m_acLayerCfg[layer].getChromaFormatIDC() == m_acLayerCfg[idx].getChromaFormatIDC()
+#endif
+#if O0194_DIFFERENT_BITDEPTH_EL_BL_
+          && m_acLayerCfg[layer].m_internalBitDepthY == m_acLayerCfg[idx].m_internalBitDepthY && m_acLayerCfg[layer].m_internalBitDepthC == m_acLayerCfg[idx].m_internalBitDepthC
+#endif
+          )
         {
           found = true;