Changeset 631 in SHVCSoftware
- Timestamp:
- 15 Mar 2014, 07:22:13 (11 years ago)
- Location:
- branches/SHM-5.1-dev/source/Lib
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/SHM-5.1-dev/source/Lib/TLibCommon/TComSlice.cpp
r630 r631 116 116 , m_handleCraAsBlaFlag ( false ) 117 117 #endif 118 #if POC_RESET_IDC_SIGNAL lING118 #if POC_RESET_IDC_SIGNALLING 119 119 , m_pocResetIdc ( 0 ) 120 120 , m_pocResetPeriodId ( 0 ) -
branches/SHM-5.1-dev/source/Lib/TLibCommon/TComSlice.h
r630 r631 2047 2047 Bool m_handleCraAsBlaFlag; 2048 2048 #endif 2049 #if POC_RESET_IDC_SIGNAL lING2049 #if POC_RESET_IDC_SIGNALLING 2050 2050 Int m_pocResetIdc; 2051 2051 Int m_pocResetPeriodId; … … 2383 2383 2384 2384 #endif 2385 #if POC_RESET_IDC_SIGNAL lING2385 #if POC_RESET_IDC_SIGNALLING 2386 2386 Int getPocResetIdc () { return m_pocResetIdc; } 2387 2387 Void setPocResetIdc (Int b) { m_pocResetIdc = b; } -
branches/SHM-5.1-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp
r630 r631 2862 2862 } 2863 2863 2864 #if POC_RESET_IDC_SIGNAL lING2864 #if POC_RESET_IDC_SIGNALLING 2865 2865 Int sliceHederExtensionLength = 0; 2866 2866 if(pps->getSliceHeaderExtensionPresentFlag()) -
branches/SHM-5.1-dev/source/Lib/TLibEncoder/TEncCavlc.cpp
r630 r631 2057 2057 } 2058 2058 2059 #if !POC_RESET_IDC_SIGNAL lING // Wrong place to put slice header extension2059 #if !POC_RESET_IDC_SIGNALLING // Wrong place to put slice header extension 2060 2060 if(pcSlice->getPPS()->getSliceHeaderExtensionPresentFlag()) 2061 2061 { … … 2198 2198 } 2199 2199 2200 #if POC_RESET_IDC_SIGNAL lING2200 #if POC_RESET_IDC_SIGNALLING 2201 2201 Void TEncCavlc::codeSliceHeaderExtn( TComSlice* slice, Int shBitsWrittenTillNow ) 2202 2202 { -
branches/SHM-5.1-dev/source/Lib/TLibEncoder/TEncCavlc.h
r630 r631 96 96 Void codeHrdParameters ( TComHRD *hrd, Bool commonInfPresentFlag, UInt maxNumSubLayersMinus1 ); 97 97 Void codeTilesWPPEntryPoint( TComSlice* pSlice ); 98 #if POC_RESET_IDC_SIGNAL lING98 #if POC_RESET_IDC_SIGNALLING 99 99 Void codeSliceHeaderExtn( TComSlice* slice, Int shBitsWrittenTillNow ); 100 100 #endif -
branches/SHM-5.1-dev/source/Lib/TLibEncoder/TEncEntropy.cpp
r630 r631 60 60 } 61 61 62 #if POC_RESET_IDC_SIGNAL lING62 #if POC_RESET_IDC_SIGNALLING 63 63 Void TEncEntropy::encodeSliceHeaderExtn( TComSlice* pSlice, Int shBitsWrittenTillNow ) 64 64 { -
branches/SHM-5.1-dev/source/Lib/TLibEncoder/TEncEntropy.h
r630 r631 74 74 75 75 virtual Void codeTilesWPPEntryPoint ( TComSlice* pSlice ) = 0; 76 #if POC_RESET_IDC_SIGNAL lING76 #if POC_RESET_IDC_SIGNALLING 77 77 virtual Void codeSliceHeaderExtn ( TComSlice* pSlice, Int shBitsWrittenTillNow ) = 0; 78 78 #endif … … 145 145 Void encodeSliceHeader ( TComSlice* pcSlice ); 146 146 Void encodeTilesWPPEntryPoint( TComSlice* pSlice ); 147 #if POC_RESET_IDC_SIGNAL lING147 #if POC_RESET_IDC_SIGNALLING 148 148 Void encodeSliceHeaderExtn( TComSlice* pSlice, Int shBitsWrittenTillNow ); 149 149 #endif -
branches/SHM-5.1-dev/source/Lib/TLibEncoder/TEncGOP.cpp
r630 r631 2215 2215 m_pcEntropyCoder->setEntropyCoder ( m_pcCavlcCoder, pcSlice ); 2216 2216 m_pcEntropyCoder->setBitstream(&nalu.m_Bitstream); 2217 #if !POC_RESET_IDC_SIGNAL lING2217 #if !POC_RESET_IDC_SIGNALLING 2218 2218 m_pcEntropyCoder->encodeTilesWPPEntryPoint( pcSlice ); 2219 2219 #else -
branches/SHM-5.1-dev/source/Lib/TLibEncoder/TEncSbac.cpp
r630 r631 266 266 } 267 267 268 #if POC_RESET_IDC_SIGNAL lING268 #if POC_RESET_IDC_SIGNALLING 269 269 Void TEncSbac::codeSliceHeaderExtn( TComSlice* pSlice, Int shBitsWrittenTillNow ) 270 270 { -
branches/SHM-5.1-dev/source/Lib/TLibEncoder/TEncSbac.h
r630 r631 95 95 Void codeSliceHeader ( TComSlice* pcSlice ); 96 96 Void codeTilesWPPEntryPoint( TComSlice* pSlice ); 97 #if POC_RESET_IDC_SIGNAL lING97 #if POC_RESET_IDC_SIGNALLING 98 98 Void codeSliceHeaderExtn ( TComSlice* pSlice, Int shBitsWrittenTillNow ); 99 99 #endif
Note: See TracChangeset for help on using the changeset viewer.