Changeset 904 in SHVCSoftware

Timestamp:

13 Oct 2014, 19:03:07 (10 years ago)

Author:

seregin

Message:

fix compile warning

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TComSlice.cpp (modified) (1 diff)
• TLibCommon/TComSlice.h (modified) (3 diffs)
• TLibEncoder/TEncGOP.cpp (modified) (2 diffs)

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

@@ -129 +129 @@
 , m_pocMsbVal                     ( 0 )
 , m_pocMsbValRequiredFlag         ( false )
+, m_pocMsbValPresentFlag          ( false )
 #if P0297_VPS_POC_LSB_ALIGNED_FLAG
 , m_pocMsbValNeeded               ( false )
 #endif
-, m_pocMsbValPresentFlag          ( false )
 #endif
 #if POC_RESET_IDC_DECODER || POC_RESET_IDC_ENCODER

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

@@ -697 +697 @@
   Bool       m_pocLsbNotPresentFlag[MAX_VPS_LAYER_ID_PLUS1];
 #endif
-#if P0297_VPS_POC_LSB_ALIGNED_FLAG
-  Bool       m_vpsPocLsbAlignedFlag;
-#endif
 #if O0223_PICTURE_TYPES_ALIGN_FLAG
   Bool       m_crossLayerPictureTypeAlignFlag;
@@ -872 +869 @@
 #if P0307_VPS_NON_VUI_EXTENSION
   Int        m_vpsNonVuiExtLength;
+#endif
+#if P0297_VPS_POC_LSB_ALIGNED_FLAG
+  Bool       m_vpsPocLsbAlignedFlag;
 #endif
 #if RESOLUTION_BASED_DPB
@@ -2324 +2324 @@
   Bool        m_fullPocResetFlag;
   Int         m_pocLsbVal;
+  Int         m_pocMsbVal;
+  Bool        m_pocMsbValRequiredFlag;
+  Bool        m_pocMsbValPresentFlag;
 #if P0297_VPS_POC_LSB_ALIGNED_FLAG
   Bool        m_pocMsbValNeeded;
   Int         m_pocResetDeltaPoc;
 #endif
-  Int         m_pocMsbVal;
-  Bool        m_pocMsbValRequiredFlag;
-  Bool        m_pocMsbValPresentFlag;
 #endif
 #if POC_RESET_IDC_ENCODER

branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -49 +49 @@
 #include <time.h>
 #include <math.h>
+#if P0297_VPS_POC_LSB_ALIGNED_FLAG
+#include <limits.h>
+#endif
 
 using namespace std;
@@ -3636 +3639 @@
     if (slice->getLayerId() == 0)
     {
-      int highestPoc = INT_MIN;
+      Int highestPoc = INT_MIN;
       // Find greatest POC in DPB for layer 0
       for (TComList<TComPic*>::iterator iterPic = m_pcEncTop->getListPic()->begin(); iterPic != m_pcEncTop->getListPic()->end(); ++iterPic)