Index: branches/SHM-dev/source/App/TAppDecoder/TAppDecCfg.cpp =================================================================== --- branches/SHM-dev/source/App/TAppDecoder/TAppDecCfg.cpp (revision 819) +++ branches/SHM-dev/source/App/TAppDecoder/TAppDecCfg.cpp (revision 820) @@ -78,7 +78,5 @@ string cfg_ReconFile; #endif -#if AVC_SYNTAX || SYNTAX_OUTPUT - string cfg_BLSyntaxFile; -#endif + string cfg_TargetDecLayerIdSetFile; @@ -96,17 +94,8 @@ ("BLSourceHeight,-hgt", m_iBLSourceHeight, 0, "BL source picture height") #endif -#if AVC_SYNTAX - ("BLSyntaxFile,-ibs", cfg_BLSyntaxFile, string(""), "BL syntax input file name") -#endif #endif #else ("ReconFile,o", cfg_ReconFile, string(""), "reconstructed YUV output file name\n" "YUV writing is skipped if omitted") -#endif -#if SYNTAX_OUTPUT - ("BLSyntaxFile,-ibs", cfg_BLSyntaxFile, string(""), "BL syntax input file name") - ("BLSourceWidth,-wdt", m_iBLSourceWidth, 0, "BL source picture width") - ("BLSourceHeight,-hgt", m_iBLSourceHeight, 0, "BL source picture height") - ("BLFrames,-fr", m_iBLFrames, 0, "BL number of frames") #endif ("SkipFrames,s", m_iSkipFrame, 0, "number of frames to skip before random access") @@ -163,7 +152,4 @@ #else m_pchReconFile = cfg_ReconFile.empty() ? NULL : strdup(cfg_ReconFile.c_str()); -#endif -#if AVC_SYNTAX || SYNTAX_OUTPUT - m_pchBLSyntaxFile = cfg_BLSyntaxFile.empty() ? NULL : strdup(cfg_BLSyntaxFile.c_str()); #endif Index: branches/SHM-dev/source/App/TAppDecoder/TAppDecCfg.h =================================================================== --- branches/SHM-dev/source/App/TAppDecoder/TAppDecCfg.h (revision 819) +++ branches/SHM-dev/source/App/TAppDecoder/TAppDecCfg.h (revision 820) @@ -78,17 +78,5 @@ Int m_iBLSourceHeight; #endif -#if AVC_SYNTAX - Char* m_pchBLSyntaxFile; ///< input BL syntax file name #endif -#endif -#endif - -#if SYNTAX_OUTPUT - Char* m_pchBLSyntaxFile; ///< input BL syntax file name -#if !REPN_FORMAT_IN_VPS - Int m_iBLSourceWidth; - Int m_iBLSourceHeight; -#endif - Int m_iBLFrames; #endif @@ -116,9 +104,4 @@ , m_iBLSourceHeight(0) #endif -#if SYNTAX_OUTPUT - , m_iBLSourceWidth(0) - , m_iBLSourceHeight(0) - , m_iBLFrames(0) -#endif #endif , m_respectDefDispWindow(0) Index: branches/SHM-dev/source/App/TAppDecoder/TAppDecTop.cpp =================================================================== --- branches/SHM-dev/source/App/TAppDecoder/TAppDecTop.cpp (revision 819) +++ branches/SHM-dev/source/App/TAppDecoder/TAppDecTop.cpp (revision 820) @@ -102,11 +102,4 @@ } #endif -#if AVC_SYNTAX || SYNTAX_OUTPUT - if( m_pchBLSyntaxFile ) - { - free ( m_pchBLSyntaxFile ); - m_pchBLSyntaxFile = NULL; - } -#endif } @@ -163,18 +156,7 @@ } TComList *cListPic = m_acTDecTop[0].getListPic(); -#if AVC_SYNTAX || !REPN_FORMAT_IN_VPS - m_acTDecTop[0].setBLsize( m_iBLSourceWidth, m_iBLSourceHeight ); -#endif m_acTDecTop[0].setBLReconFile( &streamYUV ); pcBLPic.setLayerId( 0 ); cListPic->pushBack( &pcBLPic ); -#if AVC_SYNTAX - fstream streamSyntaxFile; - if( m_pchBLSyntaxFile ) - { - streamSyntaxFile.open( m_pchBLSyntaxFile, fstream::in | fstream::binary ); - } - m_acTDecTop[0].setBLSyntaxFile( &streamSyntaxFile ); -#endif #endif @@ -363,10 +345,4 @@ streamYUV.close(); } -#if AVC_SYNTAX - if( streamSyntaxFile.is_open() ) - { - streamSyntaxFile.close(); - } -#endif pcBLPic.destroy(); @@ -405,25 +381,4 @@ Bool openedReconFile = false; // reconstruction file not yet opened. (must be performed after SPS is seen) Bool loopFiltered = false; - -#if SYNTAX_OUTPUT - if( !m_pchBLSyntaxFile ) - { - printf( "Wrong base layer syntax file\n" ); - exit(EXIT_FAILURE); - } - fstream streamSyntaxFile( m_pchBLSyntaxFile, fstream::out | fstream::binary ); - if( !streamSyntaxFile.good() ) - { - printf( "Base layer syntax input reading error\n" ); - exit(EXIT_FAILURE); - } - m_cTDecTop.setBLSyntaxFile( &streamSyntaxFile ); - - for( Int i = m_iBLFrames * m_iBLSourceWidth * m_iBLSourceHeight * SYNTAX_BYTES / 16; i >= 0; i-- ) - { - streamSyntaxFile.put( 0 ); - } - streamSyntaxFile.seekp( 0 ); -#endif while (!!bitstreamFile) @@ -542,11 +497,4 @@ } } - -#if SYNTAX_OUTPUT - if( streamSyntaxFile.is_open() ) - { - streamSyntaxFile.close(); - } -#endif xFlushOutput( pcListPic ); @@ -873,20 +821,11 @@ if ( m_pchReconFile ) { -#if SYNTAX_OUTPUT - TComPicYuv* pPicCYuvRec = pcPic->getPicYuvRec(); -#if Q0074_SEI_COLOR_MAPPING - if( m_acTDecTop[layerIdx].m_ColorMapping->getColorMappingFlag() ) - { - pPicCYuvRec = m_acTDecTop[layerIdx].m_ColorMapping->getColorMapping( pPicCYuvRec, 0, layerIdx ); - } -#endif const Window &conf = pcPic->getConformanceWindow(); const Window &defDisp = m_respectDefDispWindow ? pcPic->getDefDisplayWindow() : Window(); - m_cTVideoIOYuvReconFile.write( pPicCYuvRec, - conf.getWindowLeftOffset() + defDisp.getWindowLeftOffset(), - conf.getWindowRightOffset() + defDisp.getWindowRightOffset(), - conf.getWindowTopOffset() + defDisp.getWindowTopOffset(), - conf.getWindowBottomOffset() + defDisp.getWindowBottomOffset() ); -#endif + m_cTVideoIOYuvReconFile.write( pcPic->getPicYuvRec(), + conf.getWindowLeftOffset() + defDisp.getWindowLeftOffset(), + conf.getWindowRightOffset() + defDisp.getWindowRightOffset(), + conf.getWindowTopOffset() + defDisp.getWindowTopOffset(), + conf.getWindowBottomOffset() + defDisp.getWindowBottomOffset() ); } Index: branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.cpp =================================================================== --- branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.cpp (revision 819) +++ branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.cpp (revision 820) @@ -510,7 +510,4 @@ string cfg_BLInputFile; #endif -#if AVC_SYNTAX - string cfg_BLSyntaxFile; -#endif #if N0383_IL_CONSTRAINED_TILE_SETS_SEI string cfg_tileSets; @@ -629,7 +626,4 @@ ("AvcBase,-avc", m_avcBaseLayerFlag, 0, "avc_base_layer_flag") ("InputBLFile,-ibl", cfg_BLInputFile, string(""), "Base layer rec YUV input file name") -#if AVC_SYNTAX - ("InputBLSyntaxFile,-ibs", cfg_BLSyntaxFile, string(""), "Base layer syntax input file name") -#endif #endif ("EnableElRapB,-use-rap-b", m_elRapSliceBEnabled, 0, "Set ILP over base-layer I picture to B picture (default is P picture)") @@ -1095,7 +1089,4 @@ #endif m_pBitstreamFile = cfg_BitstreamFile.empty() ? NULL : strdup(cfg_BitstreamFile.c_str()); -#if AVC_SYNTAX - m_BLSyntaxFile = cfg_BLSyntaxFile.empty() ? NULL : strdup(cfg_BLSyntaxFile.c_str()); -#endif #else //SVC_EXTENSION m_pchInputFile = cfg_InputFile.empty() ? NULL : strdup(cfg_InputFile.c_str()); @@ -2933,14 +2924,10 @@ { printf("=== Layer %d settings === \n", layer); -#if AVC_SYNTAX - m_acLayerCfg[layer].xPrintParameter( layer ); -#else m_acLayerCfg[layer].xPrintParameter(); -#endif printf("\n"); } printf("=== Common configuration settings === \n"); printf("Bitstream File : %s\n", m_pBitstreamFile ); -#else +#else //SVC_EXTENSION printf("Input File : %s\n", m_pchInputFile ); printf("Bitstream File : %s\n", m_pchBitstreamFile ); @@ -2948,5 +2935,5 @@ printf("Real Format : %dx%d %dHz\n", m_iSourceWidth - m_confLeft - m_confRight, m_iSourceHeight - m_confTop - m_confBottom, m_iFrameRate ); printf("Internal Format : %dx%d %dHz\n", m_iSourceWidth, m_iSourceHeight, m_iFrameRate ); -#endif +#endif //SVC_EXTENSION if (m_isField) { Index: branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.h =================================================================== --- branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.h (revision 819) +++ branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.h (revision 820) @@ -69,7 +69,4 @@ #if AVC_BASE Int m_avcBaseLayerFlag; ///< avc_baselayer_flag -#endif -#if AVC_SYNTAX - Char* m_BLSyntaxFile; ///< input syntax file #endif Bool m_maxTidRefPresentFlag; @@ -470,7 +467,4 @@ Int getWaveFrontSynchro() { return m_iWaveFrontSynchro; } Void getDirFilename(string& filename, string& dir, const string path); -#if AVC_SYNTAX - Char* getBLSyntaxFile() { return m_BLSyntaxFile; } -#endif Void cfgStringToArray(Int **arr, string cfgString, Int numEntries, const char* logString); #if REPN_FORMAT_IN_VPS Index: branches/SHM-dev/source/App/TAppEncoder/TAppEncLayerCfg.cpp =================================================================== --- branches/SHM-dev/source/App/TAppEncoder/TAppEncLayerCfg.cpp (revision 819) +++ branches/SHM-dev/source/App/TAppEncoder/TAppEncLayerCfg.cpp (revision 820) @@ -157,18 +157,8 @@ } -#if AVC_SYNTAX -Void TAppEncLayerCfg::xPrintParameter( UInt layerId ) -#else Void TAppEncLayerCfg::xPrintParameter() -#endif { printf("Input File : %s\n", m_cInputFile.c_str() ); printf("Reconstruction File : %s\n", m_cReconFile.c_str() ); -#if AVC_SYNTAX - if( layerId == 0 ) - { - printf("Base layer syntax file : %s\n", m_cAppEncCfg->getBLSyntaxFile() ); - } -#endif #if REPN_FORMAT_IN_VPS printf("Real Format : %dx%d %dHz\n", m_iSourceWidth - ( m_confLeft + m_confRight ) * TComSPS::getWinUnitX( m_chromaFormatIDC ), m_iSourceHeight - ( m_confTop + m_confBottom ) * TComSPS::getWinUnitY( m_chromaFormatIDC ), m_iFrameRate ); Index: branches/SHM-dev/source/App/TAppEncoder/TAppEncLayerCfg.h =================================================================== --- branches/SHM-dev/source/App/TAppEncoder/TAppEncLayerCfg.h (revision 819) +++ branches/SHM-dev/source/App/TAppEncoder/TAppEncLayerCfg.h (revision 820) @@ -122,9 +122,5 @@ bool parseCfg ( const string& cfgFileName ); ///< parse layer configuration file to fill member variables -#if AVC_SYNTAX - Void xPrintParameter( UInt layerId ); -#else Void xPrintParameter(); -#endif Bool xCheckParameter( Bool isField ); Index: branches/SHM-dev/source/App/TAppEncoder/TAppEncTop.cpp =================================================================== --- branches/SHM-dev/source/App/TAppEncoder/TAppEncTop.cpp (revision 819) +++ branches/SHM-dev/source/App/TAppEncoder/TAppEncTop.cpp (revision 820) @@ -226,5 +226,5 @@ #if REF_IDX_MFM #if AVC_BASE - m_acTEncTop[layer].setMFMEnabledFlag(layer == 0 ? false : ( m_avcBaseLayerFlag ? AVC_SYNTAX : true ) && m_acLayerCfg[layer].getNumMotionPredRefLayers()); + m_acTEncTop[layer].setMFMEnabledFlag(layer == 0 ? false : ( m_avcBaseLayerFlag ? false : true ) && m_acLayerCfg[layer].getNumMotionPredRefLayers()); #else m_acTEncTop[layer].setMFMEnabledFlag(layer == 0 ? false : ( m_acLayerCfg[layer].getNumMotionPredRefLayers() > 0 ) ); @@ -1669,23 +1669,4 @@ } -#if AVC_SYNTAX - fstream streamSyntaxFile; - if( m_acTEncTop[0].getVPS()->getAvcBaseLayerFlag() ) - { - if( !m_BLSyntaxFile ) - { - printf( "Wrong base layer syntax input file\n" ); - exit(EXIT_FAILURE); - } - streamSyntaxFile.open( m_BLSyntaxFile, fstream::in | fstream::binary ); - if( !streamSyntaxFile.good() ) - { - printf( "Base layer syntax input reading error\n" ); - exit(EXIT_FAILURE); - } - m_acTEncTop[0].setBLSyntaxFile( &streamSyntaxFile ); - } -#endif - Bool bFirstFrame = true; while ( !bEos ) @@ -1884,11 +1865,4 @@ m_acTEncTop[layer].deletePicBuffer(); } - -#if AVC_SYNTAX - if( streamSyntaxFile.is_open() ) - { - streamSyntaxFile.close(); - } -#endif // delete buffers & classes @@ -2324,7 +2298,5 @@ if (m_pchReconFile) { -#if SYNTAX_OUTPUT m_cTVideoIOYuvReconFile.write( pcPicYuvRec, m_confLeft, m_confRight, m_confTop, m_confBottom ); -#endif } Index: branches/SHM-dev/source/Lib/TLibCommon/TComMotionInfo.h =================================================================== --- branches/SHM-dev/source/Lib/TLibCommon/TComMotionInfo.h (revision 819) +++ branches/SHM-dev/source/Lib/TLibCommon/TComMotionInfo.h (revision 820) @@ -155,9 +155,4 @@ Void compress(Char* pePredMode, Int scale); -#if AVC_SYNTAX - Void setMv (TComMv cMv, Int iIdx ) { m_pcMv [iIdx] = cMv; } - Void setRefIdx(Int iRefIdx, Int iIdx ) { m_piRefIdx[iIdx] = iRefIdx; } -#endif - #if REF_IDX_MFM Void setMvField( TComMvField const& mvField, Int iIdx ) Index: branches/SHM-dev/source/Lib/TLibCommon/TComPic.cpp =================================================================== --- branches/SHM-dev/source/Lib/TLibCommon/TComPic.cpp (revision 819) +++ branches/SHM-dev/source/Lib/TLibCommon/TComPic.cpp (revision 820) @@ -334,157 +334,4 @@ #endif -#if AVC_SYNTAX -Void TComPic::readBLSyntax( fstream* filestream, UInt numBytes ) -{ - if( !filestream->good() ) - { - return; - } - - UInt width = this->getPicYuvRec()->getWidth(); - UInt height = this->getPicYuvRec()->getHeight(); - - UInt64 poc = (UInt64)this->getPOC(); - UInt partWidth = width / 4; - UInt partHeight = height / 4; - - UInt numPartInWidth = this->getNumPartInWidth(); - UInt numPartInHeight = this->getNumPartInHeight(); - UInt numPartLCUInWidth = this->getFrameWidthInCU(); - - UInt64 uiPos = (UInt64)poc * width * height * numBytes / 16; - - filestream->seekg( uiPos, ios_base::beg ); - - for( Int i = 0; i < partHeight; i++ ) - { - for( Int j = 0; j < partWidth; j++ ) - { - UInt x = ( j / numPartInWidth ); - UInt y = ( i / numPartInHeight ); - - UInt addrLCU = y * numPartLCUInWidth + x; - UInt partAddr = ( i - y * numPartInHeight ) * numPartInWidth + ( j - x * numPartInWidth ); - partAddr = g_auiRasterToZscan[partAddr]; - - TComDataCU* pcCU = this->getCU( addrLCU ); - - TComMv mv; - Short temp; - - // RefIdxL0 - Char refIdxL0 = -1; - filestream->read( &refIdxL0, 1 ); - assert( refIdxL0 >= -1 ); - pcCU->getCUMvField( REF_PIC_LIST_0 )->setRefIdx( (Int)refIdxL0, partAddr ); - - // RefIdxL1 - Char refIdxL1 = -1; - filestream->read( &refIdxL1, 1 ); - assert( refIdxL1 >= -1 ); - pcCU->getCUMvField( REF_PIC_LIST_1 )->setRefIdx( (Int)refIdxL1, partAddr ); - - // MV L0 - temp = 0; - filestream->read( reinterpret_cast(&temp), 2 ); - mv.setHor( (Short)temp ); - temp = 0; - filestream->read( reinterpret_cast(&temp), 2 ); - mv.setVer( (Short)temp ); - pcCU->getCUMvField( REF_PIC_LIST_0 )->setMv( mv, partAddr ); - - // MV L1 - temp = 0; - filestream->read( reinterpret_cast(&temp), 2 ); - mv.setHor( (Short)temp ); - temp = 0; - filestream->read( reinterpret_cast(&temp), 2 ); - mv.setVer( (Short)temp ); - pcCU->getCUMvField( REF_PIC_LIST_1 )->setMv( mv, partAddr ); - - // set dependent information - pcCU->setPredictionMode( partAddr, ( refIdxL0 == NOT_VALID && refIdxL1 == NOT_VALID ) ? MODE_INTRA : MODE_INTER ); - UInt interDir = ( refIdxL0 != NOT_VALID ) + ( refIdxL1 != NOT_VALID && this->getSlice(0)->isInterB() ) * 2; - assert( interDir <= 3 ); - pcCU->setInterDir( partAddr, interDir ); - } - } -} -#endif - -#if SYNTAX_OUTPUT -Void TComPic::wrireBLSyntax( fstream* filestream, UInt numBytes ) -{ - if( !filestream->good() ) - { - return; - } - - UInt width = this->getPicYuvRec()->getWidth(); - UInt height = this->getPicYuvRec()->getHeight(); - - UInt64 poc = (UInt64)this->getPOC(); - UInt partWidth = width / 4; - UInt partHeight = height / 4; - - UInt numPartInWidth = this->getNumPartInWidth(); - UInt numPartInHeight = this->getNumPartInHeight(); - UInt numPartLCUInWidth = this->getFrameWidthInCU(); - - filestream->seekg( poc * width * height * numBytes / 16 ); - - for( Int i = 0; i < partHeight; i++ ) - { - for( Int j = 0; j < partWidth; j++ ) - { - UInt x = ( j / numPartInWidth ); - UInt y = ( i / numPartInHeight ); - - UInt addrLCU = y * numPartLCUInWidth + x; - UInt partAddr = ( i - y * numPartInHeight ) * numPartInWidth + ( j - x * numPartInWidth ); - partAddr = g_auiRasterToZscan[partAddr]; - - TComDataCU* pcCU = this->getCU( addrLCU ); - - TComMv mv; - Short temp; - Char refIdxL0 = NOT_VALID, refIdxL1 = NOT_VALID; - - // RefIdx - if( !pcCU->isIntra( partAddr ) ) - { - refIdxL0 = (Char)pcCU->getCUMvField( REF_PIC_LIST_0 )->getRefIdx( partAddr ); - refIdxL1 = (Char)pcCU->getCUMvField( REF_PIC_LIST_1 )->getRefIdx( partAddr ); - } - assert( refIdxL0 >= - 1 && refIdxL1 >= - 1 ); - filestream->put( refIdxL0 ); - filestream->put( refIdxL1 ); - - // MV L0 - mv.setZero(); - if( refIdxL0 >= 0 ) - { - mv = pcCU->getCUMvField( REF_PIC_LIST_0 )->getMv( partAddr ); - } - temp = (Short)mv.getHor(); - filestream->write( reinterpret_cast(&temp), 2 ); - temp = (Short)mv.getVer(); - filestream->write( reinterpret_cast(&temp), 2 ); - - // MV L1 - mv.setZero(); - if( refIdxL1 >= 0 ) - { - mv = pcCU->getCUMvField( REF_PIC_LIST_1 )->getMv( partAddr ); - } - temp = (Short)mv.getHor(); - filestream->write( reinterpret_cast(&temp), 2 ); - temp = (Short)mv.getVer(); - filestream->write( reinterpret_cast(&temp), 2 ); - } - } -} -#endif - #if MFM_ENCCONSTRAINT Bool TComPic::checkSameRefInfo() Index: branches/SHM-dev/source/Lib/TLibCommon/TComPic.h =================================================================== --- branches/SHM-dev/source/Lib/TLibCommon/TComPic.h (revision 819) +++ branches/SHM-dev/source/Lib/TLibCommon/TComPic.h (revision 820) @@ -45,5 +45,5 @@ #include "TComBitStream.h" #include "SEI.h" -#if AVC_BASE || SYNTAX_OUTPUT +#if AVC_BASE #include #endif @@ -213,10 +213,4 @@ #endif Void copyUpsampledPictureYuv(TComPicYuv* pcPicYuvIn, TComPicYuv* pcPicYuvOut); -#if AVC_SYNTAX - Void readBLSyntax( fstream* filestream, UInt numBytes ); -#endif -#endif -#if SYNTAX_OUTPUT - Void wrireBLSyntax( fstream* filestream, UInt numBytes ); #endif Index: branches/SHM-dev/source/Lib/TLibCommon/TComPicSym.h =================================================================== --- branches/SHM-dev/source/Lib/TLibCommon/TComPicSym.h (revision 819) +++ branches/SHM-dev/source/Lib/TLibCommon/TComPicSym.h (revision 820) @@ -161,9 +161,4 @@ UInt getMaxCUHeight() { return m_uiMaxCUHeight; } #endif -#if AVC_SYNTAX - UInt getMaxCUWidth() { return m_uiMaxCUWidth; } - UInt getMaxCUHeight() { return m_uiMaxCUHeight; } - UInt getMaxDepth() { return m_uhTotalDepth; } -#endif #if N0383_IL_CONSTRAINED_TILE_SETS_SEI Void setTileSetIdxMap( Int i, Int tileSetIdx, UChar setType, Bool skipFlag ) Index: branches/SHM-dev/source/Lib/TLibCommon/TComSlice.cpp =================================================================== --- branches/SHM-dev/source/Lib/TLibCommon/TComSlice.cpp (revision 819) +++ branches/SHM-dev/source/Lib/TLibCommon/TComSlice.cpp (revision 820) @@ -3854,48 +3854,4 @@ #if SVC_EXTENSION -#if AVC_SYNTAX -Void TComSlice::initBaseLayerRPL( TComSlice *pcSlice ) -{ -// Assumed that RPL of the base layer is same to the EL, otherwise this information should be also dumped and read from the metadata file - setPOC( pcSlice->getPOC() ); - if( pcSlice->getNalUnitType() >= NAL_UNIT_CODED_SLICE_BLA_W_LP && pcSlice->getNalUnitType() <= NAL_UNIT_CODED_SLICE_CRA ) - { - setSliceType( I_SLICE ); - } - else - { - setSliceType( pcSlice->getSliceType() ); - } - - if( this->isIntra() ) - { - return; - } - - //initialize reference POC of BL - for( Int iRefPicList = 0; iRefPicList < 2; iRefPicList++ ) - { - RefPicList eRefPicList = RefPicList( iRefPicList ); - - assert( pcSlice->getNumRefIdx( eRefPicList) >= 0 ); - setNumRefIdx( eRefPicList, pcSlice->getNumRefIdx( eRefPicList ) - 1 ); - assert( getNumRefIdx( eRefPicList) <= MAX_NUM_REF); - - for(Int refIdx = 0; refIdx < getNumRefIdx( eRefPicList ); refIdx++) - { - setRefPOC( pcSlice->getRefPic( eRefPicList, refIdx )->getPOC(), eRefPicList, refIdx ); - setRefPic( pcSlice->getRefPic( eRefPicList, refIdx ), eRefPicList, refIdx ); - /* - // should be set if the base layer has its own instance of the reference picture lists, currently EL RPL is reused. - getRefPic( eRefPicList, refIdx )->setLayerId( 0 ); - getRefPic( eRefPicList, refIdx )->setIsLongTerm( pcSlice->getRefPic( eRefPicList, refIdx )->getIsLongTerm() ); - */ - - } - } - return; -} -#endif - Bool TComSlice::setBaseColPic( TComList& rcListPic, UInt refLayerIdc ) { Index: branches/SHM-dev/source/Lib/TLibCommon/TComSlice.h =================================================================== --- branches/SHM-dev/source/Lib/TLibCommon/TComSlice.h (revision 819) +++ branches/SHM-dev/source/Lib/TLibCommon/TComSlice.h (revision 820) @@ -2407,8 +2407,4 @@ TComPicYuv* getFullPelBaseRec (UInt refLayerIdc) { return m_pcFullPelBaseRec[refLayerIdc]; } -#if AVC_SYNTAX - Void initBaseLayerRPL( TComSlice *pcSlice ); -#endif - Void setRefPicListModificationSvc(); Int getNumILRRefIdx ( ) { return m_pcVPS->getNumDirectRefLayers( m_layerId ); } Index: branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h =================================================================== --- branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h (revision 819) +++ branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h (revision 820) @@ -41,5 +41,4 @@ #define SVC_EXTENSION 1 -#define SYNTAX_BYTES 10 ///< number of bytes taken by syntaxes per 4x4 block [RefIdxL0(1byte), RefIdxL1(1byte), MVxL0(2bytes), MVyL0(2bytes), MVxL1(2bytes), MVyL1(2bytes)] #if SVC_EXTENSION #define MAX_LAYERS 8 ///< max number of layers the codec is supposed to handle @@ -152,7 +151,4 @@ #define AVC_BASE 1 ///< YUV BL reading for AVC base SVC -#if AVC_BASE -#define AVC_SYNTAX 0 ///< Syntax reading for AVC base -#endif #define REF_IDX_MFM 1 ///< JCTVC-L0336: motion vector mapping of inter-layer reference picture @@ -262,6 +258,4 @@ -#else -#define SYNTAX_OUTPUT 0 #endif // SVC_EXTENSION Index: branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp =================================================================== --- branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp (revision 819) +++ branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp (revision 820) @@ -74,7 +74,4 @@ memset(m_cIlpPic, 0, sizeof(m_cIlpPic)); #endif -#if AVC_SYNTAX || SYNTAX_OUTPUT - m_pBLSyntaxFile = NULL; -#endif m_prevSliceSkipped = false; m_skippedPOC = 0; @@ -522,7 +519,4 @@ m_cGopDecoder.filterPicture(pcPic); -#if SYNTAX_OUTPUT - pcPic->wrireBLSyntax( getBLSyntaxFile(), SYNTAX_BYTES ); -#endif TComSlice::sortPicList( m_cListPic ); // sorting for application output poc = pcPic->getSlice(m_uiSliceIdx-1)->getPOC(); @@ -781,15 +775,7 @@ #if AUXILIARY_PICTURES -#if AVC_SYNTAX - pBLPic->create( repFormat->getPicWidthVpsInLumaSamples(), repFormat->getPicHeightVpsInLumaSamples(), repFormat->getChromaFormatVpsIdc(), activeSPS->getMaxCUWidth(), activeSPS->getMaxCUHeight(), activeSPS->getMaxCUDepth(), conformanceWindow, defaultDisplayWindow, numReorderPics, activeSPS, true); -#else pBLPic->create( repFormat->getPicWidthVpsInLumaSamples(), repFormat->getPicHeightVpsInLumaSamples(), repFormat->getChromaFormatVpsIdc(), activeSPS->getMaxCUWidth(), activeSPS->getMaxCUHeight(), activeSPS->getMaxCUDepth(), conformanceWindow, defaultDisplayWindow, numReorderPics, NULL, true); -#endif -#else -#if AVC_SYNTAX - pBLPic->create( repFormat->getPicWidthVpsInLumaSamples(), repFormat->getPicHeightVpsInLumaSamples(), activeSPS->getMaxCUWidth(), activeSPS->getMaxCUHeight(), activeSPS->getMaxCUDepth(), conformanceWindow, defaultDisplayWindow, numReorderPics, activeSPS, true); #else pBLPic->create( repFormat->getPicWidthVpsInLumaSamples(), repFormat->getPicHeightVpsInLumaSamples(), activeSPS->getMaxCUWidth(), activeSPS->getMaxCUHeight(), activeSPS->getMaxCUDepth(), conformanceWindow, defaultDisplayWindow, numReorderPics, NULL, true); -#endif #endif // it is needed where the VPS is accessed through the slice @@ -1805,16 +1791,4 @@ continue; } -#if AVC_SYNTAX - TComPic* pBLPic = pcSlice->getBaseColPic(refLayerIdc); - if( pcSlice->getPOC() == 0 ) - { - // initialize partition order. - UInt* piTmp = &g_auiZscanToRaster[0]; - initZscanToRaster( pBLPic->getPicSym()->getMaxDepth() + 1, 1, 0, piTmp ); - initRasterToZscan( pBLPic->getPicSym()->getMaxCUWidth(), pBLPic->getPicSym()->getMaxCUHeight(), pBLPic->getPicSym()->getMaxDepth() + 1 ); - } - pBLPic->getSlice( 0 )->initBaseLayerRPL( pcSlice ); - pBLPic->readBLSyntax( m_ppcTDecTop[0]->getBLSyntaxFile(), SYNTAX_BYTES ); -#endif } else @@ -1931,16 +1905,4 @@ { pcSlice->setBaseColPic ( refLayerIdc, *m_ppcTDecTop[0]->getListPic()->begin() ); -#if AVC_SYNTAX - TComPic* pBLPic = pcSlice->getBaseColPic(refLayerIdc); - if( pcSlice->getPOC() == 0 ) - { - // initialize partition order. - UInt* piTmp = &g_auiZscanToRaster[0]; - initZscanToRaster( pBLPic->getPicSym()->getMaxDepth() + 1, 1, 0, piTmp ); - initRasterToZscan( pBLPic->getPicSym()->getMaxCUWidth(), pBLPic->getPicSym()->getMaxCUHeight(), pBLPic->getPicSym()->getMaxDepth() + 1 ); - } - pBLPic->getSlice( 0 )->initBaseLayerRPL( pcSlice ); - pBLPic->readBLSyntax( m_ppcTDecTop[0]->getBLSyntaxFile(), SYNTAX_BYTES ); -#endif } else @@ -2294,11 +2256,4 @@ exit(EXIT_FAILURE); } -#if AVC_SYNTAX - if( !m_ppcTDecTop[0]->getBLSyntaxFile()->good() ) - { - printf( "Base layer syntax input reading error\n" ); - exit(EXIT_FAILURE); - } -#endif } else Index: branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.h =================================================================== --- branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.h (revision 819) +++ branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.h (revision 820) @@ -195,8 +195,4 @@ CommonDecoderParams* m_commonDecoderParams; #endif -#if AVC_SYNTAX || SYNTAX_OUTPUT - fstream* m_pBLSyntaxFile; -#endif - #if NO_CLRAS_OUTPUT_FLAG Bool m_noClrasOutputFlag; @@ -327,8 +323,5 @@ #endif #endif //SVC_EXTENSION -#if AVC_SYNTAX || SYNTAX_OUTPUT - Void setBLSyntaxFile( fstream* pFile ) { m_pBLSyntaxFile = pFile; } - fstream* getBLSyntaxFile() { return m_pBLSyntaxFile; } -#endif + protected: Void xGetNewPicBuffer (TComSlice* pcSlice, TComPic*& rpcPic); Index: branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp =================================================================== --- branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp (revision 819) +++ branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp (revision 820) @@ -2174,7 +2174,4 @@ } #endif -#if AVC_SYNTAX - pcPic->readBLSyntax( m_ppcTEncTop[0]->getBLSyntaxFile(), SYNTAX_BYTES ); -#endif return; } Index: branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.h =================================================================== --- branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.h (revision 819) +++ branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.h (revision 820) @@ -125,7 +125,4 @@ static Int m_iSPSIdCnt; ///< next Id number for SPS static Int m_iPPSIdCnt; ///< next Id number for PPS -#if AVC_SYNTAX - fstream* m_pBLSyntaxFile; -#endif TEncTop** m_ppcTEncTop; TEncTop* getLayerEnc(UInt layer) { return m_ppcTEncTop[layer]; } @@ -246,8 +243,4 @@ Bool getInterLayerWeightedPredFlag() { return m_interLayerWeightedPredFlag; } #endif -#if AVC_SYNTAX - Void setBLSyntaxFile( fstream* pFile ) { m_pBLSyntaxFile = pFile; } - fstream* getBLSyntaxFile() { return m_pBLSyntaxFile; } -#endif Void encode( TComPicYuv* pcPicYuvOrg, TComList& rcListPicYuvRecOut, std::list& accessUnitsOut, Int iPicIdInGOP ); Void encodePrep( TComPicYuv* pcPicYuvOrg );