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

Timestamp:

9 Jul 2015, 00:53:21 (10 years ago)

Author:

seregin

Message:

port rev 4180

Location:

branches/SHM-dev/source/Lib/TLibCommon

Files:

• SEI.h (modified) (1 diff)
• TComSlice.cpp (modified) (4 diffs)
• TComSlice.h (modified) (9 diffs)

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

@@ -444 +444 @@
   Int    m_exposureIndexIdc;
   Int    m_exposureIndexValue;
-  Int    m_exposureCompensationValueSignFlag;
+  Bool   m_exposureCompensationValueSignFlag;
   Int    m_exposureCompensationValueNumerator;
   Int    m_exposureCompensationValueDenomIdc;

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

@@ -88 +88 @@
 , m_pcTrQuant                     ( NULL )
 #endif
-, m_colFromL0Flag                 ( 1 )
+, m_colFromL0Flag                 ( true )
 , m_noOutputPriorPicsFlag         ( false )
 , m_noRaslOutputFlag              ( false )
@@ -200 +200 @@
     m_aiNumRefIdx[i]      = 0;
   }
-  m_colFromL0Flag = 1;
+  m_colFromL0Flag = true;
 
   m_colRefIdx = 0;
@@ -2283 +2283 @@
 , m_numTileRowsMinus1                (0)
 , m_numSubstreams                    (1)
-, m_signHideFlag                     (0)
+, m_signHideFlag                     (false)
 , m_cabacInitPresentFlag             (false)
 , m_encCABACTableIdx                 (I_SLICE)
@@ -2523 +2523 @@
 
 TComRefPicListModification::TComRefPicListModification()
-: m_bRefPicListModificationFlagL0 (false)
-, m_bRefPicListModificationFlagL1 (false)
+: m_refPicListModificationFlagL0 (false)
+, m_refPicListModificationFlagL1 (false)
 {
   ::memset( m_RefPicSetIdxL0, 0, sizeof(m_RefPicSetIdxL0) );

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

@@ -285 +285 @@
   UInt cpbSizeValue      [MAX_CPB_CNT][2];
   UInt ducpbSizeValue    [MAX_CPB_CNT][2];
-  UInt cbrFlag           [MAX_CPB_CNT][2];
+  Bool cbrFlag           [MAX_CPB_CNT][2];
   UInt duBitRateValue    [MAX_CPB_CNT][2];
 };
@@ -388 +388 @@
   Void setDuBitRateValueMinus1     ( Int layer, Int cpbcnt, Int nalOrVcl, UInt value ) { m_HRD[layer].duBitRateValue[cpbcnt][nalOrVcl] = value;       }
   UInt getDuBitRateValueMinus1     (Int layer, Int cpbcnt, Int nalOrVcl )              { return m_HRD[layer].duBitRateValue[cpbcnt][nalOrVcl];        }
-  Void setCbrFlag                ( Int layer, Int cpbcnt, Int nalOrVcl, UInt value ) { m_HRD[layer].cbrFlag[cpbcnt][nalOrVcl] = value;            }
+  Void setCbrFlag                ( Int layer, Int cpbcnt, Int nalOrVcl, Bool value ) { m_HRD[layer].cbrFlag[cpbcnt][nalOrVcl] = value;            }
   Bool getCbrFlag                ( Int layer, Int cpbcnt, Int nalOrVcl             ) { return m_HRD[layer].cbrFlag[cpbcnt][nalOrVcl];             }
 
@@ -1551 +1551 @@
 {
 private:
-  UInt      m_bRefPicListModificationFlagL0;
-  UInt      m_bRefPicListModificationFlagL1;
+  Bool      m_refPicListModificationFlagL0;
+  Bool      m_refPicListModificationFlagL1;
   UInt      m_RefPicSetIdxL0[REF_PIC_LIST_NUM_IDX];
   UInt      m_RefPicSetIdxL1[REF_PIC_LIST_NUM_IDX];
@@ -1563 +1563 @@
   Void  destroy                   ();
 
-  Bool       getRefPicListModificationFlagL0() { return m_bRefPicListModificationFlagL0; }
-  Void       setRefPicListModificationFlagL0(Bool flag) { m_bRefPicListModificationFlagL0 = flag; }
-  Bool       getRefPicListModificationFlagL1() { return m_bRefPicListModificationFlagL1; }
-  Void       setRefPicListModificationFlagL1(Bool flag) { m_bRefPicListModificationFlagL1 = flag; }
+  Bool       getRefPicListModificationFlagL0() { return m_refPicListModificationFlagL0; }
+  Void       setRefPicListModificationFlagL0(Bool flag) { m_refPicListModificationFlagL0 = flag; }
+  Bool       getRefPicListModificationFlagL1() { return m_refPicListModificationFlagL1; }
+  Void       setRefPicListModificationFlagL1(Bool flag) { m_refPicListModificationFlagL1 = flag; }
   Void       setRefPicSetIdxL0(UInt idx, UInt refPicSetIdx) { assert(idx<REF_PIC_LIST_NUM_IDX); m_RefPicSetIdxL0[idx] = refPicSetIdx; }
   UInt       getRefPicSetIdxL0(UInt idx) { assert(idx<REF_PIC_LIST_NUM_IDX); return m_RefPicSetIdxL0[idx]; }
@@ -1622 +1622 @@
   Int      m_numSubstreams;
 
-  Int      m_signHideFlag;
+  Bool     m_signHideFlag;
 
   Bool     m_cabacInitPresentFlag;
@@ -1755 +1755 @@
   Int      getNumSubstreams    ()                                      { return m_numSubstreams; }
 
-  Void      setSignHideFlag( Int signHideFlag ) { m_signHideFlag = signHideFlag; }
-  Int       getSignHideFlag()                    { return m_signHideFlag; }
+  Void      setSignHideFlag( Bool signHideFlag ) { m_signHideFlag = signHideFlag; }
+  Bool      getSignHideFlag()                    { return m_signHideFlag; }
 
   Void     setCabacInitPresentFlag( Bool flag )     { m_cabacInitPresentFlag = flag;    }
@@ -1919 +1919 @@
   TComTrQuant* m_pcTrQuant;
 #endif
-  UInt        m_colFromL0Flag;  // collocated picture from List0 flag
+  Bool        m_colFromL0Flag;  // collocated picture from List0 flag
 
   Bool        m_noOutputPriorPicsFlag;
@@ -2063 +2063 @@
   Int       getRefPOC           ( RefPicList e, Int iRefIdx)    { return  m_aiRefPOCList[e][iRefIdx];   }
   Int       getDepth            ()                              { return  m_iDepth;                     }
-  UInt      getColFromL0Flag    ()                              { return  m_colFromL0Flag;              }
+  Bool      getColFromL0Flag    ()                              { return  m_colFromL0Flag;              }
   UInt      getColRefIdx        ()                              { return  m_colRefIdx;                  }
   Void      checkColRefIdx      (UInt curSliceIdx, TComPic* pic);
@@ -2121 +2121 @@
 #endif
   Void      setRefPOCList       ();
-  Void      setColFromL0Flag    ( UInt colFromL0 ) { m_colFromL0Flag = colFromL0; }
+  Void      setColFromL0Flag    ( Bool colFromL0 ) { m_colFromL0Flag = colFromL0; }
   Void      setColRefIdx        ( UInt refIdx) { m_colRefIdx = refIdx; }
   Void      setCheckLDC         ( Bool b )                      { m_bCheckLDC = b; }