Index: trunk/source/Lib/TLibEncoder/TEncCavlc.cpp =================================================================== --- trunk/source/Lib/TLibEncoder/TEncCavlc.cpp (revision 442) +++ trunk/source/Lib/TLibEncoder/TEncCavlc.cpp (revision 494) @@ -359,10 +359,4 @@ { WRITE_FLAG(pcVUI->getTilesFixedStructureFlag(), "tiles_fixed_structure_flag"); -#if M0464_TILE_BOUNDARY_ALIGNED_FLAG - if ( pcSPS->getLayerId() > 0 ) - { - WRITE_FLAG( pcVUI->getTileBoundariesAlignedFlag( ) ? 1 : 0 , "tile_boundaries_aligned_flag" ); - } -#endif WRITE_FLAG(pcVUI->getMotionVectorsOverPicBoundariesFlag(), "motion_vectors_over_pic_boundaries_flag"); WRITE_FLAG(pcVUI->getRestrictedRefPicListsFlag(), "restricted_ref_pic_lists_flag"); @@ -454,5 +448,5 @@ #endif WRITE_CODE( pcSPS->getVPSId (), 4, "sps_video_parameter_set_id" ); -#if SPS_SUB_LAYER_INFO +#if SVC_EXTENSION if(pcSPS->getLayerId() == 0) { @@ -460,5 +454,5 @@ WRITE_CODE( pcSPS->getMaxTLayers() - 1, 3, "sps_max_sub_layers_minus1" ); WRITE_FLAG( pcSPS->getTemporalIdNestingFlag() ? 1 : 0, "sps_temporal_id_nesting_flag" ); -#if SPS_SUB_LAYER_INFO +#if SVC_EXTENSION } #endif @@ -670,5 +664,4 @@ WRITE_FLAG( 0, "inter_view_mv_vert_constraint_flag" ); #endif -#if SCALED_REF_LAYER_OFFSETS if( pcSPS->getLayerId() > 0 ) { @@ -683,5 +676,4 @@ } } -#endif #if M0463_VUI_EXT_ILP_REF //// sps_extension_vui_parameters( ) @@ -708,4 +700,7 @@ Void TEncCavlc::codeVPS( TComVPS* pcVPS ) { +#if VPS_EXTN_OFFSET_CALC + UInt numBytesInVps = this->m_pcBitIf->getNumberOfWrittenBits(); +#endif WRITE_CODE( pcVPS->getVPSId(), 4, "vps_video_parameter_set_id" ); WRITE_CODE( 3, 2, "vps_reserved_three_2bits" ); @@ -811,4 +806,9 @@ WRITE_FLAG(1, "vps_extension_alignment_bit_equal_to_one"); } +#if VPS_EXTN_OFFSET_CALC + Int vpsExntOffsetValueInBits = this->m_pcBitIf->getNumberOfWrittenBits() - numBytesInVps + 16; // 2 bytes for NUH + assert( vpsExntOffsetValueInBits % 8 == 0 ); + pcVPS->setExtensionOffset( vpsExntOffsetValueInBits >> 3 ); +#endif codeVPSExtension(pcVPS); WRITE_FLAG( 0, "vps_extension2_flag" ); // Flag value of 1 reserved @@ -820,4 +820,5 @@ } +#if SVC_EXTENSION #if VPS_EXTNS Void TEncCavlc::codeVPSExtension (TComVPS *vps) @@ -835,9 +836,5 @@ } -#if VPS_SPLIT_FLAG for(j = 0; j < vps->getNumScalabilityTypes() - vps->getSplittingFlag(); j++) -#else - for(j = 0; j < vps->getNumScalabilityTypes(); j++) -#endif { WRITE_CODE( vps->getDimensionIdLen(j) - 1, 3, "dimension_id_len_minus1[j]" ); @@ -863,7 +860,7 @@ WRITE_CODE( vps->getLayerIdInNuh(i), 6, "layer_id_in_nuh[i]" ); } -#if VPS_SPLIT_FLAG - if(!vps->getSplittingFlag()) -#endif + + if( !vps->getSplittingFlag() ) + { for(j = 0; j < vps->getNumScalabilityTypes(); j++) { @@ -871,4 +868,5 @@ WRITE_CODE( vps->getDimensionId(i, j), bits, "dimension_id[i][j]" ); } + } } #endif @@ -885,5 +883,4 @@ } #endif -#if VPS_MOVE_DIR_DEPENDENCY_FLAG #if VPS_EXTN_DIRECT_REF_LAYERS for( Int layerCtr = 1; layerCtr <= vps->getMaxLayers() - 1; layerCtr++) @@ -894,5 +891,4 @@ } } -#endif #endif #if JCTVC_M0203_INTERLAYER_PRED_IDC @@ -903,5 +899,15 @@ for( i = 0; i < vps->getMaxLayers() - 1; i++) { +#if O0225_MAX_TID_FOR_REF_LAYERS + for( j = i+1; j <= vps->getMaxLayers() - 1; j++) + { + if(vps->getDirectDependencyFlag(j, i)) + { + WRITE_CODE(vps->getMaxTidIlRefPicsPlus1(i,j), 3, "max_tid_il_ref_pics_plus1[i][j]" ); + } + } +#else WRITE_CODE(vps->getMaxTidIlRefPicsPlus1(i), 3, "max_tid_il_ref_pics_plus1[i]" ); +#endif } } @@ -909,5 +915,15 @@ for( i = 0; i < vps->getMaxLayers() - 1; i++) { +#if O0225_MAX_TID_FOR_REF_LAYERS + for( j = i+1; j <= vps->getMaxLayers() - 1; j++) + { + if(vps->getDirectDependencyFlag(j, i)) + { + WRITE_CODE(vps->getMaxTidIlRefPicsPlus1(i,j), 3, "max_tid_il_ref_pics_plus1[i][j]" ); + } + } +#else WRITE_CODE(vps->getMaxTidIlRefPicsPlus1(i), 3, "max_tid_il_ref_pics_plus1[i]" ); +#endif } #endif @@ -918,20 +934,12 @@ #if VPS_EXTN_PROFILE_INFO // Profile-tier-level signalling -#if VPS_PROFILE_OUTPUT_LAYERS WRITE_CODE( vps->getNumLayerSets() - 1 , 10, "vps_number_layer_sets_minus1" ); WRITE_CODE( vps->getNumProfileTierLevel() - 1, 6, "vps_num_profile_tier_level_minus1"); for(Int idx = 1; idx <= vps->getNumProfileTierLevel() - 1; idx++) -#else - for(Int idx = 1; idx <= vps->getNumLayerSets() - 1; idx++) -#endif { WRITE_FLAG( vps->getProfilePresentFlag(idx), "vps_profile_present_flag[i]" ); if( !vps->getProfilePresentFlag(idx) ) { -#if VPS_PROFILE_OUTPUT_LAYERS WRITE_CODE( vps->getProfileLayerSetRef(idx) - 1, 6, "profile_ref_minus1[i]" ); -#else - WRITE_UVLC( vps->getProfileLayerSetRef(idx) - 1, "vps_profile_layer_set_ref_minus1[i]" ); -#endif } codePTL( vps->getPTLForExtn(idx), vps->getProfilePresentFlag(idx), vps->getMaxTLayers() - 1 ); @@ -939,5 +947,4 @@ #endif -#if VPS_PROFILE_OUTPUT_LAYERS Int numOutputLayerSets = vps->getNumOutputLayerSets() ; WRITE_FLAG( (numOutputLayerSets > vps->getNumLayerSets()), "more_output_layer_sets_than_default_flag" ); @@ -974,27 +981,4 @@ WRITE_CODE( vps->getProfileLevelTierIdx(i), numBits, "profile_level_tier_idx[i]" ); } -#else -#if VPS_EXTN_OP_LAYER_SETS - // Target output layer signalling - WRITE_UVLC( vps->getNumOutputLayerSets(), "vps_num_output_layer_sets"); - for(i = 0; i < vps->getNumOutputLayerSets(); i++) - { -#if VPS_OUTPUT_LAYER_SET_IDX - assert(vps->getOutputLayerSetIdx(i) > 0); - WRITE_UVLC( vps->getOutputLayerSetIdx(i) - 1, "vps_output_layer_set_idx_minus1[i]"); -#else - WRITE_UVLC( vps->getOutputLayerSetIdx(i), "vps_output_layer_set_idx[i]"); -#endif - Int lsIdx = vps->getOutputLayerSetIdx(i); - for(j = 0; j <= vps->getMaxLayerId(); j++) - { - if(vps->getLayerIdIncludedFlag(lsIdx, j)) - { - WRITE_FLAG( vps->getOutputLayerFlag(lsIdx, j), "vps_output_layer_flag[lsIdx][j]"); - } - } - } -#endif -#endif #if REPN_FORMAT_IN_VPS @@ -1025,19 +1009,20 @@ #if JCTVC_M0458_INTERLAYER_RPS_SIG WRITE_FLAG(vps->getMaxOneActiveRefLayerFlag(), "max_one_active_ref_layer_flag"); +#endif +#if O0062_POC_LSB_NOT_PRESENT_FLAG + for(i = 1; i< vps->getMaxLayers(); i++) + { + if( vps->getNumDirectRefLayers( vps->getLayerIdInNuh(i) ) == 0 ) + { + WRITE_FLAG(vps->getPocLsbNotPresentFlag(i), "poc_lsb_not_present_flag[i]"); + } + } +#endif +#if O0215_PHASE_ALIGNMENT + WRITE_FLAG(vps->getPhaseAlignFlag(), "cross_layer_phase_alignment_flag" ); +#endif +#if N0147_IRAP_ALIGN_FLAG && !IRAP_ALIGN_FLAG_IN_VPS_VUI + WRITE_FLAG(vps->getCrossLayerIrapAlignFlag(), "cross_layer_irap_aligned_flag"); #endif -#if N0147_IRAP_ALIGN_FLAG - WRITE_FLAG(vps->getCrossLayerIrapAlignFlag(), "cross_layer_irap_aligned_flag"); -#endif -#if !VPS_MOVE_DIR_DEPENDENCY_FLAG -#if VPS_EXTN_DIRECT_REF_LAYERS - for( Int layerCtr = 1; layerCtr <= vps->getMaxLayers() - 1; layerCtr++) - { - for( Int refLayerCtr = 0; refLayerCtr < layerCtr; refLayerCtr++) - { - WRITE_FLAG(vps->getDirectDependencyFlag(layerCtr, refLayerCtr), "direct_dependency_flag[i][j]" ); - } - } -#endif -#endif #if VPS_EXTN_DIRECT_REF_LAYERS && M0457_PREDICTION_INDICATIONS WRITE_UVLC( vps->getDirectDepTypeLen()-2, "direct_dep_type_len_minus2"); @@ -1107,4 +1092,7 @@ { Int i,j; +#if IRAP_ALIGN_FLAG_IN_VPS_VUI + WRITE_FLAG(vps->getCrossLayerIrapAlignFlag(), "cross_layer_irap_aligned_flag"); +#endif #if VPS_VUI_BITRATE_PICRATE WRITE_FLAG( vps->getBitRatePresentVpsFlag(), "bit_rate_present_vps_flag" ); @@ -1173,4 +1161,5 @@ } #endif +#endif //SVC_EXTENSION Void TEncCavlc::codeSliceHeader ( TComSlice* pcSlice ) @@ -1218,5 +1207,5 @@ if ( !pcSlice->getDependentSliceSegmentFlag() ) { - +#if SVC_EXTENSION #if POC_RESET_FLAG Int iBits = 0; @@ -1238,5 +1227,4 @@ } #else -#if SH_DISCARDABLE_FLAG if (pcSlice->getPPS()->getNumExtraSliceHeaderBits()>0) { @@ -1249,5 +1237,6 @@ WRITE_FLAG(0, "slice_reserved_undetermined_flag[]"); } -#else +#endif +#else //SVC_EXTENSION for (Int i = 0; i < pcSlice->getPPS()->getNumExtraSliceHeaderBits(); i++) { @@ -1255,6 +1244,5 @@ WRITE_FLAG(0, "slice_reserved_undetermined_flag[]"); } -#endif -#endif +#endif //SVC_EXTENSION WRITE_UVLC( pcSlice->getSliceType(), "slice_type" ); @@ -1265,4 +1253,5 @@ } +#if !AUXILIARY_PICTURES #if REPN_FORMAT_IN_VPS // in the first version chroma_format_idc is equal to one, thus colour_plane_id will not be present @@ -1272,9 +1261,14 @@ assert (pcSlice->getSPS()->getChromaFormatIdc() == 1 ); #endif +#endif // if( separate_colour_plane_flag == 1 ) // colour_plane_id u(2) #if N0065_LAYER_POC_ALIGNMENT +#if O0062_POC_LSB_NOT_PRESENT_FLAG + if( (pcSlice->getLayerId() > 0 && !pcSlice->getVPS()->getPocLsbNotPresentFlag( pcSlice->getVPS()->getLayerIdInVps(pcSlice->getLayerId())) ) || !pcSlice->getIdrPicFlag()) +#else if( pcSlice->getLayerId() > 0 || !pcSlice->getIdrPicFlag() ) +#endif #else if( !pcSlice->getIdrPicFlag() ) @@ -1297,4 +1291,7 @@ #if N0065_LAYER_POC_ALIGNMENT +#if SHM_FIX7 + } +#endif if( !pcSlice->getIdrPicFlag() ) { @@ -1414,5 +1411,5 @@ WRITE_FLAG( pcSlice->getEnableTMVPFlag() ? 1 : 0, "slice_temporal_mvp_enable_flag" ); } -#if N0065_LAYER_POC_ALIGNMENT +#if N0065_LAYER_POC_ALIGNMENT && !SHM_FIX7 } #endif @@ -1421,5 +1418,9 @@ #if JCTVC_M0458_INTERLAYER_RPS_SIG #if ILP_SSH_SIG +#if ILP_SSH_SIG_FIX + if((pcSlice->getSPS()->getLayerId() > 0) && !(pcSlice->getVPS()->getIlpSshSignalingEnabledFlag()) && (pcSlice->getNumILRRefIdx() > 0) ) +#else if((pcSlice->getSPS()->getLayerId() > 0) && pcSlice->getVPS()->getIlpSshSignalingEnabledFlag() && (pcSlice->getNumILRRefIdx() > 0) ) +#endif #else if((pcSlice->getSPS()->getLayerId() > 0) && (pcSlice->getNumILRRefIdx() > 0) ) @@ -1468,6 +1469,13 @@ WRITE_FLAG( pcSlice->getSaoEnabledFlag(), "slice_sao_luma_flag" ); { +#if AUXILIARY_PICTURES + if (pcSlice->getChromaFormatIdc() != CHROMA_400) + { +#endif SAOParam *saoParam = pcSlice->getPic()->getPicSym()->getSaoParam(); WRITE_FLAG( saoParam->bSaoFlag[1], "slice_sao_chroma_flag" ); +#if AUXILIARY_PICTURES + } +#endif } } @@ -1934,4 +1942,10 @@ UInt uiMode = 0; UInt uiTotalSignalledWeightFlags = 0; +#if AUXILIARY_PICTURES + if (pcSlice->getChromaFormatIdc() == CHROMA_400) + { + bChroma = false; + } +#endif if ( (pcSlice->getSliceType()==P_SLICE && pcSlice->getPPS()->getUseWP()) || (pcSlice->getSliceType()==B_SLICE && pcSlice->getPPS()->getWPBiPred()) ) { Index: trunk/source/Lib/TLibEncoder/TEncCfg.h =================================================================== --- trunk/source/Lib/TLibEncoder/TEncCfg.h (revision 442) +++ trunk/source/Lib/TLibEncoder/TEncCfg.h (revision 494) @@ -69,8 +69,4 @@ Int m_numRefIdc; Int m_refIdc[MAX_NUM_REF_PICS+1]; -#if EXTERNAL_USEDBYCURR_N0082 - Int m_UseExtusedByCurrPic; - Int m_ExtusedByCurrPic[MAX_NUM_REF_PICS]; -#endif GOPEntry() : m_POC(-1) @@ -87,14 +83,8 @@ , m_deltaRPS(0) , m_numRefIdc(0) -#if EXTERNAL_USEDBYCURR_N0082 - , m_UseExtusedByCurrPic(0) -#endif { ::memset( m_referencePics, 0, sizeof(m_referencePics) ); ::memset( m_usedByCurrPic, 0, sizeof(m_usedByCurrPic) ); ::memset( m_refIdc, 0, sizeof(m_refIdc) ); -#if EXTERNAL_USEDBYCURR_N0082 - ::memset( m_usedByCurrPic, 0, sizeof(m_ExtusedByCurrPic) ); -#endif } }; @@ -221,4 +211,7 @@ Int m_chromaCbQpOffset; // Chroma Cb QP Offset (0:default) Int m_chromaCrQpOffset; // Chroma Cr Qp Offset (0:default) +#if AUXILIARY_PICTURES + ChromaFormat m_chromaFormatIDC; +#endif #if ADAPTIVE_QP_SELECTION @@ -941,4 +934,8 @@ Int getAdaptiveResolutionChange() { return m_adaptiveResolutionChange; } #endif +#if AUXILIARY_PICTURES + Void setChromaFormatIDC(ChromaFormat x) { m_chromaFormatIDC = x; } + ChromaFormat getChromaFormatIDC() { return m_chromaFormatIDC; } +#endif #endif }; Index: trunk/source/Lib/TLibEncoder/TEncCu.cpp =================================================================== --- trunk/source/Lib/TLibEncoder/TEncCu.cpp (revision 442) +++ trunk/source/Lib/TLibEncoder/TEncCu.cpp (revision 494) @@ -250,4 +250,9 @@ #endif +#if N0383_IL_CONSTRAINED_TILE_SETS_SEI + m_disableILP = xCheckTileSetConstraint(rpcCU); + m_pcPredSearch->setDisableILP(m_disableILP); +#endif + // analysis of CU xCompressCU( m_ppcBestCU[0], m_ppcTempCU[0], 0 ); @@ -261,4 +266,8 @@ } } +#endif + +#if N0383_IL_CONSTRAINED_TILE_SETS_SEI + xVerifyTileSetConstraint(rpcCU); #endif } @@ -731,5 +740,9 @@ } #if (ENCODER_FAST_MODE) +#if N0383_IL_CONSTRAINED_TILE_SETS_SEI + if(pcPic->getLayerId() > 0 && !m_disableILP) +#else if(pcPic->getLayerId() > 0) +#endif { for(Int refLayer = 0; refLayer < pcSlice->getActiveNumILRRefIdx(); refLayer++) @@ -1381,4 +1394,8 @@ Bool bZeroMVILR = rpcTempCU->xCheckZeroMVILRMerge(uhInterDirNeighbours[uiMergeCand], cMvFieldNeighbours[0 + 2*uiMergeCand], cMvFieldNeighbours[1 + 2*uiMergeCand]); if(bZeroMVILR) + { +#endif +#if N0383_IL_CONSTRAINED_TILE_SETS_SEI + if (!(rpcTempCU->isInterLayerReference(uhInterDirNeighbours[uiMergeCand], cMvFieldNeighbours[0 + 2*uiMergeCand], cMvFieldNeighbours[1 + 2*uiMergeCand]) && m_disableILP)) { #endif @@ -1426,8 +1443,11 @@ } } + } +#if N0383_IL_CONSTRAINED_TILE_SETS_SEI + } +#endif #if REF_IDX_ME_ZEROMV - } -#endif - } + } +#endif } @@ -1808,4 +1828,70 @@ } +#if N0383_IL_CONSTRAINED_TILE_SETS_SEI +Bool TEncCu::xCheckTileSetConstraint( TComDataCU*& rpcCU ) +{ + Bool disableILP = false; + + if (rpcCU->getLayerId() == (m_pcEncCfg->getNumLayer() - 1) && m_pcEncCfg->getInterLayerConstrainedTileSetsSEIEnabled() && rpcCU->getPic()->getPicSym()->getTileSetIdxMap(rpcCU->getAddr()) >= 0) + { + if (rpcCU->getPic()->getPicSym()->getTileSetType(rpcCU->getAddr()) == 2) + { + disableILP = true; + } + if (rpcCU->getPic()->getPicSym()->getTileSetType(rpcCU->getAddr()) == 1) + { + Int currCUaddr = rpcCU->getAddr(); + Int frameWitdhInCU = rpcCU->getPic()->getPicSym()->getFrameWidthInCU(); + Int frameHeightInCU = rpcCU->getPic()->getPicSym()->getFrameHeightInCU(); + Bool leftCUExists = (currCUaddr % frameWitdhInCU) > 0; + Bool aboveCUExists = (currCUaddr / frameWitdhInCU) > 0; + Bool rightCUExists = (currCUaddr % frameWitdhInCU) < (frameWitdhInCU - 1); + Bool belowCUExists = (currCUaddr / frameWitdhInCU) < (frameHeightInCU - 1); + Int currTileSetIdx = rpcCU->getPic()->getPicSym()->getTileSetIdxMap(currCUaddr); + // Check if CU is at tile set boundary + if ( (leftCUExists && rpcCU->getPic()->getPicSym()->getTileSetIdxMap(currCUaddr-1) != currTileSetIdx) || + (leftCUExists && aboveCUExists && rpcCU->getPic()->getPicSym()->getTileSetIdxMap(currCUaddr-frameWitdhInCU-1) != currTileSetIdx) || + (aboveCUExists && rpcCU->getPic()->getPicSym()->getTileSetIdxMap(currCUaddr-frameWitdhInCU) != currTileSetIdx) || + (aboveCUExists && rightCUExists && rpcCU->getPic()->getPicSym()->getTileSetIdxMap(currCUaddr-frameWitdhInCU+1) != currTileSetIdx) || + (rightCUExists && rpcCU->getPic()->getPicSym()->getTileSetIdxMap(currCUaddr+1) != currTileSetIdx) || + (rightCUExists && belowCUExists && rpcCU->getPic()->getPicSym()->getTileSetIdxMap(currCUaddr+frameWitdhInCU+1) != currTileSetIdx) || + (belowCUExists && rpcCU->getPic()->getPicSym()->getTileSetIdxMap(currCUaddr+frameWitdhInCU) != currTileSetIdx) || + (belowCUExists && leftCUExists && rpcCU->getPic()->getPicSym()->getTileSetIdxMap(currCUaddr+frameWitdhInCU-1) != currTileSetIdx) ) + { + disableILP = true; // Disable ILP in tile set boundary CU + } + } + } + + return disableILP; +} + +Void TEncCu::xVerifyTileSetConstraint( TComDataCU*& rpcCU ) +{ + if (rpcCU->getLayerId() == (m_pcEncCfg->getNumLayer() - 1) && m_pcEncCfg->getInterLayerConstrainedTileSetsSEIEnabled() && rpcCU->getPic()->getPicSym()->getTileSetIdxMap(rpcCU->getAddr()) >= 0 && + m_disableILP) + { + UInt numPartitions = rpcCU->getPic()->getNumPartInCU(); + for (UInt i = 0; i < numPartitions; i++) + { + if (!rpcCU->isIntra(i)) + { + for (UInt refList = 0; refList < 2; refList++) + { + if (rpcCU->getInterDir(i) & (1<getCUMvField(RefPicList(refList)); + if (mvField->getRefIdx(i) >= 0) + { + assert(!(rpcCU->getSlice()->getRefPic(RefPicList(refList), mvField->getRefIdx(i))->isILR(rpcCU->getLayerId()))); + } + } + } + } + } + } +} +#endif + /** Collect ARL statistics from one LCU * \param pcCU Index: trunk/source/Lib/TLibEncoder/TEncCu.h =================================================================== --- trunk/source/Lib/TLibEncoder/TEncCu.h (revision 442) +++ trunk/source/Lib/TLibEncoder/TEncCu.h (revision 494) @@ -108,4 +108,7 @@ Int m_temporalSAD; #endif +#if N0383_IL_CONSTRAINED_TILE_SETS_SEI + Bool m_disableILP; +#endif public: /// copy parameters from encoder class @@ -171,4 +174,9 @@ #endif +#if N0383_IL_CONSTRAINED_TILE_SETS_SEI + Bool xCheckTileSetConstraint( TComDataCU*& rpcCU ); + Void xVerifyTileSetConstraint( TComDataCU*& rpcCU ); +#endif + #if AMP_ENC_SPEEDUP #if AMP_MRG Index: trunk/source/Lib/TLibEncoder/TEncEntropy.cpp =================================================================== --- trunk/source/Lib/TLibEncoder/TEncEntropy.cpp (revision 442) +++ trunk/source/Lib/TLibEncoder/TEncEntropy.cpp (revision 494) @@ -280,4 +280,8 @@ const UInt uiTrDepthCurr = uiDepth - pcCU->getDepth( uiAbsPartIdx ); const Bool bFirstCbfOfCU = uiTrDepthCurr == 0; +#if AUXILIARY_PICTURES + if (pcCU->getSlice()->getChromaFormatIdc() != CHROMA_400) + { +#endif if( bFirstCbfOfCU || uiLog2TrafoSize > 2 ) { @@ -296,4 +300,12 @@ assert( pcCU->getCbf( uiAbsPartIdx, TEXT_CHROMA_V, uiTrDepthCurr ) == pcCU->getCbf( uiAbsPartIdx, TEXT_CHROMA_V, uiTrDepthCurr - 1 ) ); } +#if AUXILIARY_PICTURES + } + else + { + assert( pcCU->getCbf( uiAbsPartIdx, TEXT_CHROMA_U, uiTrDepthCurr ) == 0 ); + assert( pcCU->getCbf( uiAbsPartIdx, TEXT_CHROMA_V, uiTrDepthCurr ) == 0 ); + } +#endif if( uiSubdiv ) @@ -402,4 +414,10 @@ Void TEncEntropy::encodeIntraDirModeChroma( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD ) { +#if AUXILIARY_PICTURES + if ( pcCU->getSlice()->getChromaFormatIdc() == CHROMA_400 ) + { + return; + } +#endif if( bRD ) { Index: trunk/source/Lib/TLibEncoder/TEncGOP.cpp =================================================================== --- trunk/source/Lib/TLibEncoder/TEncGOP.cpp (revision 442) +++ trunk/source/Lib/TLibEncoder/TEncGOP.cpp (revision 494) @@ -753,10 +753,9 @@ pcSlice->setNalUnitType(getNalUnitType(pocCurr, m_iLastIDR)); #if SVC_EXTENSION -#if ILR_RESTR && ILR_RESTR_FIX + if (m_layerId > 0) + { Int interLayerPredLayerIdcTmp[MAX_VPS_LAYER_ID_PLUS1]; Int activeNumILRRefIdxTmp = 0; -#endif - if (m_layerId > 0) - { + for( Int i = 0; i < pcSlice->getActiveNumILRRefIdx(); i++ ) { @@ -769,7 +768,10 @@ pcSlice->setBaseColPic( *cListPic, refLayerIdc ); -#if ILR_RESTR && ILR_RESTR_FIX // Apply temporal layer restriction to inter-layer prediction +#if O0225_MAX_TID_FOR_REF_LAYERS + Int maxTidIlRefPicsPlus1 = m_pcEncTop->getVPS()->getMaxTidIlRefPicsPlus1(pcSlice->getBaseColPic(refLayerIdc)->getSlice(0)->getLayerId(),m_layerId); +#else Int maxTidIlRefPicsPlus1 = m_pcEncTop->getVPS()->getMaxTidIlRefPicsPlus1(pcSlice->getBaseColPic(refLayerIdc)->getSlice(0)->getLayerId()); +#endif if( ((Int)(pcSlice->getBaseColPic(refLayerIdc)->getSlice(0)->getTLayer())<=maxTidIlRefPicsPlus1-1) || (maxTidIlRefPicsPlus1==0 && pcSlice->getBaseColPic(refLayerIdc)->getSlice(0)->getRapPicFlag()) ) { @@ -780,7 +782,5 @@ continue; // ILP is not valid due to temporal layer restriction } -#endif - -#if SCALED_REF_LAYER_OFFSETS + const Window &scalEL = m_pcEncTop->getScaledRefLayerWindow(refLayerIdc); @@ -790,14 +790,5 @@ Int widthEL = pcPic->getPicYuvRec()->getWidth() - scalEL.getWindowLeftOffset() - scalEL.getWindowRightOffset(); Int heightEL = pcPic->getPicYuvRec()->getHeight() - scalEL.getWindowTopOffset() - scalEL.getWindowBottomOffset(); -#else - const Window &confBL = pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec()->getConformanceWindow(); - const Window &confEL = pcPic->getPicYuvRec()->getConformanceWindow(); - - Int widthBL = pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec()->getWidth () - confBL.getWindowLeftOffset() - confBL.getWindowRightOffset(); - Int heightBL = pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec()->getHeight() - confBL.getWindowTopOffset() - confBL.getWindowBottomOffset(); - - Int widthEL = pcPic->getPicYuvRec()->getWidth() - confEL.getWindowLeftOffset() - confEL.getWindowRightOffset(); - Int heightEL = pcPic->getPicYuvRec()->getHeight() - confEL.getWindowTopOffset() - confEL.getWindowBottomOffset(); -#endif + g_mvScalingFactor[refLayerIdc][0] = widthEL == widthBL ? 4096 : Clip3(-4096, 4095, ((widthEL << 8) + (widthBL >> 1)) / widthBL); g_mvScalingFactor[refLayerIdc][1] = heightEL == heightBL ? 4096 : Clip3(-4096, 4095, ((heightEL << 8) + (heightBL >> 1)) / heightBL); @@ -809,8 +800,16 @@ if( pcPic->isSpatialEnhLayer(refLayerIdc)) { -#if SCALED_REF_LAYER_OFFSETS +#if O0215_PHASE_ALIGNMENT +#if O0194_JOINT_US_BITSHIFT + m_pcPredSearch->upsampleBasePic( pcSlice, refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec(), pcPic->getPicYuvRec(), pcSlice->getSPS()->getScaledRefLayerWindow(refLayerIdc), pcSlice->getVPS()->getPhaseAlignFlag() ); +#else + m_pcPredSearch->upsampleBasePic( refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec(), pcPic->getPicYuvRec(), pcSlice->getSPS()->getScaledRefLayerWindow(refLayerIdc), pcSlice->getVPS()->getPhaseAlignFlag() ); +#endif +#else +#if O0194_JOINT_US_BITSHIFT + m_pcPredSearch->upsampleBasePic( pcSlice, refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec(), pcPic->getPicYuvRec(), pcSlice->getSPS()->getScaledRefLayerWindow(refLayerIdc) ); +#else m_pcPredSearch->upsampleBasePic( refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec(), pcPic->getPicYuvRec(), pcSlice->getSPS()->getScaledRefLayerWindow(refLayerIdc) ); -#else - m_pcPredSearch->upsampleBasePic( refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec(), pcPic->getPicYuvRec() ); +#endif #endif } @@ -823,5 +822,4 @@ } -#if ILR_RESTR && ILR_RESTR_FIX // Update the list of active inter-layer pictures for ( Int i = 0; i < activeNumILRRefIdxTmp; i++) @@ -835,5 +833,4 @@ pcSlice->setInterLayerPredEnabledFlag(false); } -#endif if( pocCurr % m_pcCfg->getIntraPeriod() == 0 ) @@ -1167,5 +1164,5 @@ if( m_layerId > 0 && pcSlice->getActiveNumILRRefIdx() ) { - m_pcEncTop->setILRPic(pcPic); + pcSlice->setILRPic( m_pcEncTop->getIlpList() ); #if REF_IDX_MFM #if M0457_COL_PICTURE_SIGNALING @@ -1201,7 +1198,12 @@ UInt ColFromL0Flag = pcSlice->getColFromL0Flag(); UInt ColRefIdx = pcSlice->getColRefIdx(); + for(Int colIdx = 0; colIdx < pcSlice->getNumRefIdx( RefPicList(1 - ColFromL0Flag) ); colIdx++) { - if( pcSlice->getRefPic( RefPicList(1 - ColFromL0Flag), colIdx)->isILR(m_layerId) ) + if( pcSlice->getRefPic( RefPicList(1 - ColFromL0Flag), colIdx)->isILR(m_layerId) +#if MFM_ENCCONSTRAINT + && pcSlice->getBaseColPic( *m_ppcTEncTop[pcSlice->getRefPic( RefPicList(1 - ColFromL0Flag), colIdx)->getLayerId()]->getListPic() )->checkSameRefInfo() == true +#endif + ) { ColRefIdx = colIdx; @@ -1216,5 +1218,9 @@ for(Int colIdx = 0; colIdx < pcSlice->getNumRefIdx( RefPicList(1 - ColFromL0Flag) ); colIdx++) { - if( pcSlice->getRefPic( RefPicList(1 - ColFromL0Flag), colIdx)->isILR(m_layerId) ) + if( pcSlice->getRefPic( RefPicList(1 - ColFromL0Flag), colIdx)->isILR(m_layerId) +#if MFM_ENCCONSTRAINT + && pcSlice->getBaseColPic( *m_ppcTEncTop[pcSlice->getRefPic( RefPicList(1 - ColFromL0Flag), colIdx)->getLayerId()]->getListPic() )->checkSameRefInfo() == true +#endif + ) { ColRefIdx = colIdx; @@ -1567,4 +1573,8 @@ { pcPic->getPicYuvOrg()->copyToPic( pcPic->getPicYuvRec() ); +#if O0194_WEIGHTED_PREDICTION_CGS + // Calculate for the base layer to be used in EL as Inter layer reference + m_pcSliceEncoder->estimateILWpParam( pcSlice ); +#endif #if AVC_SYNTAX pcPic->readBLSyntax( m_ppcTEncTop[0]->getBLSyntaxFile(), SYNTAX_BYTES ); @@ -1607,4 +1617,8 @@ pcSlice->setSliceSegmentCurStartCUAddr ( startCUAddrSlice ); pcSlice->setSliceBits(0); +#if SVC_EXTENSION + // copy reference list modification info from the first slice, assuming that this information is the same across all slices in the picture + memcpy( pcSlice->getRefPicListModification(), pcPic->getSlice(0)->getRefPicListModification(), sizeof(TComRefPicListModification) ); +#endif uiNumSlices ++; } @@ -1689,4 +1703,9 @@ #else OutputNALUnit nalu(NAL_UNIT_VPS); +#endif +#if VPS_EXTN_OFFSET_CALC + OutputNALUnit tempNalu(NAL_UNIT_VPS, 0, 0 ); // The value of nuh_layer_id of VPS NAL unit shall be equal to 0. + m_pcEntropyCoder->setBitstream(&tempNalu.m_Bitstream); + m_pcEntropyCoder->encodeVPS(m_pcEncTop->getVPS()); // Use to calculate the VPS extension offset #endif m_pcEntropyCoder->setBitstream(&nalu.m_Bitstream); @@ -3162,8 +3181,16 @@ TComPicYuv* pcOrgInterlaced = new TComPicYuv; +#if AUXILIARY_PICTURES + pcOrgInterlaced->create( iWidth, iHeight << 1, pcPicOrgTop->getChromaFormat(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth ); +#else pcOrgInterlaced->create( iWidth, iHeight << 1, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth ); +#endif TComPicYuv* pcRecInterlaced = new TComPicYuv; +#if AUXILIARY_PICTURES + pcRecInterlaced->create( iWidth, iHeight << 1, pcPicOrgTop->getChromaFormat(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth ); +#else pcRecInterlaced->create( iWidth, iHeight << 1, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth ); +#endif Pel* pOrgInterlaced = pcOrgInterlaced->getLumaAddr(); Index: trunk/source/Lib/TLibEncoder/TEncPic.cpp =================================================================== --- trunk/source/Lib/TLibEncoder/TEncPic.cpp (revision 442) +++ trunk/source/Lib/TLibEncoder/TEncPic.cpp (revision 494) @@ -126,4 +126,32 @@ * \return Void */ +#if AUXILIARY_PICTURES +#if SVC_UPSAMPLING +Void TEncPic::create( Int iWidth, Int iHeight, ChromaFormat chromaFormat, UInt uiMaxWidth, UInt uiMaxHeight, UInt uiMaxDepth, UInt uiMaxAQDepth, + Window &conformanceWindow, Window &defaultDisplayWindow, Int *numReorderPics, TComSPS* pcSps, Bool bIsVirtual ) + +#else + +Void TEncPic::create( Int iWidth, Int iHeight, ChromaFormat chromaFormat, UInt uiMaxWidth, UInt uiMaxHeight, UInt uiMaxDepth, UInt uiMaxAQDepth, + Window &conformanceWindow, Window &defaultDisplayWindow, Int *numReorderPics, Bool bIsVirtual ) +#endif +{ +#if SVC_UPSAMPLING + TComPic::create( iWidth, iHeight, chromaFormat, uiMaxWidth, uiMaxHeight, uiMaxDepth, + conformanceWindow, defaultDisplayWindow, numReorderPics, pcSps, bIsVirtual ); +#else + TComPic::create( iWidth, iHeight, chromaFormat, uiMaxWidth, uiMaxHeight, uiMaxDepth, conformanceWindow, defaultDisplayWindow, numReorderPics, bIsVirtual ); +#endif + m_uiMaxAQDepth = uiMaxAQDepth; + if ( uiMaxAQDepth > 0 ) + { + m_acAQLayer = new TEncPicQPAdaptationLayer[ m_uiMaxAQDepth ]; + for (UInt d = 0; d < m_uiMaxAQDepth; d++) + { + m_acAQLayer[d].create( iWidth, iHeight, uiMaxWidth>>d, uiMaxHeight>>d ); + } + } +} +#else #if SVC_UPSAMPLING Void TEncPic::create( Int iWidth, Int iHeight, UInt uiMaxWidth, UInt uiMaxHeight, UInt uiMaxDepth, UInt uiMaxAQDepth, @@ -152,4 +180,5 @@ } } +#endif /** Clean up Index: trunk/source/Lib/TLibEncoder/TEncPic.h =================================================================== --- trunk/source/Lib/TLibEncoder/TEncPic.h (revision 442) +++ trunk/source/Lib/TLibEncoder/TEncPic.h (revision 494) @@ -105,4 +105,14 @@ virtual ~TEncPic(); +#if AUXILIARY_PICTURES +#if SVC_UPSAMPLING + Void create( Int iWidth, Int iHeight, ChromaFormat chromaFormat, UInt uiMaxWidth, UInt uiMaxHeight, UInt uiMaxDepth, UInt uiMaxAQDepth, + Window &conformanceWindow, Window &defaultDisplayWindow, Int *numReorderPics, TComSPS* pcSps, Bool bIsVirtual=false ); +#else + Void create( Int iWidth, Int iHeight, ChromaFormat chromaFormat, UInt uiMaxWidth, UInt uiMaxHeight, UInt uiMaxDepth, UInt uiMaxAQDepth, + Window &conformanceWindow, Window &defaultDisplayWindow, Int *numReorderPics, Bool bIsVirtual = false ); + +#endif +#else #if SVC_UPSAMPLING Void create( Int iWidth, Int iHeight, UInt uiMaxWidth, UInt uiMaxHeight, UInt uiMaxDepth, UInt uiMaxAQDepth, @@ -111,4 +121,5 @@ Void create( Int iWidth, Int iHeight, UInt uiMaxWidth, UInt uiMaxHeight, UInt uiMaxDepth, UInt uiMaxAQDepth, Window &conformanceWindow, Window &defaultDisplayWindow, Int *numReorderPics, Bool bIsVirtual = false ); +#endif #endif virtual Void destroy(); Index: trunk/source/Lib/TLibEncoder/TEncSampleAdaptiveOffset.cpp =================================================================== --- trunk/source/Lib/TLibEncoder/TEncSampleAdaptiveOffset.cpp (revision 442) +++ trunk/source/Lib/TLibEncoder/TEncSampleAdaptiveOffset.cpp (revision 494) @@ -1871,5 +1871,9 @@ saoParam->bSaoFlag[0] = true; +#if AUXILIARY_PICTURES + saoParam->bSaoFlag[1] = m_pcPic->getChromaFormat() == CHROMA_400 ? false : true; +#else saoParam->bSaoFlag[1] = true; +#endif saoParam->oneUnitFlag[0] = false; saoParam->oneUnitFlag[1] = false; Index: trunk/source/Lib/TLibEncoder/TEncSbac.cpp =================================================================== --- trunk/source/Lib/TLibEncoder/TEncSbac.cpp (revision 442) +++ trunk/source/Lib/TLibEncoder/TEncSbac.cpp (revision 494) @@ -914,4 +914,8 @@ } +#if AUXILIARY_PICTURES + if (pcCU->getSlice()->getChromaFormatIdc() != CHROMA_400) + { +#endif piPCMSample = pcCU->getPCMSampleCb() + uiChromaOffset; uiWidth = pcCU->getWidth(uiAbsPartIdx)/2; @@ -945,4 +949,7 @@ piPCMSample += uiWidth; } +#if AUXILIARY_PICTURES + } +#endif m_pcBinIf->resetBac(); } Index: trunk/source/Lib/TLibEncoder/TEncSearch.cpp =================================================================== --- trunk/source/Lib/TLibEncoder/TEncSearch.cpp (revision 442) +++ trunk/source/Lib/TLibEncoder/TEncSearch.cpp (revision 494) @@ -3092,4 +3092,8 @@ { #endif +#if N0383_IL_CONSTRAINED_TILE_SETS_SEI + if (!(pcCU->isInterLayerReference(uhInterDirNeighbours[uiMergeCand], cMvFieldNeighbours[0 + 2*uiMergeCand], cMvFieldNeighbours[1 + 2*uiMergeCand]) && m_disableILP)) + { +#endif UInt uiCostCand = MAX_UINT; UInt uiBitsCand = 0; @@ -3115,4 +3119,7 @@ uiMergeIndex = uiMergeCand; } +#if N0383_IL_CONSTRAINED_TILE_SETS_SEI + } +#endif #if REF_IDX_ME_ZEROMV } @@ -3221,38 +3228,4 @@ Int numValidMergeCand = 0 ; -#if N0383_IL_CONSTRAINED_TILE_SETS_SEI - Bool disableILP = false; - if (pcCU->getPic()->getLayerId() == (m_pcEncCfg->getNumLayer() - 1) && m_pcEncCfg->getInterLayerConstrainedTileSetsSEIEnabled() && pcCU->getPic()->getPicSym()->getTileSetIdxMap(pcCU->getAddr()) >= 0) - { - if (pcCU->getPic()->getPicSym()->getTileSetType(pcCU->getAddr()) == 2) - { - disableILP = true; - } - if (pcCU->getPic()->getPicSym()->getTileSetType(pcCU->getAddr()) == 1) - { - Int currCUaddr = pcCU->getAddr(); - Int frameWitdhInCU = pcCU->getPic()->getPicSym()->getFrameWidthInCU(); - Int frameHeightInCU = pcCU->getPic()->getPicSym()->getFrameHeightInCU(); - Bool leftCUExists = (currCUaddr % frameWitdhInCU) > 0; - Bool aboveCUExists = (currCUaddr / frameWitdhInCU) > 0; - Bool rightCUExists = (currCUaddr % frameWitdhInCU) < (frameWitdhInCU - 1); - Bool belowCUExists = (currCUaddr / frameWitdhInCU) < (frameHeightInCU - 1); - Int currTileSetIdx = pcCU->getPic()->getPicSym()->getTileIdxMap(currCUaddr); - // Check if CU is at tile set boundary - if ( (leftCUExists && pcCU->getPic()->getPicSym()->getTileIdxMap(currCUaddr-1) != currTileSetIdx) || - (leftCUExists && aboveCUExists && pcCU->getPic()->getPicSym()->getTileIdxMap(currCUaddr-frameWitdhInCU-1) != currTileSetIdx) || - (aboveCUExists && pcCU->getPic()->getPicSym()->getTileIdxMap(currCUaddr-frameWitdhInCU) != currTileSetIdx) || - (aboveCUExists && rightCUExists && pcCU->getPic()->getPicSym()->getTileIdxMap(currCUaddr-frameWitdhInCU+1) != currTileSetIdx) || - (rightCUExists && pcCU->getPic()->getPicSym()->getTileIdxMap(currCUaddr+1) != currTileSetIdx) || - (rightCUExists && belowCUExists && pcCU->getPic()->getPicSym()->getTileIdxMap(currCUaddr+frameWitdhInCU+1) != currTileSetIdx) || - (belowCUExists && pcCU->getPic()->getPicSym()->getTileIdxMap(currCUaddr+frameWitdhInCU) != currTileSetIdx) || - (belowCUExists && leftCUExists && pcCU->getPic()->getPicSym()->getTileIdxMap(currCUaddr+frameWitdhInCU-1) != currTileSetIdx) ) - { - disableILP = true; // Disable ILP in tile set boundary CU - } - } - } -#endif - for ( Int iPartIdx = 0; iPartIdx < iNumPart; iPartIdx++ ) { @@ -3305,5 +3278,5 @@ { #if N0383_IL_CONSTRAINED_TILE_SETS_SEI - if (pcCU->getSlice()->getRefPic( eRefPicList, iRefIdxTemp )->isILR(pcCU->getLayerId()) && disableILP) + if (pcCU->getSlice()->getRefPic( eRefPicList, iRefIdxTemp )->isILR(pcCU->getLayerId()) && m_disableILP) { continue; @@ -3529,5 +3502,5 @@ } #if N0383_IL_CONSTRAINED_TILE_SETS_SEI - if (pcPic->isILR(pcCU->getLayerId()) && disableILP) + if (pcPic->isILR(pcCU->getLayerId()) && m_disableILP) { testIter = false; @@ -3550,5 +3523,5 @@ } #if N0383_IL_CONSTRAINED_TILE_SETS_SEI - if (pcPic->isILR(pcCU->getLayerId()) && disableILP) + if (pcPic->isILR(pcCU->getLayerId()) && m_disableILP) { testRefIdx = false; @@ -4119,5 +4092,10 @@ // prediction pattern +#if O0194_WEIGHTED_PREDICTION_CGS + // Bug Fix (It did not check WP for BSlices) + if ( pcCU->getSlice()->getPPS()->getUseWP()) +#else if ( pcCU->getSlice()->getPPS()->getUseWP() && pcCU->getSlice()->getSliceType()==P_SLICE ) +#endif { xPredInterLumaBlk( pcCU, pcPicYuvRef, uiPartAddr, &cMvCand, iSizeX, iSizeY, pcTemplateCand, true ); @@ -4128,5 +4106,10 @@ } +#if O0194_WEIGHTED_PREDICTION_CGS + if ( pcCU->getSlice()->getPPS()->getUseWP()) + ///< Bug Fix (It did not check WP for BSlices) +#else if ( pcCU->getSlice()->getPPS()->getUseWP() && pcCU->getSlice()->getSliceType()==P_SLICE ) +#endif { xWeightedPredictionUni( pcCU, pcTemplateCand, uiPartAddr, iSizeX, iSizeY, eRefPicList, pcTemplateCand, iRefIdx ); Index: trunk/source/Lib/TLibEncoder/TEncSearch.h =================================================================== --- trunk/source/Lib/TLibEncoder/TEncSearch.h (revision 442) +++ trunk/source/Lib/TLibEncoder/TEncSearch.h (revision 494) @@ -129,5 +129,9 @@ // UInt m_auiMVPIdxCost[AMVP_MAX_NUM_CANDS+1][AMVP_MAX_NUM_CANDS]; UInt m_auiMVPIdxCost[AMVP_MAX_NUM_CANDS+1][AMVP_MAX_NUM_CANDS+1]; //th array bounds - + +#if N0383_IL_CONSTRAINED_TILE_SETS_SEI + Bool m_disableILP; +#endif + public: TEncSearch(); @@ -220,4 +224,9 @@ Void xEncPCM (TComDataCU* pcCU, UInt uiAbsPartIdx, Pel* piOrg, Pel* piPCM, Pel* piPred, Pel* piResi, Pel* piReco, UInt uiStride, UInt uiWidth, UInt uiHeight, TextType eText); Void IPCMSearch (TComDataCU* pcCU, TComYuv* pcOrgYuv, TComYuv*& rpcPredYuv, TComYuv*& rpcResiYuv, TComYuv*& rpcRecoYuv ); + +#if N0383_IL_CONSTRAINED_TILE_SETS_SEI + Void setDisableILP(Bool a) {m_disableILP = a;} +#endif + protected: Index: trunk/source/Lib/TLibEncoder/TEncSlice.cpp =================================================================== --- trunk/source/Lib/TLibEncoder/TEncSlice.cpp (revision 442) +++ trunk/source/Lib/TLibEncoder/TEncSlice.cpp (revision 494) @@ -2,5 +2,5 @@ * License, included below. This software may be subject to other third party * and contributor rights, including patent rights, and no such rights are - * granted under this license. + * granted under this license. * * Copyright (c) 2010-2013, ITU/ISO/IEC @@ -51,5 +51,5 @@ m_apcPicYuvPred = NULL; m_apcPicYuvResi = NULL; - + m_pdRdPicLambda = NULL; m_pdRdPicQp = NULL; @@ -69,14 +69,32 @@ } -Void TEncSlice::initCtxMem( UInt i ) -{ +Void TEncSlice::initCtxMem( UInt i ) +{ for (std::vector::iterator j = CTXMem.begin(); j != CTXMem.end(); j++) { delete (*j); } - CTXMem.clear(); - CTXMem.resize(i); + CTXMem.clear(); + CTXMem.resize(i); } +#if AUXILIARY_PICTURES +Void TEncSlice::create( Int iWidth, Int iHeight, ChromaFormat chromaFormat, UInt iMaxCUWidth, UInt iMaxCUHeight, UChar uhTotalDepth ) +{ + // create prediction picture + if ( m_apcPicYuvPred == NULL ) + { + m_apcPicYuvPred = new TComPicYuv; + m_apcPicYuvPred->create( iWidth, iHeight, chromaFormat, iMaxCUWidth, iMaxCUHeight, uhTotalDepth ); + } + + // create residual picture + if( m_apcPicYuvResi == NULL ) + { + m_apcPicYuvResi = new TComPicYuv; + m_apcPicYuvResi->create( iWidth, iHeight, chromaFormat, iMaxCUWidth, iMaxCUHeight, uhTotalDepth ); + } +} +#else Void TEncSlice::create( Int iWidth, Int iHeight, UInt iMaxCUWidth, UInt iMaxCUHeight, UChar uhTotalDepth ) { @@ -87,5 +105,5 @@ m_apcPicYuvPred->create( iWidth, iHeight, iMaxCUWidth, iMaxCUHeight, uhTotalDepth ); } - + // create residual picture if( m_apcPicYuvResi == NULL ) @@ -95,4 +113,5 @@ } } +#endif Void TEncSlice::destroy() @@ -105,5 +124,5 @@ m_apcPicYuvPred = NULL; } - + // destroy residual picture if ( m_apcPicYuvResi ) @@ -113,5 +132,5 @@ m_apcPicYuvResi = NULL; } - + // free lambda and QP arrays if ( m_pdRdPicLambda ) { xFree( m_pdRdPicLambda ); m_pdRdPicLambda = NULL; } @@ -139,9 +158,9 @@ #if SVC_EXTENSION m_ppcTEncTop = pcEncTop->getLayerEnc(); -#endif +#endif m_pcGOPEncoder = pcEncTop->getGOPEncoder(); m_pcCuEncoder = pcEncTop->getCuEncoder(); m_pcPredSearch = pcEncTop->getPredSearch(); - + m_pcEntropyCoder = pcEncTop->getEntropyCoder(); m_pcCavlcCoder = pcEncTop->getCavlcCoder(); @@ -149,10 +168,10 @@ m_pcBinCABAC = pcEncTop->getBinCABAC(); m_pcTrQuant = pcEncTop->getTrQuant(); - + m_pcBitCounter = pcEncTop->getBitCounter(); m_pcRdCost = pcEncTop->getRdCost(); m_pppcRDSbacCoder = pcEncTop->getRDSbacCoder(); m_pcRDGoOnSbacCoder = pcEncTop->getRDGoOnSbacCoder(); - + // create lambda and QP arrays m_pdRdPicLambda = (Double*)xMalloc( Double, m_pcCfg->getDeltaQpRD() * 2 + 1 ); @@ -187,5 +206,5 @@ Double dQP; Double dLambda; - + rpcSlice = pcPic->getSlice(0); rpcSlice->setSPS( pSPS ); @@ -202,5 +221,5 @@ rpcSlice->setPicOutputFlag( true ); rpcSlice->setPOC( pocCurr ); - + // depth computation based on GOP size Int depth; @@ -230,17 +249,17 @@ } } - + // slice type SliceType eSliceType; - + eSliceType=B_SLICE; eSliceType = (pocLast == 0 || pocCurr % m_pcCfg->getIntraPeriod() == 0 || m_pcGOPEncoder->getGOPSize() == 0) ? I_SLICE : eSliceType; - + rpcSlice->setSliceType ( eSliceType ); - + // ------------------------------------------------------------------------------------------------------------------ // Non-referenced frame marking // ------------------------------------------------------------------------------------------------------------------ - + if(pocLast == 0) { @@ -252,16 +271,16 @@ } rpcSlice->setReferenced(true); - + // ------------------------------------------------------------------------------------------------------------------ // QP setting // ------------------------------------------------------------------------------------------------------------------ - + dQP = m_pcCfg->getQP(); if(eSliceType!=I_SLICE) { #if REPN_FORMAT_IN_VPS - if (!(( m_pcCfg->getMaxDeltaQP() == 0 ) && (dQP == -rpcSlice->getQpBDOffsetY() ) && (rpcSlice->getSPS()->getUseLossless()))) -#else - if (!(( m_pcCfg->getMaxDeltaQP() == 0 ) && (dQP == -rpcSlice->getSPS()->getQpBDOffsetY() ) && (rpcSlice->getSPS()->getUseLossless()))) + if (!(( m_pcCfg->getMaxDeltaQP() == 0 ) && (dQP == -rpcSlice->getQpBDOffsetY() ) && (rpcSlice->getSPS()->getUseLossless()))) +#else + if (!(( m_pcCfg->getMaxDeltaQP() == 0 ) && (dQP == -rpcSlice->getSPS()->getQpBDOffsetY() ) && (rpcSlice->getSPS()->getUseLossless()))) #endif { @@ -269,5 +288,5 @@ } } - + // modify QP Int* pdQPs = m_pcCfg->getdQPs(); @@ -285,5 +304,5 @@ // Lambda computation // ------------------------------------------------------------------------------------------------------------------ - + Int iQP; Double dOrigQP = dQP; @@ -294,5 +313,5 @@ // compute QP value dQP = dOrigQP + ((iDQpIdx+1)>>1)*(iDQpIdx%2 ? -1 : 1); - + // compute lambda value Int NumberBFrames = ( m_pcCfg->getGOPSize() - 1 ); @@ -326,5 +345,5 @@ #endif } - + // if hadamard is used in ME process if ( !m_pcCfg->getUseHADME() && rpcSlice->getSliceType( ) != I_SLICE ) @@ -332,5 +351,5 @@ dLambda *= 0.95; } - + #if REPN_FORMAT_IN_VPS iQP = max( -rpcSlice->getQpBDOffsetY(), min( MAX_QP, (Int) floor( dQP + 0.5 ) ) ); @@ -343,10 +362,10 @@ m_piRdPicQp [iDQpIdx] = iQP; } - + // obtain dQP = 0 case dLambda = m_pdRdPicLambda[0]; dQP = m_pdRdPicQp [0]; iQP = m_piRdPicQp [0]; - + if( rpcSlice->getSliceType( ) != I_SLICE ) { @@ -359,5 +378,5 @@ Int nCurLayer = rpcSlice->getLayerId(); Double gamma = xCalEnhLambdaFactor( m_ppcTEncTop[nCurLayer-1]->getQP() - m_ppcTEncTop[nCurLayer]->getQP() , - 1.0 * m_ppcTEncTop[nCurLayer]->getSourceWidth() * m_ppcTEncTop[nCurLayer]->getSourceHeight() + 1.0 * m_ppcTEncTop[nCurLayer]->getSourceWidth() * m_ppcTEncTop[nCurLayer]->getSourceHeight() / m_ppcTEncTop[nCurLayer-1]->getSourceWidth() / m_ppcTEncTop[nCurLayer-1]->getSourceHeight() ); dLambda *= gamma; @@ -392,7 +411,7 @@ #endif -#if RDOQ_CHROMA_LAMBDA +#if RDOQ_CHROMA_LAMBDA // for RDOQ - m_pcTrQuant->setLambda( dLambda, dLambda / weight ); + m_pcTrQuant->setLambda( dLambda, dLambda / weight ); #else m_pcTrQuant->setLambda( dLambda ); @@ -401,13 +420,13 @@ #if SAO_CHROMA_LAMBDA // For SAO - rpcSlice ->setLambda( dLambda, dLambda / weight ); + rpcSlice ->setLambda( dLambda, dLambda / weight ); #else rpcSlice ->setLambda( dLambda ); #endif - + #if HB_LAMBDA_FOR_LDC // restore original slice type eSliceType = (pocLast == 0 || pocCurr % m_pcCfg->getIntraPeriod() == 0 || m_pcGOPEncoder->getGOPSize() == 0) ? I_SLICE : eSliceType; - + #if SVC_EXTENSION if(m_pcCfg->getLayerId() > 0) @@ -418,12 +437,12 @@ rpcSlice->setSliceType ( eSliceType ); #endif - + if (m_pcCfg->getUseRecalculateQPAccordingToLambda()) { dQP = xGetQPValueAccordingToLambda( dLambda ); #if REPN_FORMAT_IN_VPS - iQP = max( -rpcSlice->getQpBDOffsetY(), min( MAX_QP, (Int) floor( dQP + 0.5 ) ) ); -#else - iQP = max( -pSPS->getQpBDOffsetY(), min( MAX_QP, (Int) floor( dQP + 0.5 ) ) ); + iQP = max( -rpcSlice->getQpBDOffsetY(), min( MAX_QP, (Int) floor( dQP + 0.5 ) ) ); +#else + iQP = max( -pSPS->getQpBDOffsetY(), min( MAX_QP, (Int) floor( dQP + 0.5 ) ) ); #endif } @@ -438,5 +457,5 @@ rpcSlice->setNumRefIdx(REF_PIC_LIST_0,m_pcCfg->getGOPEntry(iGOPid).m_numRefPicsActive); rpcSlice->setNumRefIdx(REF_PIC_LIST_1,m_pcCfg->getGOPEntry(iGOPid).m_numRefPicsActive); - + if ( m_pcCfg->getDeblockingFilterMetric() ) { @@ -479,11 +498,8 @@ rpcSlice->setDepth ( depth ); - + pcPic->setTLayer( m_pcCfg->getGOPEntry(iGOPid).m_temporalId ); -#if TEMP_SCALABILITY_FIX - if((eSliceType==I_SLICE) || (rpcSlice->getPOC() == 0)) -#else + if(eSliceType==I_SLICE) -#endif { pcPic->setTLayer(0); @@ -493,5 +509,5 @@ assert( m_apcPicYuvPred ); assert( m_apcPicYuvResi ); - + pcPic->setPicYuvPred( m_apcPicYuvPred ); pcPic->setPicYuvResi( m_apcPicYuvResi ); @@ -557,5 +573,5 @@ #endif -#if RDOQ_CHROMA_LAMBDA +#if RDOQ_CHROMA_LAMBDA // for RDOQ m_pcTrQuant->setLambda( lambda, lambda / weight ); @@ -665,7 +681,7 @@ #endif -#if RDOQ_CHROMA_LAMBDA +#if RDOQ_CHROMA_LAMBDA // for RDOQ - m_pcTrQuant->setLambda( lambda, lambda / weight ); + m_pcTrQuant->setLambda( lambda, lambda / weight ); #else m_pcTrQuant->setLambda( lambda ); @@ -674,5 +690,5 @@ #if SAO_CHROMA_LAMBDA // For SAO - pcSlice ->setLambda( lambda, lambda / weight ); + pcSlice ->setLambda( lambda, lambda / weight ); #else pcSlice ->setLambda( lambda ); @@ -692,5 +708,5 @@ Int iMaxSR = m_pcCfg->getSearchRange(); Int iNumPredDir = pcSlice->isInterP() ? 1 : 2; - + for (Int iDir = 0; iDir <= iNumPredDir; iDir++) { @@ -726,9 +742,9 @@ } #endif - + TComSlice* pcSlice = rpcPic->getSlice(getSliceIdx()); Double dPicRdCostBest = MAX_DOUBLE; UInt uiQpIdxBest = 0; - + Double dFrameLambda; #if FULL_NBIT @@ -737,5 +753,5 @@ Int SHIFT_QP = 12; #endif - + // set frame lambda if (m_pcCfg->getGOPSize() > 1) @@ -748,5 +764,5 @@ } m_pcRdCost ->setFrameLambda(dFrameLambda); - + // for each QP candidate for ( UInt uiQpIdx = 0; uiQpIdx < 2 * m_pcCfg->getDeltaQpRD() + 1; uiQpIdx++ ) @@ -776,5 +792,5 @@ #endif -#if RDOQ_CHROMA_LAMBDA +#if RDOQ_CHROMA_LAMBDA // for RDOQ m_pcTrQuant ->setLambda( m_pdRdPicLambda[uiQpIdx], m_pdRdPicLambda[uiQpIdx] / weight ); @@ -784,21 +800,21 @@ #if SAO_CHROMA_LAMBDA // For SAO - pcSlice ->setLambda ( m_pdRdPicLambda[uiQpIdx], m_pdRdPicLambda[uiQpIdx] / weight ); + pcSlice ->setLambda ( m_pdRdPicLambda[uiQpIdx], m_pdRdPicLambda[uiQpIdx] / weight ); #else pcSlice ->setLambda ( m_pdRdPicLambda[uiQpIdx] ); #endif - + // try compress compressSlice ( rpcPic ); - + Double dPicRdCost; UInt64 uiPicDist = m_uiPicDist; UInt64 uiALFBits = 0; - + m_pcGOPEncoder->preLoopFilterPicAll( rpcPic, uiPicDist, uiALFBits ); - + // compute RD cost and choose the best dPicRdCost = m_pcRdCost->calcRdCost64( m_uiPicTotalBits + uiALFBits, uiPicDist, true, DF_SSE_FRAME); - + if ( dPicRdCost < dPicRdCostBest ) { @@ -807,5 +823,5 @@ } } - + // set best values pcSlice ->setSliceQp ( m_piRdPicQp [uiQpIdxBest] ); @@ -832,7 +848,7 @@ #endif -#if RDOQ_CHROMA_LAMBDA - // for RDOQ - m_pcTrQuant ->setLambda( m_pdRdPicLambda[uiQpIdxBest], m_pdRdPicLambda[uiQpIdxBest] / weight ); +#if RDOQ_CHROMA_LAMBDA + // for RDOQ + m_pcTrQuant ->setLambda( m_pdRdPicLambda[uiQpIdxBest], m_pdRdPicLambda[uiQpIdxBest] / weight ); #else m_pcTrQuant ->setLambda ( m_pdRdPicLambda[uiQpIdxBest] ); @@ -840,5 +856,5 @@ #if SAO_CHROMA_LAMBDA // For SAO - pcSlice ->setLambda ( m_pdRdPicLambda[uiQpIdxBest], m_pdRdPicLambda[uiQpIdxBest] / weight ); + pcSlice ->setLambda ( m_pdRdPicLambda[uiQpIdxBest], m_pdRdPicLambda[uiQpIdxBest] / weight ); #else pcSlice ->setLambda ( m_pdRdPicLambda[uiQpIdxBest] ); @@ -862,5 +878,5 @@ UInt uiEncCUOrder; - uiCUAddr = rpcPic->getPicSym()->getCUOrderMap( uiStartCUAddr /rpcPic->getNumPartInCU()); + uiCUAddr = rpcPic->getPicSym()->getCUOrderMap( uiStartCUAddr /rpcPic->getNumPartInCU()); for( uiEncCUOrder = uiStartCUAddr/rpcPic->getNumPartInCU(); uiEncCUOrder < (uiBoundingCUAddr+(rpcPic->getNumPartInCU()-1))/rpcPic->getNumPartInCU(); @@ -898,10 +914,10 @@ TComSlice* pcSlice = rpcPic->getSlice(getSliceIdx()); xDetermineStartAndBoundingCUAddr ( uiStartCUAddr, uiBoundingCUAddr, rpcPic, false ); - + // initialize cost values m_uiPicTotalBits = 0; m_dPicRdCost = 0; m_uiPicDist = 0; - + // set entropy coder if( m_pcCfg->getUseSBACRD() ) @@ -921,5 +937,5 @@ m_pcEntropyCoder->setBitstream ( m_pcBitCounter ); } - + //------------------------------------------------------------------------------ // Weighted Prediction parameters estimation. @@ -930,4 +946,11 @@ xCalcACDCParamSlice(pcSlice); } +#if O0194_WEIGHTED_PREDICTION_CGS + else + { + // Calculate for the base layer to be used in EL as Inter layer reference + estimateILWpParam( pcSlice ); + } +#endif Bool bWp_explicit = (pcSlice->getSliceType()==P_SLICE && pcSlice->getPPS()->getUseWP()) || (pcSlice->getSliceType()==B_SLICE && pcSlice->getPPS()->getWPBiPred()); @@ -1021,5 +1044,5 @@ m_pcBufferSbacCoders[uiTileCol].loadContexts( CTXMem[1] ); Int iNumSubstreamsPerTile = iNumSubstreams/rpcPic->getPicSym()->getNumTiles(); - uiCUAddr = rpcPic->getPicSym()->getCUOrderMap( uiStartCUAddr /rpcPic->getNumPartInCU()); + uiCUAddr = rpcPic->getPicSym()->getCUOrderMap( uiStartCUAddr /rpcPic->getNumPartInCU()); uiLin = uiCUAddr / uiWidthInLCUs; uiSubStrm = rpcPic->getPicSym()->getTileIdxMap(rpcPic->getPicSym()->getCUOrderMap(uiCUAddr))*iNumSubstreamsPerTile @@ -1098,5 +1121,5 @@ pcCUTR = rpcPic->getCU( uiCUAddr - uiWidthInCU + 1 ); } - if ( ((pcCUTR==NULL) || (pcCUTR->getSlice()==NULL) || + if ( ((pcCUTR==NULL) || (pcCUTR->getSlice()==NULL) || (pcCUTR->getSCUAddr()+uiMaxParts-1 < pcSlice->getSliceCurStartCUAddr()) || ((rpcPic->getPicSym()->getTileIdxMap( pcCUTR->getAddr() ) != rpcPic->getPicSym()->getTileIdxMap(uiCUAddr))) @@ -1137,5 +1160,5 @@ m_pcEntropyCoder->setEntropyCoder ( m_pcRDGoOnSbacCoder, pcSlice ); m_pcEntropyCoder->setBitstream( &pcBitCounters[uiSubStrm] ); - + ((TEncBinCABAC*)m_pcRDGoOnSbacCoder->getEncBinIf())->setBinCountingEnableFlag(true); @@ -1242,5 +1265,5 @@ m_pcRdCost->setLambda(oldLambda); #if RATE_CONTROL_INTRA - m_pcRateCtrl->getRCPic()->updateAfterLCU( m_pcRateCtrl->getRCPic()->getLCUCoded(), actualBits, actualQP, actualLambda, + m_pcRateCtrl->getRCPic()->updateAfterLCU( m_pcRateCtrl->getRCPic()->getLCUCoded(), actualBits, actualQP, actualLambda, pcCU->getSlice()->getSliceType() == I_SLICE ? 0 : m_pcCfg->getLCULevelRC() ); #else @@ -1250,5 +1273,5 @@ #endif #endif - + // restore entropy coder to an initial stage m_pcEntropyCoder->setEntropyCoder ( m_pppcRDSbacCoder[0][CI_CURR_BEST], pcSlice ); @@ -1275,5 +1298,5 @@ { ppppcRDSbacCoders[uiSubStrm][0][CI_CURR_BEST]->load( m_pppcRDSbacCoder[0][CI_CURR_BEST] ); - + //Store probabilties of second LCU in line into buffer if ( ( uiCol == uiTileLCUX+1) && (depSliceSegmentsEnabled || (pcSlice->getPPS()->getNumSubstreams() > 1)) && m_pcCfg->getWaveFrontsynchro()) @@ -1325,5 +1348,5 @@ #if RATE_CONTROL_INTRA - m_pcRateCtrl->getRCPic()->updateAfterLCU( m_pcRateCtrl->getRCPic()->getLCUCoded(), actualBits, actualQP, actualLambda, + m_pcRateCtrl->getRCPic()->updateAfterLCU( m_pcRateCtrl->getRCPic()->getLCUCoded(), actualBits, actualQP, actualLambda, pcCU->getSlice()->getSliceType() == I_SLICE ? 0 : m_pcCfg->getLCULevelRC() ); #else @@ -1350,5 +1373,5 @@ } } - + m_uiPicTotalBits += pcCU->getTotalBits(); m_dPicRdCost += pcCU->getTotalCost(); @@ -1401,5 +1424,5 @@ m_pcEntropyCoder->setEntropyCoder ( m_pcSbacCoder, pcSlice ); } - + m_pcCuEncoder->setBitCounter( NULL ); m_pcBitCounter = NULL; @@ -1427,5 +1450,5 @@ m_pcBufferSbacCoders[ui].load(m_pcSbacCoder); //init. state } - + for (Int iSubstrmIdx=0; iSubstrmIdx < iNumSubstreams; iSubstrmIdx++) { @@ -1524,5 +1547,5 @@ } if ( (true/*bEnforceSliceRestriction*/ && - ((pcCUTR==NULL) || (pcCUTR->getSlice()==NULL) || + ((pcCUTR==NULL) || (pcCUTR->getSlice()==NULL) || (pcCUTR->getSCUAddr()+uiMaxParts-1 < pcSlice->getSliceCurStartCUAddr()) || ((rpcPic->getPicSym()->getTileIdxMap( pcCUTR->getAddr() ) != rpcPic->getPicSym()->getTileIdxMap(uiCUAddr))) @@ -1579,5 +1602,5 @@ } - TComDataCU*& pcCU = rpcPic->getCU( uiCUAddr ); + TComDataCU*& pcCU = rpcPic->getCU( uiCUAddr ); if ( pcSlice->getSPS()->getUseSAO() && (pcSlice->getSaoEnabledFlag()||pcSlice->getSaoEnabledFlagChroma()) ) { @@ -1613,5 +1636,5 @@ if (allowMergeLeft) { - m_pcEntropyCoder->m_pcEntropyCoderIf->codeSaoMerge(mergeLeft); + m_pcEntropyCoder->m_pcEntropyCoderIf->codeSaoMerge(mergeLeft); } else @@ -1676,9 +1699,9 @@ #if ENC_DEC_TRACE g_bJustDoIt = g_bEncDecTraceDisable; -#endif +#endif if( m_pcCfg->getUseSBACRD() ) { pcSbacCoders[uiSubStrm].load(m_pcSbacCoder); //load back status of the entropy coder after encoding the LCU into relevant bitstream entropy coder - + //Store probabilties of second LCU in line into buffer @@ -1733,5 +1756,5 @@ UInt uiNumberOfCUsInFrame = rpcPic->getNumCUsInFrame(); uiBoundingCUAddrSlice = uiNumberOfCUsInFrame; - if (bEncodeSlice) + if (bEncodeSlice) { UInt uiCUAddrIncrement; @@ -1769,5 +1792,5 @@ uiBoundingCUAddrSlice = uiNumberOfCUsInFrame*rpcPic->getNumPartInCU(); break; - } + } // WPP: if a slice does not start at the beginning of a CTB row, it must end within the same CTB row if (pcSlice->getPPS()->getNumSubstreams() > 1 && (uiStartCUAddrSlice % (rpcPic->getFrameWidthInCU()*rpcPic->getNumPartInCU()) != 0)) @@ -1809,5 +1832,5 @@ uiBoundingCUAddrSlice = uiNumberOfCUsInFrame*rpcPic->getNumPartInCU(); break; - } + } // WPP: if a slice does not start at the beginning of a CTB row, it must end within the same CTB row if (pcSlice->getPPS()->getNumSubstreams() > 1 && (uiStartCUAddrSlice % (rpcPic->getFrameWidthInCU()*rpcPic->getNumPartInCU()) != 0)) @@ -1819,5 +1842,5 @@ Bool tileBoundary = false; - if ((m_pcCfg->getSliceMode() == FIXED_NUMBER_OF_LCU || m_pcCfg->getSliceMode() == FIXED_NUMBER_OF_BYTES) && + if ((m_pcCfg->getSliceMode() == FIXED_NUMBER_OF_LCU || m_pcCfg->getSliceMode() == FIXED_NUMBER_OF_BYTES) && (m_pcCfg->getNumRowsMinus1() > 0 || m_pcCfg->getNumColumnsMinus1() > 0)) { @@ -1832,5 +1855,5 @@ } tileBoundingCUAddrSlice = lcuEncAddr*rpcPic->getNumPartInCU(); - + if (tileBoundingCUAddrSlice < uiBoundingCUAddrSlice) { @@ -1845,5 +1868,5 @@ startCUAddrSliceSegment = pcSlice->getSliceSegmentCurStartCUAddr(); boundingCUAddrSliceSegment = uiNumberOfCUsInFrame; - if (bEncodeSlice) + if (bEncodeSlice) { UInt uiCUAddrIncrement; @@ -1880,5 +1903,5 @@ boundingCUAddrSliceSegment = uiNumberOfCUsInFrame*rpcPic->getNumPartInCU(); break; - } + } // WPP: if a slice segment does not start at the beginning of a CTB row, it must end within the same CTB row if (pcSlice->getPPS()->getNumSubstreams() > 1 && (startCUAddrSliceSegment % (rpcPic->getFrameWidthInCU()*rpcPic->getNumPartInCU()) != 0)) @@ -1919,5 +1942,5 @@ boundingCUAddrSliceSegment = uiNumberOfCUsInFrame*rpcPic->getNumPartInCU(); break; - } + } // WPP: if a slice segment does not start at the beginning of a CTB row, it must end within the same CTB row if (pcSlice->getPPS()->getNumSubstreams() > 1 && (startCUAddrSliceSegment % (rpcPic->getFrameWidthInCU()*rpcPic->getNumPartInCU()) != 0)) @@ -1927,5 +1950,5 @@ pcSlice->setSliceSegmentCurEndCUAddr( boundingCUAddrSliceSegment ); } - if ((m_pcCfg->getSliceSegmentMode() == FIXED_NUMBER_OF_LCU || m_pcCfg->getSliceSegmentMode() == FIXED_NUMBER_OF_BYTES) && + if ((m_pcCfg->getSliceSegmentMode() == FIXED_NUMBER_OF_LCU || m_pcCfg->getSliceSegmentMode() == FIXED_NUMBER_OF_BYTES) && (m_pcCfg->getNumRowsMinus1() > 0 || m_pcCfg->getNumColumnsMinus1() > 0)) { @@ -1979,8 +2002,8 @@ } UInt uiRealStartAddress = rpcPic->getPicSym()->getPicSCUEncOrder(uiExternalAddress*rpcPic->getNumPartInCU()+uiInternalAddress); - + pcSlice->setSliceSegmentCurStartCUAddr(uiRealStartAddress); startCUAddrSliceSegment=uiRealStartAddress; - + //calculate real slice start address uiInternalAddress = rpcPic->getPicSym()->getPicSCUAddr(pcSlice->getSliceCurStartCUAddr()) % rpcPic->getNumPartInCU(); @@ -2007,8 +2030,8 @@ } uiRealStartAddress = rpcPic->getPicSym()->getPicSCUEncOrder(uiExternalAddress*rpcPic->getNumPartInCU()+uiInternalAddress); - + pcSlice->setSliceCurStartCUAddr(uiRealStartAddress); uiStartCUAddrSlice=uiRealStartAddress; - + // Make a joint decision based on reconstruction and dependent slice bounds startCUAddr = max(uiStartCUAddrSlice , startCUAddrSliceSegment ); @@ -2022,7 +2045,7 @@ if ( (m_pcCfg->getSliceMode()==FIXED_NUMBER_OF_LCU && m_pcCfg->getSliceSegmentMode()==FIXED_NUMBER_OF_LCU) || (m_pcCfg->getSliceMode()==0 && m_pcCfg->getSliceSegmentMode()==FIXED_NUMBER_OF_LCU) - || (m_pcCfg->getSliceMode()==FIXED_NUMBER_OF_LCU && m_pcCfg->getSliceSegmentMode()==0) + || (m_pcCfg->getSliceMode()==FIXED_NUMBER_OF_LCU && m_pcCfg->getSliceSegmentMode()==0) || (m_pcCfg->getSliceMode()==FIXED_NUMBER_OF_TILES && m_pcCfg->getSliceSegmentMode()==FIXED_NUMBER_OF_LCU) - || (m_pcCfg->getSliceMode()==FIXED_NUMBER_OF_TILES && m_pcCfg->getSliceSegmentMode()==0) + || (m_pcCfg->getSliceMode()==FIXED_NUMBER_OF_TILES && m_pcCfg->getSliceSegmentMode()==0) || (m_pcCfg->getSliceSegmentMode()==FIXED_NUMBER_OF_TILES && m_pcCfg->getSliceMode()==0) || tileBoundary @@ -2066,3 +2089,13 @@ } #endif +#if O0194_WEIGHTED_PREDICTION_CGS +Void TEncSlice::estimateILWpParam( TComSlice* pcSlice ) +{ + xCalcACDCParamSlice(pcSlice); + wpACDCParam * temp_weightACDCParam; + + pcSlice->getWpAcDcParam(temp_weightACDCParam); + g_refWeightACDCParam = (void *) temp_weightACDCParam; +} +#endif //! \} Index: trunk/source/Lib/TLibEncoder/TEncSlice.h =================================================================== --- trunk/source/Lib/TLibEncoder/TEncSlice.h (revision 442) +++ trunk/source/Lib/TLibEncoder/TEncSlice.h (revision 494) @@ -111,5 +111,9 @@ virtual ~TEncSlice(); +#if AUXILIARY_PICTURES + Void create ( Int iWidth, Int iHeight, ChromaFormat chromaFormat, UInt iMaxCUWidth, UInt iMaxCUHeight, UChar uhTotalDepth ); +#else Void create ( Int iWidth, Int iHeight, UInt iMaxCUWidth, UInt iMaxCUHeight, UChar uhTotalDepth ); +#endif Void destroy (); Void init ( TEncTop* pcEncTop ); @@ -119,4 +123,7 @@ Void initEncSlice ( TComPic* pcPic, Int pocLast, Int pocCurr, Int iNumPicRcvd, Int iGOPid, TComSlice*& rpcSlice, TComSPS* pSPS, TComPPS *pPPS, TComVPS *vps, Bool isField ); +#if O0194_WEIGHTED_PREDICTION_CGS + Void estimateILWpParam ( TComSlice* pcSlice ); +#endif #else Void initEncSlice ( TComPic* pcPic, Int pocLast, Int pocCurr, Int iNumPicRcvd, Index: trunk/source/Lib/TLibEncoder/TEncTop.cpp =================================================================== --- trunk/source/Lib/TLibEncoder/TEncTop.cpp (revision 442) +++ trunk/source/Lib/TLibEncoder/TEncTop.cpp (revision 494) @@ -88,11 +88,9 @@ m_bMFMEnabledFlag = false; #endif -#if SCALED_REF_LAYER_OFFSETS m_numScaledRefLayerOffsets = 0; -#endif -#endif #if POC_RESET_FLAG m_pocAdjustmentValue = 0; #endif +#endif //SVC_EXTENSION } @@ -117,5 +115,9 @@ m_cGOPEncoder. create(); #endif +#if AUXILIARY_PICTURES + m_cSliceEncoder. create( getSourceWidth(), getSourceHeight(), m_chromaFormatIDC, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth ); +#else m_cSliceEncoder. create( getSourceWidth(), getSourceHeight(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth ); +#endif m_cCuEncoder. create( g_uiMaxCUDepth, g_uiMaxCUWidth, g_uiMaxCUHeight ); if (m_bUseSAO) @@ -175,4 +177,11 @@ } } + +#if LAYER_CTB + memcpy(g_auiLayerZscanToRaster[m_layerId], g_auiZscanToRaster, sizeof( g_auiZscanToRaster ) ); + memcpy(g_auiLayerRasterToZscan[m_layerId], g_auiRasterToZscan, sizeof( g_auiRasterToZscan ) ); + memcpy(g_auiLayerRasterToPelX[m_layerId], g_auiRasterToPelX, sizeof( g_auiRasterToPelX ) ); + memcpy(g_auiLayerRasterToPelY[m_layerId], g_auiRasterToPelY, sizeof( g_auiRasterToPelY ) ); +#endif } @@ -601,5 +610,9 @@ else { +#if AUXILIARY_PICTURES + rpcPicYuvRec->create( m_iSourceWidth, m_iSourceHeight, m_chromaFormatIDC, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth ); +#else rpcPicYuvRec->create( m_iSourceWidth, m_iSourceHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth ); +#endif } rcListPicYuvRecOut.pushBack( rpcPicYuvRec ); @@ -801,4 +814,13 @@ #endif +#if AUXILIARY_PICTURES +#if SVC_UPSAMPLING + pcEPic->create( m_iSourceWidth, m_iSourceHeight, m_chromaFormatIDC, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, m_cPPS.getMaxCuDQPDepth()+1 , + m_conformanceWindow, m_defaultDisplayWindow, m_numReorderPics, &m_cSPS); +#else + pcEPic->create( m_iSourceWidth, m_iSourceHeight, m_chromaFormatIDC, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, m_cPPS.getMaxCuDQPDepth()+1 , + m_conformanceWindow, m_defaultDisplayWindow, m_numReorderPics); +#endif +#else #if SVC_UPSAMPLING pcEPic->create( m_iSourceWidth, m_iSourceHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, m_cPPS.getMaxCuDQPDepth()+1 , @@ -807,4 +829,5 @@ pcEPic->create( m_iSourceWidth, m_iSourceHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, m_cPPS.getMaxCuDQPDepth()+1 , m_conformanceWindow, m_defaultDisplayWindow, m_numReorderPics); +#endif #endif rpcPic = pcEPic; @@ -842,4 +865,13 @@ #endif +#if AUXILIARY_PICTURES +#if SVC_UPSAMPLING + rpcPic->create( m_iSourceWidth, m_iSourceHeight, m_chromaFormatIDC, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, + m_conformanceWindow, m_defaultDisplayWindow, m_numReorderPics, &m_cSPS); +#else + rpcPic->create( m_iSourceWidth, m_iSourceHeight, m_chromaFormatIDC, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, + m_conformanceWindow, m_defaultDisplayWindow, m_numReorderPics); +#endif +#else #if SVC_UPSAMPLING rpcPic->create( m_iSourceWidth, m_iSourceHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, @@ -849,4 +881,5 @@ m_conformanceWindow, m_defaultDisplayWindow, m_numReorderPics); #endif +#endif } @@ -871,5 +904,4 @@ #if SVC_EXTENSION m_cSPS.setLayerId(m_layerId); -#endif #if REF_IDX_MFM #if !M0457_COL_PICTURE_SIGNALING @@ -877,5 +909,4 @@ #endif #endif -#if SCALED_REF_LAYER_OFFSETS m_cSPS.setNumScaledRefLayerOffsets(m_numScaledRefLayerOffsets); for(Int i = 0; i < m_cSPS.getNumScaledRefLayerOffsets(); i++) @@ -883,5 +914,5 @@ m_cSPS.getScaledRefLayerWindow(i) = m_scaledRefLayerWindow[i]; } -#endif +#endif //SVC_EXTENSION ProfileTierLevel& profileTierLevel = *m_cSPS.getPTL()->getGeneralPTL(); profileTierLevel.setLevelIdc(m_level); @@ -914,4 +945,7 @@ m_cSPS.setMaxCUHeight ( g_uiMaxCUHeight ); m_cSPS.setMaxCUDepth ( g_uiMaxCUDepth ); +#if AUXILIARY_PICTURES + m_cSPS.setChromaFormatIdc( m_chromaFormatIDC); +#endif Int minCUSize = m_cSPS.getMaxCUWidth() >> ( m_cSPS.getMaxCUDepth()-g_uiAddCUDepth ); @@ -1188,9 +1222,5 @@ for( Int i = 0; i < getGOPSize()+m_extraRPSs; i++) { -#if FINAL_RPL_CHANGE_N0082 - GOPEntry ge = m_ppcTEncTop[m_cSPS.getLayerId()]->getGOPEntry(i); -#else GOPEntry ge = getGOPEntry(i); -#endif rps = rpsList->getReferencePictureSet(i); rps->setNumberOfPictures(ge.m_numRefPics); @@ -1536,5 +1566,4 @@ #endif -#if SVC_EXTENSION #if !REPN_FORMAT_IN_VPS Void TEncTop::xInitILRP() @@ -1559,5 +1588,9 @@ m_cIlpPic[j] = new TComPic; #if SVC_UPSAMPLING +#if AUXILIARY_PICTURES + m_cIlpPic[j]->create(m_iSourceWidth, m_iSourceHeight, m_chromaFormatIDC, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, conformanceWindow, defaultDisplayWindow, numReorderPics, &m_cSPS, true); +#else m_cIlpPic[j]->create(m_iSourceWidth, m_iSourceHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, conformanceWindow, defaultDisplayWindow, numReorderPics, &m_cSPS, true); +#endif #else m_cIlpPic[j]->create(m_iSourceWidth, m_iSourceHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, conformanceWindow, defaultDisplayWindow, numReorderPics, true); @@ -1611,5 +1644,9 @@ m_cIlpPic[j] = new TComPic; #if SVC_UPSAMPLING +#if AUXILIARY_PICTURES + m_cIlpPic[j]->create(picWidth, picHeight, m_chromaFormatIDC, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, conformanceWindow, defaultDisplayWindow, numReorderPics, &m_cSPS, true); +#else m_cIlpPic[j]->create(picWidth, picHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, conformanceWindow, defaultDisplayWindow, numReorderPics, &m_cSPS, true); +#endif #else m_cIlpPic[j]->create(m_iSourceWidth, m_iSourceHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, conformanceWindow, defaultDisplayWindow, numReorderPics, true); @@ -1624,25 +1661,4 @@ } #endif -Void TEncTop::setILRPic(TComPic *pcPic) -{ - for( Int i = 0; i < pcPic->getSlice(0)->getActiveNumILRRefIdx(); i++ ) - { - Int refLayerIdc = pcPic->getSlice(0)->getInterLayerPredLayerIdc(i); - - if(m_cIlpPic[refLayerIdc]) - { - m_cIlpPic[refLayerIdc]->copyUpsampledPictureYuv(pcPic->getFullPelBaseRec(refLayerIdc), m_cIlpPic[refLayerIdc]->getPicYuvRec()); - m_cIlpPic[refLayerIdc]->getSlice(0)->setPOC(pcPic->getPOC()); - m_cIlpPic[refLayerIdc]->setLayerId(pcPic->getSlice(0)->getBaseColPic(refLayerIdc)->getLayerId()); //set reference layerId - m_cIlpPic[refLayerIdc]->getPicYuvRec()->setBorderExtension(false); - m_cIlpPic[refLayerIdc]->getPicYuvRec()->extendPicBorder(); - for (Int j=0; jgetPicSym()->getNumberOfCUsInFrame(); j++) // set reference CU layerId - { - m_cIlpPic[refLayerIdc]->getPicSym()->getCU(j)->setLayerId(m_cIlpPic[refLayerIdc]->getLayerId()); - } - } - } -} -#endif -#endif +#endif //SVC_EXTENSION //! \} Index: trunk/source/Lib/TLibEncoder/TEncTop.h =================================================================== --- trunk/source/Lib/TLibEncoder/TEncTop.h (revision 442) +++ trunk/source/Lib/TLibEncoder/TEncTop.h (revision 494) @@ -140,12 +140,10 @@ Int m_ilSampleOnlyPred; #endif -#if SCALED_REF_LAYER_OFFSETS UInt m_numScaledRefLayerOffsets; Window m_scaledRefLayerWindow[MAX_LAYERS]; -#endif #if POC_RESET_FLAG Int m_pocAdjustmentValue; #endif -#endif +#endif //SVC_EXTENSION protected: Void xGetNewPicBuffer ( TComPic*& rpcPic ); ///< get picture buffer which will be processed @@ -209,10 +207,8 @@ Int getNumPicRcvd () { return m_iNumPicRcvd; } Void setNumPicRcvd ( Int num ) { m_iNumPicRcvd = num; } -#if SCALED_REF_LAYER_OFFSETS Void setNumScaledRefLayerOffsets(Int x) { m_numScaledRefLayerOffsets = x; } UInt getNumScaledRefLayerOffsets() { return m_numScaledRefLayerOffsets; } Window& getScaledRefLayerWindow(Int x) { return m_scaledRefLayerWindow[x]; } -#endif -#endif +#endif //SVC_EXTENSION // ------------------------------------------------------------------------------------------------------------------- @@ -223,5 +219,4 @@ #if SVC_EXTENSION TComPic** getIlpList() { return m_cIlpPic; } - Void setILRPic(TComPic *pcPic); #if REF_IDX_MFM Void setMFMEnabledFlag (Bool flag) {m_bMFMEnabledFlag = flag;} Index: trunk/source/Lib/TLibEncoder/WeightPredAnalysis.cpp =================================================================== --- trunk/source/Lib/TLibEncoder/WeightPredAnalysis.cpp (revision 442) +++ trunk/source/Lib/TLibEncoder/WeightPredAnalysis.cpp (revision 494) @@ -2,5 +2,5 @@ * License, included below. This software may be subject to other third party * and contributor rights, including patent rights, and no such rights are - * granted under this license. + * granted under this license. * * Copyright (c) 2010-2013, ITU/ISO/IEC @@ -51,5 +51,5 @@ for ( Int iList =0 ; iList<2 ; iList++ ) { - for ( Int iRefIdx=0 ; iRefIdxgetPic()->getPicYuvOrg(); Int iSample = 0; +#if O0194_WEIGHTED_PREDICTION_CGS + // Define here to assign the parameter of "iSample" + wpACDCParam weightACDCParam[3]; +#endif // calculate DC/AC value for Y @@ -81,4 +85,7 @@ pOrg = pPic->getLumaAddr(); Int64 iOrgACY = xCalcACValueSlice(slice, pOrg, iOrgNormDCY); +#if O0194_WEIGHTED_PREDICTION_CGS + weightACDCParam[0].iSamples = iSample; +#endif // calculate DC/AC value for Cb @@ -88,4 +95,7 @@ pOrg = pPic->getCbAddr(); Int64 iOrgACCb = xCalcACValueUVSlice(slice, pOrg, iOrgNormDCCb); +#if O0194_WEIGHTED_PREDICTION_CGS + weightACDCParam[1].iSamples = iSample; +#endif // calculate DC/AC value for Cr @@ -95,6 +105,11 @@ pOrg = pPic->getCrAddr(); Int64 iOrgACCr = xCalcACValueUVSlice(slice, pOrg, iOrgNormDCCr); - +#if O0194_WEIGHTED_PREDICTION_CGS + weightACDCParam[2].iSamples = iSample; +#endif + +#if !O0194_WEIGHTED_PREDICTION_CGS wpACDCParam weightACDCParam[3]; +#endif weightACDCParam[0].iAC = iOrgACY; weightACDCParam[0].iDC = iOrgNormDCY; @@ -138,7 +153,7 @@ for ( Int iList=0 ; iList<2 ; iList++ ) { - for ( Int iRefIdx=0 ; iRefIdxsetWpScaling( m_wp ); @@ -216,4 +231,14 @@ slice->getWpAcDcParam(currWeightACDCParam); slice->getRefPic(eRefPicList, refIdxTemp)->getSlice(0)->getWpAcDcParam(refWeightACDCParam); +#if O0194_WEIGHTED_PREDICTION_CGS + UInt currLayerId = slice->getLayerId(); + UInt refLayerId = slice->getRefPic(eRefPicList, refIdxTemp)->getLayerId(); + Bool validILRPic = slice->getRefPic(eRefPicList, refIdxTemp)->isILR( currLayerId ) && refLayerId == 0; + + if( validILRPic ) + { + refWeightACDCParam = (wpACDCParam *)g_refWeightACDCParam; + } +#endif for ( Int comp = 0; comp < 3; comp++ ) @@ -229,4 +254,14 @@ Int64 refDC = refWeightACDCParam[comp].iDC; Int64 refAC = refWeightACDCParam[comp].iAC; +#if O0194_WEIGHTED_PREDICTION_CGS + if( validILRPic ) + { + refAC = ( refAC * currWeightACDCParam[comp].iSamples ) /refWeightACDCParam[comp].iSamples; +#if O0194_JOINT_US_BITSHIFT + refAC <<= (g_bitDepthYLayer[currLayerId]-g_bitDepthYLayer[refLayerId]); + refDC <<= (g_bitDepthYLayer[currLayerId]-g_bitDepthYLayer[refLayerId]); +#endif + } +#endif // calculating iWeight and iOffset params @@ -234,4 +269,12 @@ Int weight = (Int)( 0.5 + dWeight * (Double)(1<> realLog2Denom ); +#if O0194_WEIGHTED_PREDICTION_CGS + if( !validILRPic ) + { + dWeight = 1; + offset = 0; + } + weight = (Int)( 0.5 + dWeight * (Double)(1< 127 || deltaWeight < -128) return (false); +#if O0194_WEIGHTED_PREDICTION_CGS + // make sure the reference frames other than ILR are not using weighted prediction + else + if( !validILRPic ) + { + continue; + } +#endif m_wp[refList][refIdxTemp][comp].bPresentFlag = true; @@ -264,5 +315,5 @@ } -/** select whether weighted pred enables or not. +/** select whether weighted pred enables or not. * \param TComSlice *slice * \param wpScalingParam @@ -325,5 +376,5 @@ } -/** calculate DC value of original image for luma. +/** calculate DC value of original image for luma. * \param TComSlice *slice * \param Pel *pPel @@ -345,5 +396,5 @@ } -/** calculate AC value of original image for luma. +/** calculate AC value of original image for luma. * \param TComSlice *slice * \param Pel *pPel @@ -363,5 +414,5 @@ } -/** calculate DC value of original image for chroma. +/** calculate DC value of original image for chroma. * \param TComSlice *slice * \param Pel *pPel @@ -383,5 +434,5 @@ } -/** calculate AC value of original image for chroma. +/** calculate AC value of original image for chroma. * \param TComSlice *slice * \param Pel *pPel @@ -401,5 +452,5 @@ } -/** calculate DC value. +/** calculate DC value. * \param Pel *pPel * \param Int iWidth @@ -423,5 +474,5 @@ } -/** calculate AC value. +/** calculate AC value. * \param Pel *pPel * \param Int iWidth @@ -446,5 +497,5 @@ } -/** calculate SAD values for both WP version and non-WP version. +/** calculate SAD values for both WP version and non-WP version. * \param Pel *pOrgPel * \param Pel *pRefPel