Index: branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp =================================================================== --- branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp (revision 1315) +++ branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp (revision 1316) @@ -228,11 +228,5 @@ Bool pps_extension_flags[NUM_PPS_EXTENSION_FLAGS]={false}; - pps_extension_flags[PPS_EXT__REXT] = ( - ( pcPPS->getUseTransformSkip() && (pcPPS->getTransformSkipLog2MaxSize() != 2)) - || pcPPS->getUseCrossComponentPrediction() - || ( pcPPS->getChromaQpAdjTableSize() > 0 ) - || ( pcPPS->getSaoOffsetBitShift(CHANNEL_TYPE_LUMA) !=0 ) || ( pcPPS->getSaoOffsetBitShift(CHANNEL_TYPE_CHROMA) !=0 ) - ) - ; + pps_extension_flags[PPS_EXT__REXT] = pcPPS->getPpsRangeExtension().settingsDifferFromDefaults(pcPPS->getUseTransformSkip()); // Other PPS extension flags checked here. @@ -277,28 +271,31 @@ { case PPS_EXT__REXT: - - if (pcPPS->getUseTransformSkip()) { - WRITE_UVLC( pcPPS->getTransformSkipLog2MaxSize()-2, "log2_max_transform_skip_block_size_minus2"); + const TComPPSRExt &ppsRangeExtension = pcPPS->getPpsRangeExtension(); + if (pcPPS->getUseTransformSkip()) + { + WRITE_UVLC( ppsRangeExtension.getLog2MaxTransformSkipBlockSize()-2, "log2_max_transform_skip_block_size_minus2"); + } + + WRITE_FLAG((ppsRangeExtension.getCrossComponentPredictionEnabledFlag() ? 1 : 0), "cross_component_prediction_enabled_flag" ); + + WRITE_FLAG(UInt(ppsRangeExtension.getChromaQpOffsetListEnabledFlag()), "chroma_qp_offset_list_enabled_flag" ); + if (ppsRangeExtension.getChromaQpOffsetListEnabledFlag()) + { + WRITE_UVLC(ppsRangeExtension.getDiffCuChromaQpOffsetDepth(), "diff_cu_chroma_qp_offset_depth"); + WRITE_UVLC(ppsRangeExtension.getChromaQpOffsetListLen() - 1, "chroma_qp_offset_list_len_minus1"); + /* skip zero index */ + for (Int cuChromaQpOffsetIdx = 0; cuChromaQpOffsetIdx < ppsRangeExtension.getChromaQpOffsetListLen(); cuChromaQpOffsetIdx++) + { + WRITE_SVLC(ppsRangeExtension.getChromaQpOffsetListEntry(cuChromaQpOffsetIdx+1).u.comp.CbOffset, "cb_qp_offset_list[i]"); + WRITE_SVLC(ppsRangeExtension.getChromaQpOffsetListEntry(cuChromaQpOffsetIdx+1).u.comp.CrOffset, "cr_qp_offset_list[i]"); + } + } + + WRITE_UVLC( ppsRangeExtension.getLog2SaoOffsetScale(CHANNEL_TYPE_LUMA), "log2_sao_offset_scale_luma" ); + WRITE_UVLC( ppsRangeExtension.getLog2SaoOffsetScale(CHANNEL_TYPE_CHROMA), "log2_sao_offset_scale_chroma" ); } - - WRITE_FLAG((pcPPS->getUseCrossComponentPrediction() ? 1 : 0), "cross_component_prediction_enabled_flag" ); - - WRITE_FLAG(UInt(pcPPS->getChromaQpAdjTableSize() > 0), "chroma_qp_offset_list_enabled_flag" ); - if (pcPPS->getChromaQpAdjTableSize() > 0) - { - WRITE_UVLC(pcPPS->getMaxCuChromaQpAdjDepth(), "diff_cu_chroma_qp_offset_depth"); - WRITE_UVLC(pcPPS->getChromaQpAdjTableSize() - 1, "chroma_qp_offset_list_len_minus1"); - /* skip zero index */ - for (Int cuChromaQpOffsetIdx = 0; cuChromaQpOffsetIdx < pcPPS->getChromaQpAdjTableSize(); cuChromaQpOffsetIdx++) - { - WRITE_SVLC(pcPPS->getChromaQpAdjTableAt(cuChromaQpOffsetIdx+1).u.comp.CbOffset, "cb_qp_offset_list[i]"); - WRITE_SVLC(pcPPS->getChromaQpAdjTableAt(cuChromaQpOffsetIdx+1).u.comp.CrOffset, "cr_qp_offset_list[i]"); - } - } - - WRITE_UVLC( pcPPS->getSaoOffsetBitShift(CHANNEL_TYPE_LUMA), "log2_sao_offset_scale_luma" ); - WRITE_UVLC( pcPPS->getSaoOffsetBitShift(CHANNEL_TYPE_CHROMA), "log2_sao_offset_scale_chroma" ); break; + #if SVC_EXTENSION case PPS_EXT__MLAYER: @@ -713,15 +710,5 @@ Bool sps_extension_flags[NUM_SPS_EXTENSION_FLAGS]={false}; - sps_extension_flags[SPS_EXT__REXT] = ( - pcSPS->getUseResidualRotation() - || pcSPS->getUseSingleSignificanceMapContext() - || pcSPS->getUseResidualDPCM(RDPCM_SIGNAL_IMPLICIT) - || pcSPS->getUseResidualDPCM(RDPCM_SIGNAL_EXPLICIT) - || pcSPS->getUseExtendedPrecision() - || pcSPS->getDisableIntraReferenceSmoothing() - || pcSPS->getUseHighPrecisionPredictionWeighting() - || pcSPS->getUseGolombRiceParameterAdaptation() - || pcSPS->getAlignCABACBeforeBypass() - ); + sps_extension_flags[SPS_EXT__REXT] = pcSPS->getSpsRangeExtension().settingsDifferFromDefaults(); // Other SPS extension flags checked here. @@ -762,15 +749,18 @@ { case SPS_EXT__REXT: - - WRITE_FLAG( (pcSPS->getUseResidualRotation() ? 1 : 0), "transform_skip_rotation_enabled_flag"); - WRITE_FLAG( (pcSPS->getUseSingleSignificanceMapContext() ? 1 : 0), "transform_skip_context_enabled_flag"); - WRITE_FLAG( (pcSPS->getUseResidualDPCM(RDPCM_SIGNAL_IMPLICIT) ? 1 : 0), "implicit_rdpcm_enabled_flag" ); - WRITE_FLAG( (pcSPS->getUseResidualDPCM(RDPCM_SIGNAL_EXPLICIT) ? 1 : 0), "explicit_rdpcm_enabled_flag" ); - WRITE_FLAG( (pcSPS->getUseExtendedPrecision() ? 1 : 0), "extended_precision_processing_flag" ); - WRITE_FLAG( (pcSPS->getDisableIntraReferenceSmoothing() ? 1 : 0), "intra_smoothing_disabled_flag" ); - WRITE_FLAG( (pcSPS->getUseHighPrecisionPredictionWeighting() ? 1 : 0), "high_precision_offsets_enabled_flag" ); - WRITE_FLAG( (pcSPS->getUseGolombRiceParameterAdaptation() ? 1 : 0), "persistent_rice_adaptation_enabled_flag" ); - WRITE_FLAG( (pcSPS->getAlignCABACBeforeBypass() ? 1 : 0), "cabac_bypass_alignment_enabled_flag" ); + { + const TComSPSRExt &spsRangeExtension=pcSPS->getSpsRangeExtension(); + + WRITE_FLAG( (spsRangeExtension.getTransformSkipRotationEnabledFlag() ? 1 : 0), "transform_skip_rotation_enabled_flag"); + WRITE_FLAG( (spsRangeExtension.getTransformSkipContextEnabledFlag() ? 1 : 0), "transform_skip_context_enabled_flag"); + WRITE_FLAG( (spsRangeExtension.getRdpcmEnabledFlag(RDPCM_SIGNAL_IMPLICIT) ? 1 : 0), "implicit_rdpcm_enabled_flag" ); + WRITE_FLAG( (spsRangeExtension.getRdpcmEnabledFlag(RDPCM_SIGNAL_EXPLICIT) ? 1 : 0), "explicit_rdpcm_enabled_flag" ); + WRITE_FLAG( (spsRangeExtension.getExtendedPrecisionProcessingFlag() ? 1 : 0), "extended_precision_processing_flag" ); + WRITE_FLAG( (spsRangeExtension.getIntraSmoothingDisabledFlag() ? 1 : 0), "intra_smoothing_disabled_flag" ); + WRITE_FLAG( (spsRangeExtension.getHighPrecisionOffsetsEnabledFlag() ? 1 : 0), "high_precision_offsets_enabled_flag" ); + WRITE_FLAG( (spsRangeExtension.getPersistentRiceAdaptationEnabledFlag() ? 1 : 0), "persistent_rice_adaptation_enabled_flag" ); + WRITE_FLAG( (spsRangeExtension.getCabacBypassAlignmentEnabledFlag() ? 1 : 0), "cabac_bypass_alignment_enabled_flag" ); break; + } #if SVC_EXTENSION case SPS_EXT__MLAYER: @@ -1299,5 +1289,5 @@ } - if (pcSlice->getPPS()->getChromaQpAdjTableSize() > 0) + if (pcSlice->getPPS()->getPpsRangeExtension().getChromaQpOffsetListEnabledFlag()) { WRITE_FLAG(pcSlice->getUseChromaQpAdj(), "cu_chroma_qp_offset_enabled_flag"); @@ -1715,7 +1705,7 @@ #if SVC_EXTENSION - Int range=pcSlice->getSPS()->getUseHighPrecisionPredictionWeighting() ? (1<getBitDepth(CHANNEL_TYPE_CHROMA))/2 : 128; + Int range=pcSlice->getSPS()->getSpsRangeExtension().getHighPrecisionOffsetsEnabledFlag() ? (1<getBitDepth(CHANNEL_TYPE_CHROMA))/2 : 128; #else - Int range=pcSlice->getSPS()->getUseHighPrecisionPredictionWeighting() ? (1<getSPS()->getBitDepth(CHANNEL_TYPE_CHROMA))/2 : 128; + Int range=pcSlice->getSPS()->getSpsRangeExtension().getHighPrecisionOffsetsEnabledFlag() ? (1<getSPS()->getBitDepth(CHANNEL_TYPE_CHROMA))/2 : 128; #endif Int pred = ( range - ( ( range*wp[j].iWeight)>>(wp[j].uiLog2WeightDenom) ) ); Index: branches/SHM-dev/source/Lib/TLibEncoder/TEncCfg.h =================================================================== --- branches/SHM-dev/source/Lib/TLibEncoder/TEncCfg.h (revision 1315) +++ branches/SHM-dev/source/Lib/TLibEncoder/TEncCfg.h (revision 1316) @@ -177,5 +177,5 @@ Int m_iMaxDeltaQP; // Max. absolute delta QP (1:default) Int m_iMaxCuDQPDepth; // Max. depth for a minimum CuDQP (0:default) - Int m_maxCUChromaQpAdjustmentDepth; + Int m_diffCuChromaQpOffsetDepth; ///< If negative, then do not apply chroma qp offsets. Int m_chromaCbQpOffset; // Chroma Cb QP Offset (0:default) @@ -186,6 +186,6 @@ Bool m_bUseAdaptQpSelect; #endif - Bool m_useExtendedPrecision; - Bool m_useHighPrecisionPredictionWeighting; + Bool m_extendedPrecisionProcessingFlag; + Bool m_highPrecisionOffsetsEnabledFlag; Bool m_bUseAdaptiveQP; Int m_iQPAdaptationRange; @@ -206,15 +206,15 @@ Bool m_bUseCbfFastMode; Bool m_useEarlySkipDetection; - Bool m_useCrossComponentPrediction; + Bool m_crossComponentPredictionEnabledFlag; Bool m_reconBasedCrossCPredictionEstimate; - UInt m_saoOffsetBitShift[MAX_NUM_CHANNEL_TYPE]; + UInt m_log2SaoOffsetScale[MAX_NUM_CHANNEL_TYPE]; Bool m_useTransformSkip; Bool m_useTransformSkipFast; - UInt m_transformSkipLog2MaxSize; - Bool m_useResidualRotation; - Bool m_useSingleSignificanceMapContext; - Bool m_useGolombRiceParameterAdaptation; - Bool m_alignCABACBeforeBypass; - Bool m_useResidualDPCM[NUMBER_OF_RDPCM_SIGNALLING_MODES]; + UInt m_log2MaxTransformSkipBlockSize; + Bool m_transformSkipRotationEnabledFlag; + Bool m_transformSkipContextEnabledFlag; + Bool m_persistentRiceAdaptationEnabledFlag; + Bool m_cabacBypassAlignmentEnabledFlag; + Bool m_rdpcmEnabledFlag[NUMBER_OF_RDPCM_SIGNALLING_MODES]; Int* m_aidQP; UInt m_uiDeltaQpRD; @@ -235,5 +235,5 @@ Bool m_bPCMInputBitDepthFlag; Bool m_bPCMFilterDisableFlag; - Bool m_disableIntraReferenceSmoothing; + Bool m_intraSmoothingDisabledFlag; Bool m_loopFilterAcrossTilesEnabledFlag; Bool m_tileUniformSpacingFlag; @@ -551,6 +551,6 @@ Void setMaxCuDQPDepth ( Int i ) { m_iMaxCuDQPDepth = i; } - Int getMaxCUChromaQpAdjustmentDepth () const { return m_maxCUChromaQpAdjustmentDepth; } - Void setMaxCUChromaQpAdjustmentDepth (Int value) { m_maxCUChromaQpAdjustmentDepth = value; } + Int getDiffCuChromaQpOffsetDepth () const { return m_diffCuChromaQpOffsetDepth; } + Void setDiffCuChromaQpOffsetDepth (Int value) { m_diffCuChromaQpOffsetDepth = value; } Void setChromaCbQpOffset ( Int i ) { m_chromaCbQpOffset = i; } @@ -565,9 +565,9 @@ #endif - Bool getUseExtendedPrecision () const { return m_useExtendedPrecision; } - Void setUseExtendedPrecision (Bool value) { m_useExtendedPrecision = value; } - - Bool getUseHighPrecisionPredictionWeighting() const { return m_useHighPrecisionPredictionWeighting; } - Void setUseHighPrecisionPredictionWeighting(Bool value) { m_useHighPrecisionPredictionWeighting = value; } + Bool getExtendedPrecisionProcessingFlag () const { return m_extendedPrecisionProcessingFlag; } + Void setExtendedPrecisionProcessingFlag (Bool value) { m_extendedPrecisionProcessingFlag = value; } + + Bool getHighPrecisionOffsetsEnabledFlag() const { return m_highPrecisionOffsetsEnabledFlag; } + Void setHighPrecisionOffsetsEnabledFlag(Bool value) { m_highPrecisionOffsetsEnabledFlag = value; } Void setUseAdaptiveQP ( Bool b ) { m_bUseAdaptiveQP = b; } @@ -662,28 +662,28 @@ UInt getPCMLog2MinSize () { return m_uiPCMLog2MinSize; } - Bool getUseCrossComponentPrediction () const { return m_useCrossComponentPrediction; } - Void setUseCrossComponentPrediction (const Bool value) { m_useCrossComponentPrediction = value; } + Bool getCrossComponentPredictionEnabledFlag () const { return m_crossComponentPredictionEnabledFlag; } + Void setCrossComponentPredictionEnabledFlag (const Bool value) { m_crossComponentPredictionEnabledFlag = value; } Bool getUseReconBasedCrossCPredictionEstimate () const { return m_reconBasedCrossCPredictionEstimate; } Void setUseReconBasedCrossCPredictionEstimate (const Bool value) { m_reconBasedCrossCPredictionEstimate = value; } - Void setSaoOffsetBitShift(ChannelType type, UInt uiBitShift) { m_saoOffsetBitShift[type] = uiBitShift; } + Void setLog2SaoOffsetScale(ChannelType type, UInt uiBitShift) { m_log2SaoOffsetScale[type] = uiBitShift; } Bool getUseTransformSkip () { return m_useTransformSkip; } Void setUseTransformSkip ( Bool b ) { m_useTransformSkip = b; } - Bool getUseResidualRotation () const { return m_useResidualRotation; } - Void setUseResidualRotation (const Bool value) { m_useResidualRotation = value; } - Bool getUseSingleSignificanceMapContext () const { return m_useSingleSignificanceMapContext; } - Void setUseSingleSignificanceMapContext (const Bool value) { m_useSingleSignificanceMapContext = value; } - Bool getUseGolombRiceParameterAdaptation () const { return m_useGolombRiceParameterAdaptation; } - Void setUseGolombRiceParameterAdaptation (const Bool value) { m_useGolombRiceParameterAdaptation = value; } - Bool getAlignCABACBeforeBypass () const { return m_alignCABACBeforeBypass; } - Void setAlignCABACBeforeBypass (const Bool value) { m_alignCABACBeforeBypass = value; } - Bool getUseResidualDPCM (const RDPCMSignallingMode signallingMode) const { return m_useResidualDPCM[signallingMode]; } - Void setUseResidualDPCM (const RDPCMSignallingMode signallingMode, const Bool value) { m_useResidualDPCM[signallingMode] = value; } + Bool getTransformSkipRotationEnabledFlag () const { return m_transformSkipRotationEnabledFlag; } + Void setTransformSkipRotationEnabledFlag (const Bool value) { m_transformSkipRotationEnabledFlag = value; } + Bool getTransformSkipContextEnabledFlag () const { return m_transformSkipContextEnabledFlag; } + Void setTransformSkipContextEnabledFlag (const Bool value) { m_transformSkipContextEnabledFlag = value; } + Bool getPersistentRiceAdaptationEnabledFlag () const { return m_persistentRiceAdaptationEnabledFlag; } + Void setPersistentRiceAdaptationEnabledFlag (const Bool value) { m_persistentRiceAdaptationEnabledFlag = value; } + Bool getCabacBypassAlignmentEnabledFlag () const { return m_cabacBypassAlignmentEnabledFlag; } + Void setCabacBypassAlignmentEnabledFlag (const Bool value) { m_cabacBypassAlignmentEnabledFlag = value; } + Bool getRdpcmEnabledFlag (const RDPCMSignallingMode signallingMode) const { return m_rdpcmEnabledFlag[signallingMode]; } + Void setRdpcmEnabledFlag (const RDPCMSignallingMode signallingMode, const Bool value) { m_rdpcmEnabledFlag[signallingMode] = value; } Bool getUseTransformSkipFast () { return m_useTransformSkipFast; } Void setUseTransformSkipFast ( Bool b ) { m_useTransformSkipFast = b; } - UInt getTransformSkipLog2MaxSize () const { return m_transformSkipLog2MaxSize; } - Void setTransformSkipLog2MaxSize ( UInt u ) { m_transformSkipLog2MaxSize = u; } - Void setDisableIntraReferenceSmoothing (Bool bValue) { m_disableIntraReferenceSmoothing=bValue; } - Bool getDisableIntraReferenceSmoothing () const { return m_disableIntraReferenceSmoothing; } + UInt getLog2MaxTransformSkipBlockSize () const { return m_log2MaxTransformSkipBlockSize; } + Void setLog2MaxTransformSkipBlockSize ( UInt u ) { m_log2MaxTransformSkipBlockSize = u; } + Bool getIntraSmoothingDisabledFlag () const { return m_intraSmoothingDisabledFlag; } + Void setIntraSmoothingDisabledFlag (Bool bValue) { m_intraSmoothingDisabledFlag=bValue; } Int* getdQPs () { return m_aidQP; } Index: branches/SHM-dev/source/Lib/TLibEncoder/TEncCu.cpp =================================================================== --- branches/SHM-dev/source/Lib/TLibEncoder/TEncCu.cpp (revision 1315) +++ branches/SHM-dev/source/Lib/TLibEncoder/TEncCu.cpp (revision 1316) @@ -97,7 +97,7 @@ } - m_bEncodeDQP = false; - m_CodeChromaQpAdjFlag = false; - m_ChromaQpAdjIdc = 0; + m_bEncodeDQP = false; + m_stillToCodeChromaQpOffsetFlag = false; + m_cuChromaQpOffsetIdxPlus1 = 0; // initialize partition order. @@ -486,5 +486,5 @@ } - m_ChromaQpAdjIdc = 0; + m_cuChromaQpOffsetIdxPlus1 = 0; if (pcSlice->getUseChromaQpAdj()) { @@ -495,6 +495,6 @@ */ Int lgMinCuSize = sps.getLog2MinCodingBlockSize() + - std::max(0, sps.getLog2DiffMaxMinCodingBlockSize()-Int(pps.getMaxCuChromaQpAdjDepth())); - m_ChromaQpAdjIdc = ((uiLPelX >> lgMinCuSize) + (uiTPelY >> lgMinCuSize)) % (pps.getChromaQpAdjTableSize() + 1); + std::max(0, sps.getLog2DiffMaxMinCodingBlockSize()-Int(pps.getPpsRangeExtension().getDiffCuChromaQpOffsetDepth())); + m_cuChromaQpOffsetIdxPlus1 = ((uiLPelX >> lgMinCuSize) + (uiTPelY >> lgMinCuSize)) % (pps.getPpsRangeExtension().getChromaQpOffsetListLen() + 1); } @@ -1095,5 +1095,5 @@ } - if( uiDepth == pps.getMaxCuChromaQpAdjDepth() && pcSlice->getUseChromaQpAdj()) + if( uiDepth == pps.getPpsRangeExtension().getDiffCuChromaQpOffsetDepth() && pcSlice->getUseChromaQpAdj()) { setCodeChromaQpAdjFlag(true); @@ -1122,5 +1122,5 @@ } - if( uiDepth <= pps.getMaxCuChromaQpAdjDepth() && pcSlice->getUseChromaQpAdj()) + if( uiDepth <= pps.getPpsRangeExtension().getDiffCuChromaQpOffsetDepth() && pcSlice->getUseChromaQpAdj()) { setCodeChromaQpAdjFlag(true); @@ -1357,5 +1357,5 @@ rpcTempCU->setPredModeSubParts( MODE_INTER, 0, uhDepth ); // interprets depth relative to CTU level rpcTempCU->setCUTransquantBypassSubParts( bTransquantBypassFlag, 0, uhDepth ); - rpcTempCU->setChromaQpAdjSubParts( bTransquantBypassFlag ? 0 : m_ChromaQpAdjIdc, 0, uhDepth ); + rpcTempCU->setChromaQpAdjSubParts( bTransquantBypassFlag ? 0 : m_cuChromaQpOffsetIdxPlus1, 0, uhDepth ); rpcTempCU->setPartSizeSubParts( SIZE_2Nx2N, 0, uhDepth ); // interprets depth relative to CTU level rpcTempCU->setMergeFlagSubParts( true, 0, 0, uhDepth ); // interprets depth relative to CTU level @@ -1453,5 +1453,5 @@ rpcTempCU->setPartSizeSubParts ( ePartSize, 0, uhDepth ); rpcTempCU->setPredModeSubParts ( MODE_INTER, 0, uhDepth ); - rpcTempCU->setChromaQpAdjSubParts( rpcTempCU->getCUTransquantBypass(0) ? 0 : m_ChromaQpAdjIdc, 0, uhDepth ); + rpcTempCU->setChromaQpAdjSubParts( rpcTempCU->getCUTransquantBypass(0) ? 0 : m_cuChromaQpOffsetIdxPlus1, 0, uhDepth ); #if SVC_EXTENSION @@ -1508,5 +1508,5 @@ rpcTempCU->setPartSizeSubParts( eSize, 0, uiDepth ); rpcTempCU->setPredModeSubParts( MODE_INTRA, 0, uiDepth ); - rpcTempCU->setChromaQpAdjSubParts( rpcTempCU->getCUTransquantBypass(0) ? 0 : m_ChromaQpAdjIdc, 0, uiDepth ); + rpcTempCU->setChromaQpAdjSubParts( rpcTempCU->getCUTransquantBypass(0) ? 0 : m_cuChromaQpOffsetIdxPlus1, 0, uiDepth ); Pel resiLuma[NUMBER_OF_STORED_RESIDUAL_TYPES][MAX_CU_SIZE * MAX_CU_SIZE]; @@ -1573,5 +1573,5 @@ rpcTempCU->setPredModeSubParts( MODE_INTRA, 0, uiDepth ); rpcTempCU->setTrIdxSubParts ( 0, 0, uiDepth ); - rpcTempCU->setChromaQpAdjSubParts( rpcTempCU->getCUTransquantBypass(0) ? 0 : m_ChromaQpAdjIdc, 0, uiDepth ); + rpcTempCU->setChromaQpAdjSubParts( rpcTempCU->getCUTransquantBypass(0) ? 0 : m_cuChromaQpOffsetIdxPlus1, 0, uiDepth ); m_pcPredSearch->IPCMSearch( rpcTempCU, m_ppcOrigYuv[uiDepth], m_ppcPredYuvTemp[uiDepth], m_ppcResiYuvTemp[uiDepth], m_ppcRecoYuvTemp[uiDepth]); Index: branches/SHM-dev/source/Lib/TLibEncoder/TEncCu.h =================================================================== --- branches/SHM-dev/source/Lib/TLibEncoder/TEncCu.h (revision 1315) +++ branches/SHM-dev/source/Lib/TLibEncoder/TEncCu.h (revision 1316) @@ -81,6 +81,6 @@ // Data : encoder control Bool m_bEncodeDQP; - Bool m_CodeChromaQpAdjFlag; - Int m_ChromaQpAdjIdc; + Bool m_stillToCodeChromaQpOffsetFlag; //indicates whether chroma QP offset flag needs to coded at this particular CU granularity. + Int m_cuChromaQpOffsetIdxPlus1; // if 0, then cu_chroma_qp_offset_flag will be 0, otherwise cu_chroma_qp_offset_flag will be 1. // Access channel @@ -162,6 +162,6 @@ Void setdQPFlag ( Bool b ) { m_bEncodeDQP = b; } - Bool getCodeChromaQpAdjFlag() { return m_CodeChromaQpAdjFlag; } - Void setCodeChromaQpAdjFlag( Bool b ) { m_CodeChromaQpAdjFlag = b; } + Bool getCodeChromaQpAdjFlag() { return m_stillToCodeChromaQpOffsetFlag; } + Void setCodeChromaQpAdjFlag( Bool b ) { m_stillToCodeChromaQpOffsetFlag = b; } #if ADAPTIVE_QP_SELECTION Index: branches/SHM-dev/source/Lib/TLibEncoder/TEncSbac.cpp =================================================================== --- branches/SHM-dev/source/Lib/TLibEncoder/TEncSbac.cpp (revision 1315) +++ branches/SHM-dev/source/Lib/TLibEncoder/TEncSbac.cpp (revision 1316) @@ -839,5 +839,5 @@ TComDataCU *pcCU = rTu.getCU(); - if( isLuma(compID) || !pcCU->getSlice()->getPPS()->getUseCrossComponentPrediction() ) + if( isLuma(compID) || !pcCU->getSlice()->getPPS()->getPpsRangeExtension().getCrossComponentPredictionEnabledFlag() ) { return; @@ -915,12 +915,12 @@ { Int internalIdc = cu->getChromaQpAdj( absPartIdx ); - Int tableSize = cu->getSlice()->getPPS()->getChromaQpAdjTableSize(); + Int chromaQpOffsetListLen = cu->getSlice()->getPPS()->getPpsRangeExtension().getChromaQpOffsetListLen(); /* internal_idc == 0 => flag = 0 * internal_idc > 1 => code idc value (if table size warrents) */ m_pcBinIf->encodeBin( internalIdc > 0, m_ChromaQpAdjFlagSCModel.get( 0, 0, 0 ) ); - if (internalIdc > 0 && tableSize > 1) - { - xWriteUnaryMaxSymbol( internalIdc - 1, &m_ChromaQpAdjIdcSCModel.get( 0, 0, 0 ), 0, tableSize - 1 ); + if (internalIdc > 0 && chromaQpOffsetListLen > 1) + { + xWriteUnaryMaxSymbol( internalIdc - 1, &m_ChromaQpAdjIdcSCModel.get( 0, 0, 0 ), 0, chromaQpOffsetListLen - 1 ); } } @@ -1013,5 +1013,5 @@ } - if (!TUCompRectHasAssociatedTransformSkipFlag(rTu.getRect(component), pcCU->getSlice()->getPPS()->getTransformSkipLog2MaxSize())) + if (!TUCompRectHasAssociatedTransformSkipFlag(rTu.getRect(component), pcCU->getSlice()->getPPS()->getPpsRangeExtension().getLog2MaxTransformSkipBlockSize())) { return; @@ -1252,7 +1252,7 @@ const ChannelType channelType = toChannelType(compID); - const Bool extendedPrecision = sps.getUseExtendedPrecision(); - - const Bool alignCABACBeforeBypass = sps.getAlignCABACBeforeBypass(); + const Bool extendedPrecision = sps.getSpsRangeExtension().getExtendedPrecisionProcessingFlag(); + + const Bool alignCABACBeforeBypass = sps.getSpsRangeExtension().getCabacBypassAlignmentEnabledFlag(); const Int maxLog2TrDynamicRange = sps.getMaxLog2TrDynamicRange(channelType); @@ -1309,5 +1309,5 @@ //-------------------------------------------------------------------------------------------------- - const Bool bUseGolombRiceParameterAdaptation = sps.getUseGolombRiceParameterAdaptation(); + const Bool bUseGolombRiceParameterAdaptation = sps.getSpsRangeExtension().getPersistentRiceAdaptationEnabledFlag(); UInt ¤tGolombRiceStatistic = m_golombRiceAdaptationStatistics[rTu.getGolombRiceStatisticsIndex(compID)]; Index: branches/SHM-dev/source/Lib/TLibEncoder/TEncSearch.cpp =================================================================== --- branches/SHM-dev/source/Lib/TLibEncoder/TEncSearch.cpp (revision 1315) +++ branches/SHM-dev/source/Lib/TLibEncoder/TEncSearch.cpp (revision 1316) @@ -968,5 +968,5 @@ TCoeff* pcCoeff = bRealCoeff ? pcCU->getCoeff(component) : m_ppcQTTempCoeff[component][uiQTLayer]; - if (isChroma(component) && (pcCU->getCbf( rTu.GetAbsPartIdxTU(), COMPONENT_Y, uiTrMode ) != 0) && pcCU->getSlice()->getPPS()->getUseCrossComponentPrediction() ) + if (isChroma(component) && (pcCU->getCbf( rTu.GetAbsPartIdxTU(), COMPONENT_Y, uiTrMode ) != 0) && pcCU->getSlice()->getPPS()->getPpsRangeExtension().getCrossComponentPredictionEnabledFlag() ) { m_pcEntropyCoder->encodeCrossComponentPrediction( rTu, component ); @@ -1173,5 +1173,5 @@ #endif { - const Bool bUseFilteredPredictions=TComPrediction::filteringIntraReferenceSamples(compID, uiChFinalMode, uiWidth, uiHeight, chFmt, sps.getDisableIntraReferenceSmoothing()); + const Bool bUseFilteredPredictions=TComPrediction::filteringIntraReferenceSamples(compID, uiChFinalMode, uiWidth, uiHeight, chFmt, sps.getSpsRangeExtension().getIntraSmoothingDisabledFlag()); initIntraPatternChType( rTu, bAboveAvail, bLeftAvail, compID, bUseFilteredPredictions DEBUG_STRING_PASS_INTO(sDebug) ); @@ -1234,5 +1234,5 @@ } - if (pcCU->getSlice()->getPPS()->getUseCrossComponentPrediction()) + if (pcCU->getSlice()->getPPS()->getPpsRangeExtension().getCrossComponentPredictionEnabledFlag()) { if (bUseCrossCPrediction) @@ -1307,5 +1307,5 @@ Pel* pRecIPred = piRecIPred; - if (pcCU->getSlice()->getPPS()->getUseCrossComponentPrediction()) + if (pcCU->getSlice()->getPPS()->getPpsRangeExtension().getCrossComponentPredictionEnabledFlag()) { if (bUseCrossCPrediction) @@ -1465,5 +1465,5 @@ Bool checkTransformSkip = pcCU->getSlice()->getPPS()->getUseTransformSkip(); Int bestModeId[MAX_NUM_COMPONENT] = { 0, 0, 0}; - checkTransformSkip &= TUCompRectHasAssociatedTransformSkipFlag(rTu.getRect(COMPONENT_Y), pcCU->getSlice()->getPPS()->getTransformSkipLog2MaxSize()); + checkTransformSkip &= TUCompRectHasAssociatedTransformSkipFlag(rTu.getRect(COMPONENT_Y), pcCU->getSlice()->getPPS()->getPpsRangeExtension().getLog2MaxTransformSkipBlockSize()); checkTransformSkip &= (!pcCU->getCUTransquantBypass(0)); @@ -1533,5 +1533,5 @@ } - if (pcCU->getSlice()->getPPS()->getUseCrossComponentPrediction()) + if (pcCU->getSlice()->getPPS()->getPpsRangeExtension().getCrossComponentPredictionEnabledFlag()) { const Int xOffset = rTu.getRect( COMPONENT_Y ).x0; @@ -1600,5 +1600,5 @@ dSingleCost = m_pcRdCost->calcRdCost( uiSingleBits, uiSingleDistLuma ); - if (pcCU->getSlice()->getPPS()->getUseCrossComponentPrediction()) + if (pcCU->getSlice()->getPPS()->getPpsRangeExtension().getCrossComponentPredictionEnabledFlag()) { const Int xOffset = rTu.getRect( COMPONENT_Y ).x0; @@ -1673,5 +1673,5 @@ dRDCost += dSplitCost; - if (pcCU->getSlice()->getPPS()->getUseCrossComponentPrediction()) + if (pcCU->getSlice()->getPPS()->getPpsRangeExtension().getCrossComponentPredictionEnabledFlag()) { const Int xOffset = rTu.getRect( COMPONENT_Y ).x0; @@ -1947,9 +1947,9 @@ Bool checkTransformSkip = pcCU->getSlice()->getPPS()->getUseTransformSkip(); - checkTransformSkip &= TUCompRectHasAssociatedTransformSkipFlag(rTu.getRect(COMPONENT_Cb), pcCU->getSlice()->getPPS()->getTransformSkipLog2MaxSize()); + checkTransformSkip &= TUCompRectHasAssociatedTransformSkipFlag(rTu.getRect(COMPONENT_Cb), pcCU->getSlice()->getPPS()->getPpsRangeExtension().getLog2MaxTransformSkipBlockSize()); if ( m_pcEncCfg->getUseTransformSkipFast() ) { - checkTransformSkip &= TUCompRectHasAssociatedTransformSkipFlag(rTu.getRect(COMPONENT_Y), pcCU->getSlice()->getPPS()->getTransformSkipLog2MaxSize()); + checkTransformSkip &= TUCompRectHasAssociatedTransformSkipFlag(rTu.getRect(COMPONENT_Y), pcCU->getSlice()->getPPS()->getPpsRangeExtension().getLog2MaxTransformSkipBlockSize()); if (checkTransformSkip) @@ -1995,5 +1995,5 @@ const Bool checkCrossComponentPrediction = (pcCU->getIntraDir(CHANNEL_TYPE_CHROMA, subTUAbsPartIdx) == DM_CHROMA_IDX) - && pcCU->getSlice()->getPPS()->getUseCrossComponentPrediction() + && pcCU->getSlice()->getPPS()->getPpsRangeExtension().getCrossComponentPredictionEnabledFlag() && (pcCU->getCbf(subTUAbsPartIdx, COMPONENT_Y, uiTrDepth) != 0); @@ -2323,5 +2323,5 @@ #endif - const Bool bUseFilter=TComPrediction::filteringIntraReferenceSamples(COMPONENT_Y, uiMode, puRect.width, puRect.height, chFmt, sps.getDisableIntraReferenceSmoothing()); + const Bool bUseFilter=TComPrediction::filteringIntraReferenceSamples(COMPONENT_Y, uiMode, puRect.width, puRect.height, chFmt, sps.getSpsRangeExtension().getIntraSmoothingDisabledFlag()); predIntraAng( COMPONENT_Y, uiMode, piOrg, uiStride, piPred, uiStride, tuRecurseWithPU, bAboveAvail, bLeftAvail, bUseFilter, TComPrediction::UseDPCMForFirstPassIntraEstimation(tuRecurseWithPU, uiMode) ); @@ -2435,5 +2435,5 @@ xSetIntraResultLumaQT( pcRecoYuv, tuRecurseWithPU ); - if (pps.getUseCrossComponentPrediction()) + if (pps.getPpsRangeExtension().getCrossComponentPredictionEnabledFlag()) { const Int xOffset = tuRecurseWithPU.getRect( COMPONENT_Y ).x0; @@ -2511,5 +2511,5 @@ xSetIntraResultLumaQT( pcRecoYuv, tuRecurseWithPU ); - if (pps.getUseCrossComponentPrediction()) + if (pps.getPpsRangeExtension().getCrossComponentPredictionEnabledFlag()) { const Int xOffset = tuRecurseWithPU.getRect( COMPONENT_Y ).x0; @@ -4762,5 +4762,5 @@ checkTransformSkip[compID] = pcCU->getSlice()->getPPS()->getUseTransformSkip() && - TUCompRectHasAssociatedTransformSkipFlag(rTu.getRect(compID), pcCU->getSlice()->getPPS()->getTransformSkipLog2MaxSize()) && + TUCompRectHasAssociatedTransformSkipFlag(rTu.getRect(compID), pcCU->getSlice()->getPPS()->getPpsRangeExtension().getLog2MaxTransformSkipBlockSize()) && (!pcCU->isLosslessCoded(0)); @@ -4783,5 +4783,5 @@ #endif const Bool isCrossCPredictionAvailable = isChroma(compID) - && pcCU->getSlice()->getPPS()->getUseCrossComponentPrediction() + && pcCU->getSlice()->getPPS()->getPpsRangeExtension().getCrossComponentPredictionEnabledFlag() && (pcCU->getCbf(subTUAbsPartIdx, COMPONENT_Y, uiTrMode) != 0); Index: branches/SHM-dev/source/Lib/TLibEncoder/TEncSlice.cpp =================================================================== --- branches/SHM-dev/source/Lib/TLibEncoder/TEncSlice.cpp (revision 1315) +++ branches/SHM-dev/source/Lib/TLibEncoder/TEncSlice.cpp (revision 1316) @@ -502,5 +502,5 @@ rpcSlice->setSliceChromaQpDelta( COMPONENT_Cb, 0 ); rpcSlice->setSliceChromaQpDelta( COMPONENT_Cr, 0 ); - rpcSlice->setUseChromaQpAdj( rpcSlice->getPPS()->getChromaQpAdjTableSize() > 0 ); + rpcSlice->setUseChromaQpAdj( rpcSlice->getPPS()->getPpsRangeExtension().getChromaQpOffsetListEnabledFlag() ); rpcSlice->setNumRefIdx(REF_PIC_LIST_0,m_pcCfg->getGOPEntry(iGOPid).m_numRefPicsActive); rpcSlice->setNumRefIdx(REF_PIC_LIST_1,m_pcCfg->getGOPEntry(iGOPid).m_numRefPicsActive); Index: branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.cpp =================================================================== --- branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.cpp (revision 1315) +++ branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.cpp (revision 1316) @@ -121,5 +121,5 @@ if (m_bUseSAO) { - m_cEncSAO.create( getSourceWidth(), getSourceHeight(), m_chromaFormatIDC, m_maxCUWidth, m_maxCUHeight, m_maxTotalCUDepth, m_saoOffsetBitShift[CHANNEL_TYPE_LUMA], m_saoOffsetBitShift[CHANNEL_TYPE_CHROMA] ); + m_cEncSAO.create( getSourceWidth(), getSourceHeight(), m_chromaFormatIDC, m_maxCUWidth, m_maxCUHeight, m_maxTotalCUDepth, m_log2SaoOffsetScale[CHANNEL_TYPE_LUMA], m_log2SaoOffsetScale[CHANNEL_TYPE_CHROMA] ); #if SAO_ENCODE_ALLOW_USE_PREDEBLOCK m_cEncSAO.createEncData(getSaoCtuBoundary()); @@ -949,17 +949,5 @@ } - m_cSPS.setUseExtendedPrecision(m_useExtendedPrecision); - m_cSPS.setUseHighPrecisionPredictionWeighting(m_useHighPrecisionPredictionWeighting); - m_cSPS.setUseSAO( m_bUseSAO ); - m_cSPS.setUseResidualRotation(m_useResidualRotation); - m_cSPS.setUseSingleSignificanceMapContext(m_useSingleSignificanceMapContext); - m_cSPS.setUseGolombRiceParameterAdaptation(m_useGolombRiceParameterAdaptation); - m_cSPS.setAlignCABACBeforeBypass(m_alignCABACBeforeBypass); - - for (UInt signallingModeIndex = 0; signallingModeIndex < NUMBER_OF_RDPCM_SIGNALLING_MODES; signallingModeIndex++) - { - m_cSPS.setUseResidualDPCM(RDPCMSignallingMode(signallingModeIndex), m_useResidualDPCM[signallingModeIndex]); - } m_cSPS.setMaxTLayers( m_maxTempLayer ); @@ -976,5 +964,4 @@ m_cSPS.setPCMFilterDisableFlag ( m_bPCMFilterDisableFlag ); - m_cSPS.setDisableIntraReferenceSmoothing( m_disableIntraReferenceSmoothing ); m_cSPS.setScalingListFlag ( (m_useScalingListId == SCALING_LIST_OFF) ? 0 : 1 ); m_cSPS.setUseStrongIntraSmoothing( m_useStrongIntraSmoothing ); @@ -1032,4 +1019,17 @@ m_cSPS.getVuiParameters()->setHrdParametersPresentFlag( true ); } + + // Set up SPS range extension settings + m_cSPS.getSpsRangeExtension().setTransformSkipRotationEnabledFlag(m_transformSkipRotationEnabledFlag); + m_cSPS.getSpsRangeExtension().setTransformSkipContextEnabledFlag(m_transformSkipContextEnabledFlag); + for (UInt signallingModeIndex = 0; signallingModeIndex < NUMBER_OF_RDPCM_SIGNALLING_MODES; signallingModeIndex++) + { + m_cSPS.getSpsRangeExtension().setRdpcmEnabledFlag(RDPCMSignallingMode(signallingModeIndex), m_rdpcmEnabledFlag[signallingModeIndex]); + } + m_cSPS.getSpsRangeExtension().setExtendedPrecisionProcessingFlag(m_extendedPrecisionProcessingFlag); + m_cSPS.getSpsRangeExtension().setIntraSmoothingDisabledFlag( m_intraSmoothingDisabledFlag ); + m_cSPS.getSpsRangeExtension().setHighPrecisionOffsetsEnabledFlag(m_highPrecisionOffsetsEnabledFlag); + m_cSPS.getSpsRangeExtension().setPersistentRiceAdaptationEnabledFlag(m_persistentRiceAdaptationEnabledFlag); + m_cSPS.getSpsRangeExtension().setCabacBypassAlignmentEnabledFlag(m_cabacBypassAlignmentEnabledFlag); } @@ -1066,15 +1066,19 @@ } - if ( m_maxCUChromaQpAdjustmentDepth >= 0 ) - { - m_cPPS.setMaxCuChromaQpAdjDepth(m_maxCUChromaQpAdjustmentDepth); - m_cPPS.setChromaQpAdjTableAt(1, 6, 6); + if ( m_diffCuChromaQpOffsetDepth >= 0 ) + { + m_cPPS.getPpsRangeExtension().setDiffCuChromaQpOffsetDepth(m_diffCuChromaQpOffsetDepth); + m_cPPS.getPpsRangeExtension().clearChromaQpOffsetList(); + m_cPPS.getPpsRangeExtension().setChromaQpOffsetListEntry(1, 6, 6); /* todo, insert table entries from command line (NB, 0 should not be touched) */ } else { - m_cPPS.setMaxCuChromaQpAdjDepth(0); - m_cPPS.clearChromaQpAdjTable(); - } + m_cPPS.getPpsRangeExtension().setDiffCuChromaQpOffsetDepth(0); + m_cPPS.getPpsRangeExtension().clearChromaQpOffsetList(); + } + m_cPPS.getPpsRangeExtension().setCrossComponentPredictionEnabledFlag(m_crossComponentPredictionEnabledFlag); + m_cPPS.getPpsRangeExtension().setLog2SaoOffsetScale(CHANNEL_TYPE_LUMA, m_log2SaoOffsetScale[CHANNEL_TYPE_LUMA ]); + m_cPPS.getPpsRangeExtension().setLog2SaoOffsetScale(CHANNEL_TYPE_CHROMA, m_log2SaoOffsetScale[CHANNEL_TYPE_CHROMA]); m_cPPS.setQpOffset(COMPONENT_Cb, m_chromaCbQpOffset ); @@ -1085,7 +1089,4 @@ m_cPPS.setUseWP( m_useWeightedPred ); m_cPPS.setWPBiPred( m_useWeightedBiPred ); - m_cPPS.setUseCrossComponentPrediction(m_useCrossComponentPrediction); - m_cPPS.setSaoOffsetBitShift(CHANNEL_TYPE_LUMA, m_saoOffsetBitShift[CHANNEL_TYPE_LUMA ]); - m_cPPS.setSaoOffsetBitShift(CHANNEL_TYPE_CHROMA, m_saoOffsetBitShift[CHANNEL_TYPE_CHROMA]); m_cPPS.setOutputFlagPresentFlag( false ); m_cPPS.setSignHideFlag(getSignHideFlag()); @@ -1145,5 +1146,5 @@ m_cPPS.setTransquantBypassEnableFlag(getTransquantBypassEnableFlag()); m_cPPS.setUseTransformSkip( m_useTransformSkip ); - m_cPPS.setTransformSkipLog2MaxSize( m_transformSkipLog2MaxSize ); + m_cPPS.getPpsRangeExtension().setLog2MaxTransformSkipBlockSize( m_log2MaxTransformSkipBlockSize ); if (m_sliceSegmentMode != NO_SLICES) Index: branches/SHM-dev/source/Lib/TLibEncoder/WeightPredAnalysis.cpp =================================================================== --- branches/SHM-dev/source/Lib/TLibEncoder/WeightPredAnalysis.cpp (revision 1315) +++ branches/SHM-dev/source/Lib/TLibEncoder/WeightPredAnalysis.cpp (revision 1316) @@ -112,5 +112,5 @@ } - const Int fixedBitShift = (slice->getSPS()->getUseHighPrecisionPredictionWeighting())?RExt__PREDICTION_WEIGHTING_ANALYSIS_DC_PRECISION:0; + const Int fixedBitShift = (slice->getSPS()->getSpsRangeExtension().getHighPrecisionOffsetsEnabledFlag())?RExt__PREDICTION_WEIGHTING_ANALYSIS_DC_PRECISION:0; weightACDCParam[compID].iDC = (((iOrgDC<>1)) / iSample); weightACDCParam[compID].iAC = iOrgAC; @@ -204,5 +204,5 @@ { const Int numComp = slice->getPic()->getPicYuvOrg()->getNumberValidComponents(); - const Bool bUseHighPrecisionWeighting = slice->getSPS()->getUseHighPrecisionPredictionWeighting(); + const Bool bUseHighPrecisionWeighting = slice->getSPS()->getSpsRangeExtension().getHighPrecisionOffsetsEnabledFlag(); const Int numPredDir = slice->isInterP() ? 1 : 2; @@ -215,6 +215,7 @@ for ( Int refIdxTemp = 0; refIdxTemp < slice->getNumRefIdx(eRefPicList); refIdxTemp++ ) { - WPACDCParam *currWeightACDCParam = slice->getWpAcDcParam(); - WPACDCParam *refWeightACDCParam = slice->getRefPic(eRefPicList, refIdxTemp)->getSlice(0)->getWpAcDcParam(); + WPACDCParam *currWeightACDCParam, *refWeightACDCParam; + slice->getWpAcDcParam(currWeightACDCParam); + slice->getRefPic(eRefPicList, refIdxTemp)->getSlice(0)->getWpAcDcParam(refWeightACDCParam); #if SVC_EXTENSION @@ -225,5 +226,5 @@ if( validILRPic ) { - refWeightACDCParam = slice->getWpAcDcParam(); + slice->getWpAcDcParam(refWeightACDCParam); } #endif @@ -332,5 +333,5 @@ const Int iDefaultWeight = ((Int)1<isInterP() ? 1 : 2; - const Bool useHighPrecisionPredictionWeighting = slice->getSPS()->getUseHighPrecisionPredictionWeighting(); + const Bool useHighPrecisionPredictionWeighting = slice->getSPS()->getSpsRangeExtension().getHighPrecisionOffsetsEnabledFlag(); assert (iNumPredDir <= Int(NUM_REF_PIC_LIST_01));