Changeset 482 in SHVCSoftware for branches/SHM-4.0-dev/source/Lib/TLibCommon/TComSlice.h

Timestamp:

15 Nov 2013, 23:51:21 (11 years ago)

Author:

seregin

Message:

bring back setChromaFormatIdc (Int i) for !AUXILIARY_PICTURES

File:

• branches/SHM-4.0-dev/source/Lib/TLibCommon/TComSlice.h (modified) (1 diff)

branches/SHM-4.0-dev/source/Lib/TLibCommon/TComSlice.h

@@ -1202 +1202 @@
   Int  getSPSId       ()         { return m_SPSId;          }
   Void setSPSId       (Int i)    { m_SPSId = i;             }
+
 #if AUXILIARY_PICTURES
   ChromaFormat getChromaFormatIdc ()         { return m_chromaFormatIdc;       }
-#else
-  Int  getChromaFormatIdc ()         { return m_chromaFormatIdc;       }
-#endif
-  Void setChromaFormatIdc (ChromaFormat i)    { m_chromaFormatIdc = i;          }
-
-#if AUXILIARY_PICTURES
+  Void setChromaFormatIdc (ChromaFormat i)   { m_chromaFormatIdc = i;          }
+
   static Int getWinUnitX (Int chromaFormatIdc) { assert (chromaFormatIdc >= 0 && chromaFormatIdc <= MAX_CHROMA_FORMAT_IDC); return m_winUnitX[chromaFormatIdc];      }
   static Int getWinUnitY (Int chromaFormatIdc) { assert (chromaFormatIdc >= 0 && chromaFormatIdc <= MAX_CHROMA_FORMAT_IDC); return m_winUnitY[chromaFormatIdc];      }
 #else
+  Int  getChromaFormatIdc ()         { return m_chromaFormatIdc;       }
+  Void setChromaFormatIdc (Int i)    { m_chromaFormatIdc = i;          }
+
   static Int getWinUnitX (Int chromaFormatIdc) { assert (chromaFormatIdc > 0 && chromaFormatIdc <= MAX_CHROMA_FORMAT_IDC); return m_winUnitX[chromaFormatIdc];      }
   static Int getWinUnitY (Int chromaFormatIdc) { assert (chromaFormatIdc > 0 && chromaFormatIdc <= MAX_CHROMA_FORMAT_IDC); return m_winUnitY[chromaFormatIdc];      }