Ticket #800: wpp2-removeredundantfuncs.patch
File wpp2-removeredundantfuncs.patch, 10.0 KB (added by gordon, 12 years ago) |
---|
-
source/Lib/TLibDecoder/TDecEntropy.h
65 65 virtual Void resetEntropy ( TComSlice* pcSlice ) = 0; 66 66 virtual Void setBitstream ( TComInputBitstream* p ) = 0; 67 67 68 virtual Void decodeFlush() = 0;69 68 virtual Void parseVPS ( TComVPS* pcVPS ) = 0; 70 69 virtual Void parseSPS ( TComSPS* pcSPS ) = 0; 71 70 virtual Void parsePPS ( TComPPS* pcPPS ) = 0; … … 165 164 public: 166 165 Void decodeCoeff ( TComDataCU* pcCU , UInt uiAbsPartIdx, UInt uiDepth, UInt uiWidth, UInt uiHeight, Bool& bCodeDQP ); 167 166 168 Void decodeFlush() { m_pcEntropyDecoderIf->decodeFlush(); }169 170 167 };// END CLASS DEFINITION TDecEntropy 171 168 172 169 //! \} -
source/Lib/TLibDecoder/TDecSbac.cpp
1586 1586 { 1587 1587 xCopyContextsFrom(pScr); 1588 1588 } 1589 1590 Void TDecSbac::decodeFlush ( )1591 {1592 UInt uiBit;1593 m_pcTDecBinIf->decodeBinTrm(uiBit);1594 m_pcTDecBinIf->flush();1595 1596 }1597 1589 //! \} -
source/Lib/TLibDecoder/TDecSbac.h
73 73 Void loadContexts ( TDecSbac* pScr ); 74 74 Void xCopyFrom ( TDecSbac* pSrc ); 75 75 Void xCopyContextsFrom ( TDecSbac* pSrc ); 76 Void decodeFlush();77 76 78 77 Void resetEntropy (TComSlice* pSlice ); 79 78 Void setBitstream ( TComInputBitstream* p ) { m_pcBitstream = p; m_pcTDecBinIf->init( p ); } -
source/Lib/TLibDecoder/TDecCAVLC.h
116 116 Void parseIPCMInfo ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth); 117 117 118 118 Void updateContextTables ( SliceType eSliceType, Int iQp ) { return; } 119 Void decodeFlush() {};120 119 121 120 Void xParsePredWeightTable ( TComSlice* pcSlice ); 122 121 Void parseScalingList ( TComScalingList* scalingList ); -
source/Lib/TLibEncoder/TEncBinCoder.h
57 57 virtual Void copyState ( TEncBinIf* pcTEncBinIf ) = 0; 58 58 virtual Void flush () = 0; 59 59 60 virtual Void encodeFlush (Bool bEnd) = 0;61 62 60 virtual Void resetBac () = 0; 63 61 virtual Void encodeNumSubseqIPCM( Int numSubseqIPCM ) = 0; 64 62 virtual Void encodePCMAlignBits() = 0; -
source/Lib/TLibEncoder/TEncCavlc.h
97 97 Void codeTilesWPPEntryPoint( TComSlice* pSlice ); 98 98 Void codeTerminatingBit ( UInt uilsLast ); 99 99 Void codeSliceFinish (); 100 Void codeFlush () {}101 100 Void encodeStart () {} 102 101 103 102 Void codeMVPIdx ( TComDataCU* pcCU, UInt uiAbsPartIdx, RefPicList eRefList ); … … 142 141 Void updateContextTables ( SliceType eSliceType, Int iQp, Bool bExecuteFinish=true ) { return; } 143 142 Void updateContextTables ( SliceType eSliceType, Int iQp ) { return; } 144 143 145 Void codeFinish(Bool bEnd) { /*do nothing*/}146 144 Void codeScalingList ( TComScalingList* scalingList ); 147 145 Void xCodeScalingList ( TComScalingList* scalingList, UInt sizeId, UInt listId); 148 146 Void codeDFFlag ( UInt uiCode, const Char *pSymbolName ); -
source/Lib/TLibEncoder/TEncEntropy.cpp
80 80 m_pcEntropyCoderIf->codeSliceFinish(); 81 81 } 82 82 83 Void TEncEntropy::encodeFlush()84 {85 m_pcEntropyCoderIf->codeFlush();86 }87 88 83 Void TEncEntropy::encodeStart() 89 84 { 90 85 m_pcEntropyCoderIf->encodeStart(); -
source/Lib/TLibEncoder/TEncBinCoderCABAC.h
63 63 Void encodePCMAlignBits(); 64 64 Void xWritePCMCode ( UInt uiCode, UInt uiLength ); 65 65 66 Void encodeFlush(Bool bEnd); //!< flush bits when CABAC termination67 68 66 Void resetBits (); 69 67 UInt getNumWrittenBits (); 70 68 -
source/Lib/TLibEncoder/TEncSbac.cpp
279 279 m_pcBinIf->finish(); 280 280 } 281 281 282 Void TEncSbac::codeFlush()283 {284 m_pcBinIf->flush();285 }286 287 282 Void TEncSbac::encodeStart() 288 283 { 289 284 m_pcBinIf->start(); -
source/Lib/TLibEncoder/TEncBinCoderCABAC.cpp
382 382 } 383 383 } 384 384 385 /** flush bits when CABAC termination386 * \param [in] bEnd true means this flushing happens at the end of RBSP. No need to encode stop bit387 */388 Void TEncBinCABAC::encodeFlush(Bool bEnd)389 {390 m_uiRange = 2;391 392 m_uiLow += 2;393 m_uiLow <<= 7;394 m_uiRange = 2 << 7;395 m_bitsLeft -= 7;396 testAndWriteOut();397 finish();398 399 if(!bEnd)400 {401 m_pcTComBitIf->write( 1, 1 ); // stop bit402 }403 }404 405 385 //! \} -
source/Lib/TLibEncoder/TEncEntropy.h
75 75 virtual Void codeTilesWPPEntryPoint ( TComSlice* pSlice ) = 0; 76 76 virtual Void codeTerminatingBit ( UInt uilsLast ) = 0; 77 77 virtual Void codeSliceFinish () = 0; 78 virtual Void codeFlush () = 0;79 78 virtual Void encodeStart () = 0; 80 79 virtual Void codeMVPIdx ( TComDataCU* pcCU, UInt uiAbsPartIdx, RefPicList eRefList ) = 0; 81 80 virtual Void codeScalingList ( TComScalingList* scalingList ) = 0; … … 116 115 virtual Void updateContextTables ( SliceType eSliceType, Int iQp, Bool bExecuteFinish ) = 0; 117 116 virtual Void updateContextTables ( SliceType eSliceType, Int iQp ) = 0; 118 117 119 virtual Void codeFinish (Bool bEnd)= 0;120 121 118 virtual Void codeDFFlag (UInt uiCode, const Char *pSymbolName) = 0; 122 119 virtual Void codeDFSvlc (Int iCode, const Char *pSymbolName) = 0; 123 120 … … 147 144 Void encodeTilesWPPEntryPoint( TComSlice* pSlice ); 148 145 Void encodeTerminatingBit ( UInt uiIsLast ); 149 146 Void encodeSliceFinish (); 150 Void encodeFlush ();151 147 Void encodeStart (); 152 148 TEncEntropyIf* m_pcEntropyCoderIf; 153 149 … … 183 179 Void updateContextTables ( SliceType eSliceType, Int iQp, Bool bExecuteFinish ) { m_pcEntropyCoderIf->updateContextTables( eSliceType, iQp, bExecuteFinish ); } 184 180 Void updateContextTables ( SliceType eSliceType, Int iQp ) { m_pcEntropyCoderIf->updateContextTables( eSliceType, iQp, true ); } 185 181 186 Void encodeFinish (Bool bEnd) {m_pcEntropyCoderIf->codeFinish(bEnd);}187 182 Void encodeScalingList ( TComScalingList* scalingList ); 188 183 189 184 private: -
source/Lib/TLibEncoder/TEncSbac.h
96 96 Void codeTilesWPPEntryPoint( TComSlice* pSlice ); 97 97 Void codeTerminatingBit ( UInt uilsLast ); 98 98 Void codeSliceFinish (); 99 Void codeFlush ();100 99 Void encodeStart (); 101 100 Void codeSaoMaxUvlc ( UInt code, UInt maxSymbol ); 102 101 Void codeSaoMerge ( UInt uiCode ); … … 115 114 Void xCopyFrom ( TEncSbac* pSrc ); 116 115 Void xCopyContextsFrom ( TEncSbac* pSrc ); 117 116 118 Void codeFinish (Bool bEnd) { m_pcBinIf->encodeFlush(bEnd); } //<! flush bits when CABAC termination119 117 Void codeDFFlag( UInt uiCode, const Char *pSymbolName ) {printf("Not supported in codeDFFlag()\n"); assert(0); exit(1);}; 120 118 Void codeDFSvlc( Int iCode, const Char *pSymbolName ) {printf("Not supported in codeDFSvlc()\n"); assert(0); exit(1);}; 121 119