Changeset 808 in SHVCSoftware for branches/SHM-6-dev/source/Lib/TLibCommon

Timestamp:

25 Jun 2014, 03:18:10 (11 years ago)

Author:

seregin

Message:

fix compiler errors

Location:

branches/SHM-6-dev/source/Lib/TLibCommon

Files:

• TComSlice.cpp (modified) (4 diffs)
• TComSlice.h (modified) (3 diffs)

branches/SHM-6-dev/source/Lib/TLibCommon/TComSlice.cpp

@@ -125 +125 @@
 , m_pocMsbValPresentFlag          ( false )
 #endif
-#if POC_RESET_IDC_DECODER
+#if POC_RESET_IDC_DECODER || POC_RESET_IDC_ENCODER
 , m_picOrderCntLsb (0)
 #endif
@@ -212 +212 @@
   m_pocMsbValPresentFlag          = false;
 #endif
-#if POC_RESET_IDC_DECODER
+#if POC_RESET_IDC_DECODER || POC_RESET_IDC_ENCODER
   m_picOrderCntLsb = 0;
 #endif
@@ -1870 +1870 @@
     if(isAvailable == 0)    
     {            
-#if UNAVAILABLE_PIC_BUGFIX
-#if 0
+#if !UNAVAILABLE_PIC_BUGFIX
       if (this->getPOC() + pReferencePictureSet->getDeltaPOC(i) >= pocRandomAccess)
-#endif
 #endif
       {
@@ -3925 +3923 @@
   return true;
 #else
-  setBaseColPic(refLayerIdc, xGetRefPic(rcListPic, getPOC())); 
+  setBaseColPic(refLayerIdc, xGetRefPic(rcListPic, getPOC()));
+  return true;
 #endif
 }

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

@@ -1992 +1992 @@
   Int         m_iAssociatedIRAP;
 #if POC_RESET_IDC_ENCODER
-  Int                     m_associatedIrapPocBeforeReset;
+  Int         m_associatedIrapPocBeforeReset;
 #endif
 
@@ -2124 +2124 @@
   Int         m_pocValueBeforeReset;
 #endif
-#if POC_RESET_IDC_DECODER
+#if POC_RESET_IDC_DECODER || POC_RESET_IDC_ENCODER
   Int         m_picOrderCntLsb;
 #endif
@@ -2500 +2500 @@
   Bool      getRaslPicFlag      ();
   Bool      getRadlPicFlag      ();
+#endif
+#if POC_RESET_IDC_DECODER || POC_RESET_IDC_ENCODER
   Int       getPicOrderCntLsb() { return m_picOrderCntLsb; }
   Void      setPicOrderCntLsb(Int x) { m_picOrderCntLsb = x; }