Changeset 494 in SHVCSoftware for trunk/source/Lib/TLibEncoder/TEncCfg.h

Timestamp:

16 Nov 2013, 22:09:25 (11 years ago)

Author:

seregin

Message:

reintegrate branch SHM-4.0-dev

Location:

trunk

Files:

• . (modified) (1 prop)
• source (modified) (1 prop)
• source/Lib/TLibEncoder/TEncCfg.h (modified) (4 diffs)

trunk/source/Lib/TLibEncoder/TEncCfg.h

@@ -69 +69 @@
   Int m_numRefIdc;
   Int m_refIdc[MAX_NUM_REF_PICS+1];
-#if EXTERNAL_USEDBYCURR_N0082
-  Int m_UseExtusedByCurrPic;
-  Int m_ExtusedByCurrPic[MAX_NUM_REF_PICS];
-#endif
   GOPEntry()
   : m_POC(-1)
@@ -87 +83 @@
   , m_deltaRPS(0)
   , m_numRefIdc(0)
-#if EXTERNAL_USEDBYCURR_N0082
-  , m_UseExtusedByCurrPic(0)
-#endif
   {
     ::memset( m_referencePics, 0, sizeof(m_referencePics) );
     ::memset( m_usedByCurrPic, 0, sizeof(m_usedByCurrPic) );
     ::memset( m_refIdc,        0, sizeof(m_refIdc) );
-#if EXTERNAL_USEDBYCURR_N0082
-    ::memset( m_usedByCurrPic, 0, sizeof(m_ExtusedByCurrPic) );
-#endif
   }
 };
@@ -221 +211 @@
   Int       m_chromaCbQpOffset;                 //  Chroma Cb QP Offset (0:default)
   Int       m_chromaCrQpOffset;                 //  Chroma Cr Qp Offset (0:default)
+#if AUXILIARY_PICTURES
+  ChromaFormat m_chromaFormatIDC;
+#endif
 
 #if ADAPTIVE_QP_SELECTION
@@ -941 +934 @@
   Int       getAdaptiveResolutionChange()      { return m_adaptiveResolutionChange; }
 #endif
+#if AUXILIARY_PICTURES
+  Void         setChromaFormatIDC(ChromaFormat x) { m_chromaFormatIDC = x;    }
+  ChromaFormat getChromaFormatIDC()               { return m_chromaFormatIDC; }
+#endif
 #endif
 };