Index: trunk/source/Lib/TLibEncoder/SEIwrite.cpp =================================================================== --- trunk/source/Lib/TLibEncoder/SEIwrite.cpp (revision 352) +++ trunk/source/Lib/TLibEncoder/SEIwrite.cpp (revision 442) @@ -95,4 +95,9 @@ fprintf( g_hTrace, "=========== SOP Description SEI message ===========\n"); break; +#if N0383_IL_CONSTRAINED_TILE_SETS_SEI + case SEI::INTER_LAYER_CONSTRAINED_TILE_SETS: + fprintf( g_hTrace, "=========== Inter Layer Constrained Tile Sets SEI message ===========\n"); + break; +#endif case SEI::SCALABLE_NESTING: fprintf( g_hTrace, "=========== Scalable Nesting SEI message ===========\n"); @@ -153,4 +158,9 @@ xWriteSEISOPDescription(*static_cast(&sei)); break; +#if N0383_IL_CONSTRAINED_TILE_SETS_SEI + case SEI::INTER_LAYER_CONSTRAINED_TILE_SETS: + xWriteSEIInterLayerConstrainedTileSets(*static_cast(&sei)); + break; +#endif case SEI::SCALABLE_NESTING: xWriteSEIScalableNesting(bs, *static_cast(&sei), sps); @@ -559,4 +569,42 @@ } +#if N0383_IL_CONSTRAINED_TILE_SETS_SEI +Void SEIWriter::xWriteSEIInterLayerConstrainedTileSets(const SEIInterLayerConstrainedTileSets& sei) +{ + WRITE_FLAG( sei.m_ilAllTilesExactSampleValueMatchFlag, "il_all_tiles_exact_sample_value_match_flag" ); + WRITE_FLAG( sei.m_ilOneTilePerTileSetFlag, "il_one_tile_per_tile_set_flag" ); + if( !sei.m_ilOneTilePerTileSetFlag ) + { + WRITE_UVLC( sei.m_ilNumSetsInMessageMinus1, "il_num_sets_in_message_minus1" ); + if( sei.m_ilNumSetsInMessageMinus1 ) + { + WRITE_FLAG( sei.m_skippedTileSetPresentFlag, "skipped_tile_set_present_flag" ); + } + UInt numSignificantSets = sei.m_ilNumSetsInMessageMinus1 - (sei.m_skippedTileSetPresentFlag ? 1 : 0) + 1; + for( UInt i = 0; i < numSignificantSets; i++ ) + { + WRITE_UVLC( sei.m_ilctsId[i], "ilcts_id" ); + WRITE_UVLC( sei.m_ilNumTileRectsInSetMinus1[i], "il_num_tile_rects_in_set_minus1" ); + for( UInt j = 0; j <= sei.m_ilNumTileRectsInSetMinus1[i]; j++ ) + { + WRITE_UVLC( sei.m_ilTopLeftTileIndex[i][j], "il_top_left_tile_index" ); + WRITE_UVLC( sei.m_ilBottomRightTileIndex[i][j], "il_bottom_right_tile_index" ); + } + WRITE_CODE( sei.m_ilcIdc[i], 2, "ilc_idc" ); + if( sei.m_ilAllTilesExactSampleValueMatchFlag ) + { + WRITE_FLAG( sei.m_ilExactSampleValueMatchFlag[i], "il_exact_sample_value_match_flag" ); + } + } + } + else + { + WRITE_CODE( sei.m_allTilesIlcIdc, 2, "all_tiles_ilc_idc" ); + } + + xWriteByteAlign(); +} +#endif + Void SEIWriter::xWriteSEIScalableNesting(TComBitIf& bs, const SEIScalableNesting& sei, TComSPS *sps) { Index: trunk/source/Lib/TLibEncoder/SEIwrite.h =================================================================== --- trunk/source/Lib/TLibEncoder/SEIwrite.h (revision 352) +++ trunk/source/Lib/TLibEncoder/SEIwrite.h (revision 442) @@ -68,4 +68,7 @@ #endif Void xWriteSEISOPDescription(const SEISOPDescription& sei); +#if N0383_IL_CONSTRAINED_TILE_SETS_SEI + Void xWriteSEIInterLayerConstrainedTileSets(const SEIInterLayerConstrainedTileSets& sei); +#endif Void xWriteSEIScalableNesting(TComBitIf& bs, const SEIScalableNesting& sei, TComSPS *sps); Void xWriteByteAlign(); Index: trunk/source/Lib/TLibEncoder/TEncAnalyze.cpp =================================================================== --- trunk/source/Lib/TLibEncoder/TEncAnalyze.cpp (revision 352) +++ trunk/source/Lib/TLibEncoder/TEncAnalyze.cpp (revision 442) @@ -57,3 +57,4 @@ #endif +TEncAnalyze m_gcAnalyzeAll_in; //! \} Index: trunk/source/Lib/TLibEncoder/TEncAnalyze.h =================================================================== --- trunk/source/Lib/TLibEncoder/TEncAnalyze.h (revision 352) +++ trunk/source/Lib/TLibEncoder/TEncAnalyze.h (revision 442) @@ -131,4 +131,32 @@ fclose(pFile); } + + Void printOutInterlaced ( Char cDelim, Double bits ) + { + Double dFps = m_dFrmRate; //--CFG_KDY + Double dScale = dFps / 1000 / (Double)m_uiNumPic; + + printf( "\tTotal Frames | " "Bitrate " "Y-PSNR " "U-PSNR " "V-PSNR \n" ); + //printf( "\t------------ " " ----------" " -------- " " -------- " " --------\n" ); + printf( "\t %8d %c" "%12.4lf " "%8.4lf " "%8.4lf " "%8.4lf\n", + getNumPic(), cDelim, + bits * dScale, + getPsnrY() / (Double)getNumPic(), + getPsnrU() / (Double)getNumPic(), + getPsnrV() / (Double)getNumPic() ); + } + + Void printSummaryOutInterlaced (Int bits) + { + FILE* pFile = fopen ("summaryTotal.txt", "at"); + Double dFps = m_dFrmRate; //--CFG_KDY + Double dScale = dFps / 1000 / (Double)m_uiNumPic; + + fprintf(pFile, "%f\t %f\t %f\t %f\n", bits * dScale, + getPsnrY() / (Double)getNumPic(), + getPsnrU() / (Double)getNumPic(), + getPsnrV() / (Double)getNumPic() ); + fclose(pFile); + } Void printSummary(Char ch) @@ -178,4 +206,5 @@ #endif +extern TEncAnalyze m_gcAnalyzeAll_in; //! \} Index: trunk/source/Lib/TLibEncoder/TEncCavlc.cpp =================================================================== --- trunk/source/Lib/TLibEncoder/TEncCavlc.cpp (revision 352) +++ trunk/source/Lib/TLibEncoder/TEncCavlc.cpp (revision 442) @@ -221,4 +221,9 @@ } WRITE_FLAG( pcPPS->getScalingListPresentFlag() ? 1 : 0, "pps_scaling_list_data_present_flag" ); + +#if IL_SL_SIGNALLING_N0371 + pcPPS->setPPS( pcPPS->getLayerId(), pcPPS ); +#endif + if( pcPPS->getScalingListPresentFlag() ) { @@ -226,5 +231,49 @@ printf("PPS\n"); #endif + +#if IL_SL_SIGNALLING_N0371 + m_pcSlice->getScalingList()->setLayerId( pcPPS->getLayerId() ); + + if( pcPPS->getLayerId() > 0 ) + { + WRITE_FLAG( pcPPS->getPredScalingListFlag() ? 1 : 0, "pps_pred_scaling_list_flag" ); + m_pcSlice->getScalingList()->setPredScalingListFlag( pcPPS->getPredScalingListFlag() ); + + if( pcPPS->getPredScalingListFlag() ) + { + // The value of pps_scaling_list_ref_layer_id shall be in the range of 0 to 62, inclusive + assert( /*pcPPS->getScalingListRefLayerId() >= 0 &&*/ pcPPS->getScalingListRefLayerId() <= 62 ); + + // When avc_base_layer_flag is equal to 1, it is a requirement of bitstream conformance that the value of pps_scaling_list_ref_layer_id shall be greater than 0 + if( pcPPS->getSPS()->getVPS()->getAvcBaseLayerFlag() ) + { + assert( pcPPS->getScalingListRefLayerId() > 0 ); + } + + // It is a requirement of bitstream conformance that, when a PPS with nuh_layer_id equal to nuhLayerIdA is active for a layer with nuh_layer_id equal to nuhLayerIdB and + // pps_infer_scaling_list_flag in the PPS is equal to 1, pps_infer_scaling_list_flag shall be equal to 0 for the PPS that is active for the layer with nuh_layer_id equal to pps_scaling_list_ref_layer_id + assert( pcPPS->getPPS( pcPPS->getScalingListRefLayerId() )->getPredScalingListFlag() == false ); + + // It is a requirement of bitstream conformance that, when a PPS with nuh_layer_id equal to nuhLayerIdA is active for a layer with nuh_layer_id equal to nuhLayerIdB, + // the layer with nuh_layer_id equal to pps_scaling_list_ref_layer_id shall be a direct or indirect reference layer of the layer with nuh_layer_id equal to nuhLayerIdB + assert( pcPPS->getSPS()->getVPS()->getScalingListLayerDependency( pcPPS->getLayerId(), pcPPS->getScalingListRefLayerId() ) == true ); + + WRITE_UVLC( pcPPS->getScalingListRefLayerId(), "scaling_list_pps_ref_layer_id" ); + m_pcSlice->getScalingList()->setScalingListRefLayerId( pcPPS->getScalingListRefLayerId() ); + codeScalingList( m_pcSlice->getScalingList() ); + } + else + { + codeScalingList( m_pcSlice->getScalingList() ); + } + } + else + { + codeScalingList( m_pcSlice->getScalingList() ); + } +#else codeScalingList( m_pcSlice->getScalingList() ); +#endif + } WRITE_FLAG( pcPPS->getListsModificationPresentFlag(), "lists_modification_present_flag"); @@ -414,16 +463,34 @@ } #endif +#ifdef SPS_PTL_FIX + if (pcSPS->getLayerId() == 0) + { + codePTL(pcSPS->getPTL(), 1, pcSPS->getMaxTLayers() - 1); + } +#else codePTL(pcSPS->getPTL(), 1, pcSPS->getMaxTLayers() - 1); +#endif WRITE_UVLC( pcSPS->getSPSId (), "sps_seq_parameter_set_id" ); - WRITE_UVLC( pcSPS->getChromaFormatIdc (), "chroma_format_idc" ); - assert(pcSPS->getChromaFormatIdc () == 1); - // in the first version chroma_format_idc can only be equal to 1 (4:2:0) - if( pcSPS->getChromaFormatIdc () == 3 ) - { - WRITE_FLAG( 0, "separate_colour_plane_flag"); - } - - WRITE_UVLC( pcSPS->getPicWidthInLumaSamples (), "pic_width_in_luma_samples" ); - WRITE_UVLC( pcSPS->getPicHeightInLumaSamples(), "pic_height_in_luma_samples" ); +#if REPN_FORMAT_IN_VPS + if( pcSPS->getLayerId() > 0 ) + { + WRITE_FLAG( pcSPS->getUpdateRepFormatFlag(), "update_rep_format_flag" ); + } + if( pcSPS->getLayerId() == 0 || pcSPS->getUpdateRepFormatFlag() ) + { +#endif + WRITE_UVLC( pcSPS->getChromaFormatIdc (), "chroma_format_idc" ); + assert(pcSPS->getChromaFormatIdc () == 1); + // in the first version chroma_format_idc can only be equal to 1 (4:2:0) + if( pcSPS->getChromaFormatIdc () == 3 ) + { + WRITE_FLAG( 0, "separate_colour_plane_flag"); + } + + WRITE_UVLC( pcSPS->getPicWidthInLumaSamples (), "pic_width_in_luma_samples" ); + WRITE_UVLC( pcSPS->getPicHeightInLumaSamples(), "pic_height_in_luma_samples" ); +#if REPN_FORMAT_IN_VPS + } +#endif Window conf = pcSPS->getConformanceWindow(); @@ -437,7 +504,15 @@ } - WRITE_UVLC( pcSPS->getBitDepthY() - 8, "bit_depth_luma_minus8" ); - WRITE_UVLC( pcSPS->getBitDepthC() - 8, "bit_depth_chroma_minus8" ); - +#if REPN_FORMAT_IN_VPS + if( pcSPS->getLayerId() == 0 || pcSPS->getUpdateRepFormatFlag() ) + { + assert( pcSPS->getBitDepthY() >= 8 ); + assert( pcSPS->getBitDepthC() >= 8 ); +#endif + WRITE_UVLC( pcSPS->getBitDepthY() - 8, "bit_depth_luma_minus8" ); + WRITE_UVLC( pcSPS->getBitDepthC() - 8, "bit_depth_chroma_minus8" ); +#if REPN_FORMAT_IN_VPS + } +#endif WRITE_UVLC( pcSPS->getBitsForPOC()-4, "log2_max_pic_order_cnt_lsb_minus4" ); @@ -463,4 +538,9 @@ WRITE_UVLC( pcSPS->getQuadtreeTUMaxDepthIntra() - 1, "max_transform_hierarchy_depth_intra" ); WRITE_FLAG( pcSPS->getScalingListFlag() ? 1 : 0, "scaling_list_enabled_flag" ); + +#if IL_SL_SIGNALLING_N0371 + pcSPS->setSPS( pcSPS->getLayerId(), pcSPS ); +#endif + if(pcSPS->getScalingListFlag()) { @@ -471,5 +551,50 @@ printf("SPS\n"); #endif + +#if IL_SL_SIGNALLING_N0371 + m_pcSlice->getScalingList()->setLayerId( pcSPS->getLayerId() ); + + if( pcSPS->getLayerId() > 0 ) + { + WRITE_FLAG( pcSPS->getPredScalingListFlag() ? 1 : 0, "sps_pred_scaling_list_flag" ); + m_pcSlice->getScalingList()->setPredScalingListFlag( pcSPS->getPredScalingListFlag() ); + + if( pcSPS->getPredScalingListFlag() ) + { + + // The value of sps_scaling_list_ref_layer_id shall be in the range of 0 to 62, inclusive + assert( /*pcSPS->getScalingListRefLayerId() >= 0 &&*/ pcSPS->getScalingListRefLayerId() <= 62 ); + + // When avc_base_layer_flag is equal to 1, it is a requirement of bitstream conformance that the value of sps_scaling_list_ref_layer_id shall be greater than 0 + if( pcSPS->getVPS()->getAvcBaseLayerFlag() ) + { + assert( pcSPS->getScalingListRefLayerId() > 0 ); + } + + // It is a requirement of bitstream conformance that, when an SPS with nuh_layer_id equal to nuhLayerIdA is active for a layer with nuh_layer_id equal to nuhLayerIdB and + // sps_infer_scaling_list_flag in the SPS is equal to 1, sps_infer_scaling_list_flag shall be equal to 0 for the SPS that is active for the layer with nuh_layer_id equal to sps_scaling_list_ref_layer_id + assert( pcSPS->getSPS( pcSPS->getScalingListRefLayerId() )->getPredScalingListFlag() == false ); + + // It is a requirement of bitstream conformance that, when an SPS with nuh_layer_id equal to nuhLayerIdA is active for a layer with nuh_layer_id equal to nuhLayerIdB, + // the layer with nuh_layer_id equal to sps_scaling_list_ref_layer_id shall be a direct or indirect reference layer of the layer with nuh_layer_id equal to nuhLayerIdB + assert( pcSPS->getVPS()->getScalingListLayerDependency( pcSPS->getLayerId(), pcSPS->getScalingListRefLayerId() ) == true ); + + WRITE_UVLC( pcSPS->getScalingListRefLayerId(), "scaling_list_sps_ref_layer_id" ); + m_pcSlice->getScalingList()->setScalingListRefLayerId( pcSPS->getScalingListRefLayerId() ); + codeScalingList( m_pcSlice->getScalingList() ); + } + else + { + codeScalingList( m_pcSlice->getScalingList() ); + } + } + else + { codeScalingList( m_pcSlice->getScalingList() ); + } +#else + codeScalingList( m_pcSlice->getScalingList() ); +#endif + } } @@ -491,5 +616,5 @@ TComRPSList* rpsList = pcSPS->getRPSList(); TComReferencePictureSet* rps; - + WRITE_UVLC(rpsList->getNumberOfReferencePictureSets(), "num_short_term_ref_pic_sets" ); for(Int i=0; i < rpsList->getNumberOfReferencePictureSets(); i++) @@ -540,11 +665,11 @@ { // more syntax elements to be written here + +#if VERT_MV_CONSTRAINT + // Vertical MV component restriction is not used in SHVC CTC + WRITE_FLAG( 0, "inter_view_mv_vert_constraint_flag" ); +#endif #if SCALED_REF_LAYER_OFFSETS -#if SCALED_REF_LAYER_OFFSET_FLAG - WRITE_FLAG( pcSPS->getLayerId() > 0, "scaled_ref_layer_offset_present_flag" ); if( pcSPS->getLayerId() > 0 ) -#else - if( pcSPS->getLayerId() > 0 ) -#endif { WRITE_UVLC( pcSPS->getNumScaledRefLayerOffsets(), "num_scaled_ref_layer_offsets" ); @@ -593,5 +718,9 @@ WRITE_FLAG( pcVPS->getTemporalNestingFlag(), "vps_temporal_id_nesting_flag" ); assert (pcVPS->getMaxTLayers()>1||pcVPS->getTemporalNestingFlag()); +#if VPS_EXTN_OFFSET + WRITE_CODE( pcVPS->getExtensionOffset(), 16, "vps_extension_offset" ); +#else WRITE_CODE( 0xffff, 16, "vps_reserved_ffff_16bits" ); +#endif codePTL( pcVPS->getPTL(), true, pcVPS->getMaxTLayers() - 1 ); const Bool subLayerOrderingInfoPresentFlag = 1; @@ -676,6 +805,13 @@ #else WRITE_FLAG( 1, "vps_extension_flag" ); - codeVPSExtension(pcVPS); - WRITE_FLAG( 0, "vps_extension2_flag" ); // Flag value of 1 reserved + if(1) // Should be conditioned on the value of vps_extension_flag + { + while ( m_pcBitIf->getNumberOfWrittenBits() % 8 != 0 ) + { + WRITE_FLAG(1, "vps_extension_alignment_bit_equal_to_one"); + } + codeVPSExtension(pcVPS); + WRITE_FLAG( 0, "vps_extension2_flag" ); // Flag value of 1 reserved + } #endif //future extensions here.. @@ -737,4 +873,16 @@ } #endif +#if VIEW_ID_RELATED_SIGNALING + // if ( pcVPS->getNumViews() > 1 ) + // However, this is a bug in the text since, view_id_len_minus1 is needed to parse view_id_val. + { + WRITE_CODE( vps->getViewIdLenMinus1( ), 4, "view_id_len_minus1" ); + } + + for( i = 0; i < vps->getNumViews(); i++ ) + { + WRITE_CODE( vps->getViewIdVal( i ), vps->getViewIdLenMinus1( ) + 1, "view_id_val[i]" ); + } +#endif #if VPS_MOVE_DIR_DEPENDENCY_FLAG #if VPS_EXTN_DIRECT_REF_LAYERS @@ -750,10 +898,10 @@ #if JCTVC_M0203_INTERLAYER_PRED_IDC #if N0120_MAX_TID_REF_PRESENT_FLAG - WRITE_FLAG( vps->getMaxTidIlRefPicsPlus1PresentFlag(), "max_tid_il_ref_pics_plus1_present_flag"); - if (vps->getMaxTidIlRefPicsPlus1PresentFlag()) + WRITE_FLAG( vps->getMaxTidRefPresentFlag(), "max_tid_ref_present_flag"); + if (vps->getMaxTidRefPresentFlag()) { for( i = 0; i < vps->getMaxLayers() - 1; i++) { - WRITE_CODE(vps->getMaxSublayerForIlpPlus1(i), 3, "max_sublayer_for_ilp_plus1[i]" ); + WRITE_CODE(vps->getMaxTidIlRefPicsPlus1(i), 3, "max_tid_il_ref_pics_plus1[i]" ); } } @@ -761,5 +909,5 @@ for( i = 0; i < vps->getMaxLayers() - 1; i++) { - WRITE_CODE(vps->getMaxSublayerForIlpPlus1(i), 3, "max_sublayer_for_ilp_plus1[i]" ); + WRITE_CODE(vps->getMaxTidIlRefPicsPlus1(i), 3, "max_tid_il_ref_pics_plus1[i]" ); } #endif @@ -849,6 +997,35 @@ #endif #endif + +#if REPN_FORMAT_IN_VPS + WRITE_FLAG( vps->getRepFormatIdxPresentFlag(), "rep_format_idx_present_flag"); + + if( vps->getRepFormatIdxPresentFlag() ) + { + WRITE_CODE( vps->getVpsNumRepFormats() - 1, 4, "vps_num_rep_formats_minus1" ); + } + for(i = 0; i < vps->getVpsNumRepFormats(); i++) + { + // Read rep_format_structures + codeRepFormat( vps->getVpsRepFormat(i) ); + } + + if( vps->getRepFormatIdxPresentFlag() ) + { + for(i = 1; i < vps->getMaxLayers(); i++) + { + if( vps->getVpsNumRepFormats() > 1 ) + { + WRITE_CODE( vps->getVpsRepFormatIdx(i), 4, "vps_rep_format_idx[i]" ); + } + } + } +#endif + #if JCTVC_M0458_INTERLAYER_RPS_SIG WRITE_FLAG(vps->getMaxOneActiveRefLayerFlag(), "max_one_active_ref_layer_flag"); +#endif +#if N0147_IRAP_ALIGN_FLAG + WRITE_FLAG(vps->getCrossLayerIrapAlignFlag(), "cross_layer_irap_aligned_flag"); #endif #if !VPS_MOVE_DIR_DEPENDENCY_FLAG @@ -875,8 +1052,123 @@ } } + +#if IL_SL_SIGNALLING_N0371 + for(i = 1; i < vps->getMaxLayers(); i++) + { + for(j = 0; j < i; j++) + { + vps->setScalingListLayerDependency( i, j, vps->checkLayerDependency( i,j ) ); + } + } +#endif + #endif #if M0040_ADAPTIVE_RESOLUTION_CHANGE WRITE_FLAG(vps->getSingleLayerForNonIrapFlag(), "single_layer_for_non_irap_flag" ); #endif + +#if !VPS_VUI + WRITE_FLAG( 0, "vps_vui_present_flag" ); +#else + WRITE_FLAG( 1, "vps_vui_present_flag" ); + if(1) // Should be conditioned on the value of vps_vui_present_flag + { + while ( m_pcBitIf->getNumberOfWrittenBits() % 8 != 0 ) + { + WRITE_FLAG(1, "vps_vui_alignment_bit_equal_to_one"); + } + codeVPSVUI(vps); + } +#endif +} +#endif +#if REPN_FORMAT_IN_VPS +Void TEncCavlc::codeRepFormat ( RepFormat *repFormat ) +{ + WRITE_CODE( repFormat->getChromaFormatVpsIdc(), 2, "chroma_format_idc" ); + + if( repFormat->getChromaFormatVpsIdc() == 3 ) + { + WRITE_FLAG( repFormat->getSeparateColourPlaneVpsFlag(), "separate_colour_plane_flag"); + } + + WRITE_CODE ( repFormat->getPicWidthVpsInLumaSamples (), 16, "pic_width_in_luma_samples" ); + WRITE_CODE ( repFormat->getPicHeightVpsInLumaSamples(), 16, "pic_height_in_luma_samples" ); + + assert( repFormat->getBitDepthVpsLuma() >= 8 ); + assert( repFormat->getBitDepthVpsChroma() >= 8 ); + WRITE_CODE( repFormat->getBitDepthVpsLuma() - 8, 4, "bit_depth_luma_minus8" ); + WRITE_CODE( repFormat->getBitDepthVpsChroma() - 8, 4, "bit_depth_chroma_minus8" ); + +} +#endif +#if VPS_VUI +Void TEncCavlc::codeVPSVUI (TComVPS *vps) +{ + Int i,j; +#if VPS_VUI_BITRATE_PICRATE + WRITE_FLAG( vps->getBitRatePresentVpsFlag(), "bit_rate_present_vps_flag" ); + WRITE_FLAG( vps->getPicRatePresentVpsFlag(), "pic_rate_present_vps_flag" ); + + if( vps->getBitRatePresentVpsFlag() || vps->getPicRatePresentVpsFlag() ) + { + for( i = 0; i < vps->getNumLayerSets(); i++ ) + { + for( j = 0; j < vps->getMaxTLayers(); j++ ) + { + if( vps->getBitRatePresentVpsFlag() ) + { + WRITE_FLAG( vps->getBitRatePresentFlag( i, j), "bit_rate_present_vps_flag[i][j]" ); + } + if( vps->getPicRatePresentVpsFlag() ) + { + WRITE_FLAG( vps->getPicRatePresentFlag( i, j), "pic_rate_present_vps_flag[i][j]" ); + } + if( vps->getBitRatePresentFlag(i, j) ) + { + WRITE_CODE( vps->getAvgBitRate( i, j ), 16, "avg_bit_rate[i][j]" ); + WRITE_CODE( vps->getAvgBitRate( i, j ), 16, "max_bit_rate[i][j]" ); + } + if( vps->getPicRatePresentFlag(i, j) ) + { + WRITE_CODE( vps->getConstPicRateIdc( i, j), 2 , "constant_pic_rate_idc[i][j]" ); + WRITE_CODE( vps->getConstPicRateIdc( i, j), 16, "avg_pic_rate[i][j]" ); + } + } + } + } +#endif +#if TILE_BOUNDARY_ALIGNED_FLAG + for(i = 1; i < vps->getMaxLayers(); i++) + { + for(j = 0; j < vps->getNumDirectRefLayers(vps->getLayerIdInNuh(i)); j++) + { + WRITE_FLAG( vps->getTileBoundariesAlignedFlag(i,j) ? 1 : 0 , "tile_boundaries_aligned_flag[i][j]" ); + } + } +#endif +#if N0160_VUI_EXT_ILP_REF + WRITE_FLAG( vps->getNumIlpRestrictedRefLayers() ? 1 : 0 , "num_ilp_restricted_ref_layers" ); + if( vps->getNumIlpRestrictedRefLayers()) + { + for(i = 1; i < vps->getMaxLayers(); i++) + { + for(j = 0; j < vps->getNumDirectRefLayers(vps->getLayerIdInNuh(i)); j++) + { + WRITE_UVLC(vps->getMinSpatialSegmentOffsetPlus1( i, j), "min_spatial_segment_offset_plus1[i][j]"); + + if( vps->getMinSpatialSegmentOffsetPlus1(i,j ) > 0 ) + { + WRITE_FLAG( vps->getCtuBasedOffsetEnabledFlag( i, j) ? 1 : 0 , "ctu_based_offset_enabled_flag[i][j]" ); + + if(vps->getCtuBasedOffsetEnabledFlag(i,j)) + { + WRITE_UVLC(vps->getMinHorizontalCtuOffsetPlus1( i, j), "min_horizontal_ctu_offset_plus1[i][j]"); + } + } + } + } + } +#endif } #endif @@ -927,4 +1219,23 @@ { +#if POC_RESET_FLAG + Int iBits = 0; + if( pcSlice->getPPS()->getNumExtraSliceHeaderBits() > iBits ) + { + WRITE_FLAG( pcSlice->getPocResetFlag(), "poc_reset_flag" ); + iBits++; + } + if( pcSlice->getPPS()->getNumExtraSliceHeaderBits() > iBits ) + { + assert(!!"discardable_flag"); + WRITE_FLAG(pcSlice->getDiscardableFlag(), "discardable_flag"); + iBits++; + } + for ( ; iBits < pcSlice->getPPS()->getNumExtraSliceHeaderBits(); iBits++) + { + assert(!!"slice_reserved_undetermined_flag[]"); + WRITE_FLAG(0, "slice_reserved_undetermined_flag[]"); + } +#else #if SH_DISCARDABLE_FLAG if (pcSlice->getPPS()->getNumExtraSliceHeaderBits()>0) @@ -945,4 +1256,5 @@ } #endif +#endif WRITE_UVLC( pcSlice->getSliceType(), "slice_type" ); @@ -953,13 +1265,39 @@ } +#if REPN_FORMAT_IN_VPS + // in the first version chroma_format_idc is equal to one, thus colour_plane_id will not be present + assert( pcSlice->getChromaFormatIdc() == 1 ); +#else // in the first version chroma_format_idc is equal to one, thus colour_plane_id will not be present assert (pcSlice->getSPS()->getChromaFormatIdc() == 1 ); +#endif // if( separate_colour_plane_flag == 1 ) // colour_plane_id u(2) +#if N0065_LAYER_POC_ALIGNMENT + if( pcSlice->getLayerId() > 0 || !pcSlice->getIdrPicFlag() ) +#else if( !pcSlice->getIdrPicFlag() ) - { - Int picOrderCntLSB = (pcSlice->getPOC()-pcSlice->getLastIDR()+(1<getSPS()->getBitsForPOC()))%(1<getSPS()->getBitsForPOC()); +#endif + { +#if POC_RESET_FLAG + Int picOrderCntLSB; + if( !pcSlice->getPocResetFlag() ) + { + picOrderCntLSB = (pcSlice->getPOC()-pcSlice->getLastIDR()+(1<getSPS()->getBitsForPOC())) & ((1<getSPS()->getBitsForPOC())-1); + } + else + { + picOrderCntLSB = (pcSlice->getPocValueBeforeReset()-pcSlice->getLastIDR()+(1<getSPS()->getBitsForPOC())) & ((1<getSPS()->getBitsForPOC())-1); + } +#else + Int picOrderCntLSB = (pcSlice->getPOC()-pcSlice->getLastIDR()+(1<getSPS()->getBitsForPOC())) & ((1<getSPS()->getBitsForPOC())-1); +#endif WRITE_CODE( picOrderCntLSB, pcSlice->getSPS()->getBitsForPOC(), "pic_order_cnt_lsb"); + +#if N0065_LAYER_POC_ALIGNMENT + if( !pcSlice->getIdrPicFlag() ) + { +#endif TComReferencePictureSet* rps = pcSlice->getRPS(); @@ -1076,4 +1414,7 @@ WRITE_FLAG( pcSlice->getEnableTMVPFlag() ? 1 : 0, "slice_temporal_mvp_enable_flag" ); } +#if N0065_LAYER_POC_ALIGNMENT + } +#endif } @@ -1224,5 +1565,5 @@ if ( pcSlice->getEnableTMVPFlag() ) { -#if REF_IDX_FRAMEWORK && M0457_COL_PICTURE_SIGNALING && !REMOVE_COL_PICTURE_SIGNALING +#if SVC_EXTENSION && M0457_COL_PICTURE_SIGNALING && !REMOVE_COL_PICTURE_SIGNALING if ( !pcSlice->getIdrPicFlag() && pcSlice->getLayerId() > 0 && pcSlice->getActiveNumILRRefIdx() > 0 && pcSlice->getNumMotionPredRefLayers() > 0 ) { @@ -1247,5 +1588,5 @@ WRITE_UVLC( pcSlice->getColRefIdx(), "collocated_ref_idx" ); } -#if REF_IDX_FRAMEWORK && M0457_COL_PICTURE_SIGNALING && !REMOVE_COL_PICTURE_SIGNALING +#if SVC_EXTENSION && M0457_COL_PICTURE_SIGNALING && !REMOVE_COL_PICTURE_SIGNALING } #endif @@ -1554,5 +1895,9 @@ Int iDQp = pcCU->getQP( uiAbsPartIdx ) - pcCU->getRefQP( uiAbsPartIdx ); +#if REPN_FORMAT_IN_VPS + Int qpBdOffsetY = pcCU->getSlice()->getQpBDOffsetY(); +#else Int qpBdOffsetY = pcCU->getSlice()->getSPS()->getQpBDOffsetY(); +#endif iDQp = (iDQp + 78 + qpBdOffsetY + (qpBdOffsetY/2)) % (52 + qpBdOffsetY) - 26 - (qpBdOffsetY/2); @@ -1682,4 +2027,33 @@ startBit = m_pcBitIf->getNumberOfWrittenBits(); #endif + +#if IL_SL_SIGNALLING_N0371 + if( scalingList->getLayerId() > 0 && scalingList->getPredScalingListFlag() ) + { + scalingListPredModeFlag = scalingList->checkPredMode( sizeId, listId ); + WRITE_FLAG( scalingListPredModeFlag, "scaling_list_pred_mode_flag" ); + if(!scalingListPredModeFlag)// Copy Mode + { + WRITE_UVLC( (Int)listId - (Int)scalingList->getRefMatrixId (sizeId,listId), "scaling_list_pred_matrix_id_delta"); + } + else// DPCM Mode + { + xCodeScalingList(scalingList, sizeId, listId); + } + } + else + { + scalingListPredModeFlag = scalingList->checkPredMode( sizeId, listId ); + WRITE_FLAG( scalingListPredModeFlag, "scaling_list_pred_mode_flag" ); + if(!scalingListPredModeFlag)// Copy Mode + { + WRITE_UVLC( (Int)listId - (Int)scalingList->getRefMatrixId (sizeId,listId), "scaling_list_pred_matrix_id_delta"); + } + else// DPCM Mode + { + xCodeScalingList(scalingList, sizeId, listId); + } + } +#else scalingListPredModeFlag = scalingList->checkPredMode( sizeId, listId ); WRITE_FLAG( scalingListPredModeFlag, "scaling_list_pred_mode_flag" ); @@ -1692,7 +2066,10 @@ xCodeScalingList(scalingList, sizeId, listId); } +#endif + #if SCALING_LIST_OUTPUT_RESULT printf("Matrix [%d][%d] Bit %d\n",sizeId,listId,m_pcBitIf->getNumberOfWrittenBits() - startBit); #endif + } } @@ -1714,11 +2091,49 @@ Int data; Int *src = scalingList->getScalingListAddress(sizeId, listId); + if( sizeId > SCALING_LIST_8x8 ) { +#if IL_SL_SIGNALLING_N0371 + if( scalingList->getLayerId() > 0 && scalingList->getPredScalingListFlag() ) + { + ref_scalingListDC[scalingList->getLayerId()][sizeId][listId] = scalingList->getScalingListDC(sizeId,listId); + scalingList->setScalingListDC(sizeId,listId,ref_scalingListDC[scalingList->getScalingListRefLayerId()][sizeId][listId]); + } + else + { + WRITE_SVLC( scalingList->getScalingListDC(sizeId,listId) - 8, "scaling_list_dc_coef_minus8"); + nextCoef = scalingList->getScalingListDC(sizeId,listId); + ref_scalingListDC[scalingList->getLayerId()][sizeId][listId] = scalingList->getScalingListDC(sizeId,listId); + } +#else WRITE_SVLC( scalingList->getScalingListDC(sizeId,listId) - 8, "scaling_list_dc_coef_minus8"); nextCoef = scalingList->getScalingListDC(sizeId,listId); +#endif } for(Int i=0;igetLayerId() > 0 && scalingList->getPredScalingListFlag() ) + { + ref_scalingListCoef[scalingList->getLayerId()][sizeId][listId][i] = src[scan[i]]; + src[scan[i]] = ref_scalingListCoef[scalingList->getScalingListRefLayerId()][sizeId][listId][i]; + } + else + { + data = src[scan[i]] - nextCoef; + ref_scalingListCoef[scalingList->getLayerId()][sizeId][listId][i] = src[scan[i]]; + nextCoef = src[scan[i]]; + if(data > 127) + { + data = data - 256; + } + if(data < -128) + { + data = data + 256; + } + + WRITE_SVLC( data, "scaling_list_delta_coef"); + } +#else data = src[scan[i]] - nextCoef; nextCoef = src[scan[i]]; @@ -1733,4 +2148,5 @@ WRITE_SVLC( data, "scaling_list_delta_coef"); +#endif } } @@ -1738,5 +2154,5 @@ { // Bool state = true, state2 = false; - Int lsb = ltrpPOC % (1<getSPS()->getBitsForPOC()); + Int lsb = ltrpPOC & ((1<getSPS()->getBitsForPOC())-1); for (Int k = 0; k < pcSlice->getSPS()->getNumLongTermRefPicSPS(); k++) { Index: trunk/source/Lib/TLibEncoder/TEncCavlc.h =================================================================== --- trunk/source/Lib/TLibEncoder/TEncCavlc.h (revision 352) +++ trunk/source/Lib/TLibEncoder/TEncCavlc.h (revision 442) @@ -87,4 +87,11 @@ Void codeVPSExtension ( TComVPS* pcVPS ); #endif + +#if VPS_VUI + Void codeVPSVUI (TComVPS *vps); +#endif +#if REPN_FORMAT_IN_VPS + Void codeRepFormat ( RepFormat *repFormat ); +#endif Void codeVUI ( TComVUI *pcVUI, TComSPS* pcSPS ); Void codeSPS ( TComSPS* pcSPS ); Index: trunk/source/Lib/TLibEncoder/TEncCfg.h =================================================================== --- trunk/source/Lib/TLibEncoder/TEncCfg.h (revision 352) +++ trunk/source/Lib/TLibEncoder/TEncCfg.h (revision 442) @@ -69,4 +69,8 @@ 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) @@ -83,12 +87,40 @@ , 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 } }; std::istringstream &operator>>(std::istringstream &in, GOPEntry &entry); //input + +#if REPN_FORMAT_IN_VPS +struct RepFormatCfg +{ + Int m_chromaFormatIdc; + Bool m_separateColourPlaneFlag; + Int m_picWidthInLumaSamples; + Int m_picHeightInLumaSamples; + Int m_bitDepthLuma; + Int m_bitDepthChroma; + RepFormatCfg() + : m_chromaFormatIdc (CHROMA_420) + , m_separateColourPlaneFlag (0) + , m_picWidthInLumaSamples (352) + , m_picHeightInLumaSamples (288) + , m_bitDepthLuma (8) + , m_bitDepthChroma (8) + {} +}; +std::istringstream &operator>>(std::istringstream &in, RepFormatCfg &repFormatCfg); +#endif + //! \ingroup TLibEncoder //! \{ @@ -155,4 +187,7 @@ #endif #endif +#if N0120_MAX_TID_REF_CFG + Int m_maxTidIlRefPicsPlus1; +#endif //======= Transform ============= UInt m_uiQuadtreeTULog2MaxSize; @@ -283,4 +318,12 @@ Int m_SOPDescriptionSEIEnabled; Int m_scalableNestingSEIEnabled; +#if N0383_IL_CONSTRAINED_TILE_SETS_SEI + Bool m_interLayerConstrainedTileSetsSEIEnabled; + UInt m_ilNumSetsInMessage; + Bool m_skippedTileSetPresentFlag; + UInt m_topLeftTileIndex[1024]; + UInt m_bottomRightTileIndex[1024]; + UInt m_ilcIdc[1024]; +#endif //====== Weighted Prediction ======== Bool m_useWeightedPred; //< Use of Weighting Prediction (P_SLICE) @@ -353,10 +396,8 @@ UInt m_layerId; UInt m_numLayer; -#endif -#if REF_IDX_FRAMEWORK - Int m_elRapSliceBEnabled; -#endif + Int m_elRapSliceBEnabled; #if M0040_ADAPTIVE_RESOLUTION_CHANGE - Int m_adaptiveResolutionChange; + Int m_adaptiveResolutionChange; +#endif #endif @@ -438,4 +479,8 @@ #endif #endif +#if N0120_MAX_TID_REF_CFG + Int getMaxTidIlRefPicsPlus1 () { return m_maxTidIlRefPicsPlus1; } + Void setMaxTidIlRefPicsPlus1 (Int num) { m_maxTidIlRefPicsPlus1 = num; } +#endif //======== Transform ============= Void setQuadtreeTULog2MaxSize ( UInt u ) { m_uiQuadtreeTULog2MaxSize = u; } @@ -720,4 +765,36 @@ Void setScalableNestingSEIEnabled(Int b) { m_scalableNestingSEIEnabled = b; } Int getScalableNestingSEIEnabled() { return m_scalableNestingSEIEnabled; } +#if N0383_IL_CONSTRAINED_TILE_SETS_SEI + Void setInterLayerConstrainedTileSetsSEIEnabled(Bool b) { m_interLayerConstrainedTileSetsSEIEnabled = b; } + Bool getInterLayerConstrainedTileSetsSEIEnabled() { return m_interLayerConstrainedTileSetsSEIEnabled; } + Void setIlNumSetsInMessage(UInt b) { m_ilNumSetsInMessage = b; } + Int getIlNumSetsInMessage() { return m_ilNumSetsInMessage; } + Void setSkippedTileSetPresentFlag(Bool b) { m_skippedTileSetPresentFlag = b; } + Bool getSkippedTileSetPresentFlag() { return m_skippedTileSetPresentFlag; } + Void setTopLeftTileIndex(UInt *b) + { + for (UInt i = 0; i < m_ilNumSetsInMessage; i++) + { + m_topLeftTileIndex[i] = b[i]; + } + } + UInt getTopLeftTileIndex(UInt b) { return m_topLeftTileIndex[b]; } + Void setBottomRightTileIndex(UInt *b) + { + for (UInt i = 0; i < m_ilNumSetsInMessage; i++) + { + m_bottomRightTileIndex[i] = b[i]; + } + } + UInt getBottomRightTileIndex(UInt b) { return m_bottomRightTileIndex[b]; } + Void setIlcIdc(UInt *b) + { + for (UInt i = 0; i < m_ilNumSetsInMessage; i++) + { + m_ilcIdc[i] = b[i]; + } + } + UInt getIlcIdc(UInt b) { return m_ilcIdc[b]; } +#endif Void setUseWP ( Bool b ) { m_useWeightedPred = b; } Void setWPBiPred ( Bool b ) { m_useWeightedBiPred = b; } @@ -858,13 +935,11 @@ Void setConformanceMode (Int mode) { m_conformanceMode = mode; } Void setConformanceWindow(Window& conformanceWindow ) { m_conformanceWindow = conformanceWindow; } -#endif -#if REF_IDX_FRAMEWORK Void setElRapSliceTypeB(Int bEnabled) {m_elRapSliceBEnabled = bEnabled;} Int getElRapSliceTypeB() {return m_elRapSliceBEnabled;} -#endif #if M0040_ADAPTIVE_RESOLUTION_CHANGE Void setAdaptiveResolutionChange(Int x) { m_adaptiveResolutionChange = x; } Int getAdaptiveResolutionChange() { return m_adaptiveResolutionChange; } #endif +#endif }; Index: trunk/source/Lib/TLibEncoder/TEncCu.cpp =================================================================== --- trunk/source/Lib/TLibEncoder/TEncCu.cpp (revision 352) +++ trunk/source/Lib/TLibEncoder/TEncCu.cpp (revision 442) @@ -379,9 +379,4 @@ m_ppcOrigYuv[uiDepth]->copyFromPicYuv( pcPic->getPicYuvOrg(), rpcBestCU->getAddr(), rpcBestCU->getZorderIdxInCU() ); - // variables for fast encoder decision - Bool bEarlySkip = false; - Bool bTrySplit = true; - Double fRD_Skip = MAX_DOUBLE; - // variable for Early CU determination Bool bSubBranch = true; @@ -390,15 +385,4 @@ Bool doNotBlockPu = true; Bool earlyDetectionSkipMode = false; - - Bool bTrySplitDQP = true; - - static Double afCost[ MAX_CU_DEPTH ]; - static Int aiNum [ MAX_CU_DEPTH ]; - - if ( rpcBestCU->getAddr() == 0 ) - { - ::memset( afCost, 0, sizeof( afCost ) ); - ::memset( aiNum, 0, sizeof( aiNum ) ); - } Bool bBoundary = false; @@ -412,11 +396,20 @@ Int iMaxQP; Bool isAddLowestQP = false; +#if REPN_FORMAT_IN_VPS + Int lowestQP = -rpcTempCU->getSlice()->getQpBDOffsetY(); +#else Int lowestQP = -rpcTempCU->getSlice()->getSPS()->getQpBDOffsetY(); +#endif if( (g_uiMaxCUWidth>>uiDepth) >= rpcTempCU->getSlice()->getPPS()->getMinCuDQPSize() ) { Int idQP = m_pcEncCfg->getMaxDeltaQP(); +#if REPN_FORMAT_IN_VPS iMinQP = Clip3( -rpcTempCU->getSlice()->getSPS()->getQpBDOffsetY(), MAX_QP, iBaseQP-idQP ); iMaxQP = Clip3( -rpcTempCU->getSlice()->getSPS()->getQpBDOffsetY(), MAX_QP, iBaseQP+idQP ); +#else + iMinQP = Clip3( -rpcTempCU->getSlice()->getSPS()->getQpBDOffsetY(), MAX_QP, iBaseQP-idQP ); + iMaxQP = Clip3( -rpcTempCU->getSlice()->getSPS()->getQpBDOffsetY(), MAX_QP, iBaseQP+idQP ); +#endif if ( (rpcTempCU->getSlice()->getSPS()->getUseLossless()) && (lowestQP < iMinQP) && rpcTempCU->getSlice()->getPPS()->getUseDQP() ) { @@ -450,5 +443,9 @@ Bool bSliceStart = pcSlice->getSliceSegmentCurStartCUAddr()>rpcTempCU->getSCUAddr()&&pcSlice->getSliceSegmentCurStartCUAddr()getSCUAddr()+rpcTempCU->getTotalNumPart(); Bool bSliceEnd = (pcSlice->getSliceSegmentCurEndCUAddr()>rpcTempCU->getSCUAddr()&&pcSlice->getSliceSegmentCurEndCUAddr()getSCUAddr()+rpcTempCU->getTotalNumPart()); +#if REPN_FORMAT_IN_VPS + Bool bInsidePicture = ( uiRPelX < rpcBestCU->getSlice()->getPicWidthInLumaSamples() ) && ( uiBPelY < rpcBestCU->getSlice()->getPicHeightInLumaSamples() ); +#else Bool bInsidePicture = ( uiRPelX < rpcBestCU->getSlice()->getSPS()->getPicWidthInLumaSamples() ) && ( uiBPelY < rpcBestCU->getSlice()->getSPS()->getPicHeightInLumaSamples() ); +#endif // We need to split, so don't try these modes. if(!bSliceEnd && !bSliceStart && bInsidePicture ) @@ -458,11 +455,17 @@ if (rpcBestCU->getLayerId() > 0) { - if(pcSlice->getSliceType() == P_SLICE && pcSlice->getNumRefIdx(REF_PIC_LIST_0) == pcSlice->getActiveNumILRRefIdx()) - testInter = false; - if(pcSlice->getSliceType() == B_SLICE && pcSlice->getNumRefIdx(REF_PIC_LIST_0) == pcSlice->getActiveNumILRRefIdx() && pcSlice->getNumRefIdx(REF_PIC_LIST_1) == pcSlice->getActiveNumILRRefIdx()) - testInter = false; + if(pcSlice->getSliceType() == P_SLICE && pcSlice->getNumRefIdx(REF_PIC_LIST_0) == pcSlice->getActiveNumILRRefIdx()) + { + testInter = false; + } + if(pcSlice->getSliceType() == B_SLICE && pcSlice->getNumRefIdx(REF_PIC_LIST_0) == pcSlice->getActiveNumILRRefIdx() && pcSlice->getNumRefIdx(REF_PIC_LIST_1) == pcSlice->getActiveNumILRRefIdx()) + { + testInter = false; + } #if M0457_IL_SAMPLE_PRED_ONLY_FLAG - if( pcSlice->getInterLayerSamplePredOnlyFlag() ) - testInter = false; + if( pcSlice->getInterLayerSamplePredOnlyFlag() ) + { + testInter = false; + } #endif } @@ -474,8 +477,4 @@ iQP = lowestQP; } - // variables for fast encoder decision - bEarlySkip = false; - bTrySplit = true; - fRD_Skip = MAX_DOUBLE; rpcTempCU->initEstData( uiDepth, iQP ); @@ -496,49 +495,23 @@ xCheckRDCostMerge2Nx2N( rpcBestCU, rpcTempCU, &earlyDetectionSkipMode );//by Merge for inter_2Nx2N rpcTempCU->initEstData( uiDepth, iQP ); - - // fast encoder decision for early skip - if ( m_pcEncCfg->getUseFastEnc() ) - { - Int iIdx = g_aucConvertToBit[ rpcBestCU->getWidth(0) ]; - if ( aiNum [ iIdx ] > 5 && fRD_Skip < EARLY_SKIP_THRES*afCost[ iIdx ]/aiNum[ iIdx ] ) - { - bEarlySkip = true; - bTrySplit = false; - } - } + #if (ENCODER_FAST_MODE == 2) if (testInter) { #endif - if(!m_pcEncCfg->getUseEarlySkipDetection()) { // 2Nx2N, NxN - if ( !bEarlySkip ) + xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_2Nx2N ); rpcTempCU->initEstData( uiDepth, iQP ); + if(m_pcEncCfg->getUseCbfFastMode()) { - xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_2Nx2N ); rpcTempCU->initEstData( uiDepth, iQP ); - if(m_pcEncCfg->getUseCbfFastMode()) - { - doNotBlockPu = rpcBestCU->getQtRootCbf( 0 ) != 0; - } + doNotBlockPu = rpcBestCU->getQtRootCbf( 0 ) != 0; } } #if (ENCODER_FAST_MODE == 2) - } -#endif - - } - - if( (g_uiMaxCUWidth>>uiDepth) >= rpcTempCU->getSlice()->getPPS()->getMinCuDQPSize() ) - { - if(iQP == iBaseQP) - { - bTrySplitDQP = bTrySplit; - } - } - else - { - bTrySplitDQP = bTrySplit; - } + } +#endif + } + if (isAddLowestQP && (iQP == lowestQP)) { @@ -567,5 +540,5 @@ // do inter modes, NxN, 2NxN, and Nx2N #if (ENCODER_FAST_MODE) - if( rpcBestCU->getSlice()->getSliceType() != I_SLICE && testInter ) + if( rpcBestCU->getSlice()->getSliceType() != I_SLICE && testInter ) #else if( rpcBestCU->getSlice()->getSliceType() != I_SLICE ) @@ -573,13 +546,10 @@ { // 2Nx2N, NxN - if ( !bEarlySkip ) + if(!( (rpcBestCU->getWidth(0)==8) && (rpcBestCU->getHeight(0)==8) )) { - if(!( (rpcBestCU->getWidth(0)==8) && (rpcBestCU->getHeight(0)==8) )) + if( uiDepth == g_uiMaxCUDepth - g_uiAddCUDepth && doNotBlockPu) { - if( uiDepth == g_uiMaxCUDepth - g_uiAddCUDepth && doNotBlockPu) - { - xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_NxN ); - rpcTempCU->initEstData( uiDepth, iQP ); - } + xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_NxN ); + rpcTempCU->initEstData( uiDepth, iQP ); } } @@ -721,6 +691,4 @@ // do normal intra modes - if ( !bEarlySkip ) - { // speedup for inter frames #if (ENCODER_FAST_MODE) @@ -748,5 +716,4 @@ } } - } // test PCM @@ -790,15 +757,4 @@ rpcBestCU->getTotalCost() = m_pcRdCost->calcRdCost( rpcBestCU->getTotalBits(), rpcBestCU->getTotalDistortion() ); - // accumulate statistics for early skip - if ( m_pcEncCfg->getUseFastEnc() ) - { - if ( rpcBestCU->isSkipped(0) ) - { - Int iIdx = g_aucConvertToBit[ rpcBestCU->getWidth(0) ]; - afCost[ iIdx ] += rpcBestCU->getTotalCost(); - aiNum [ iIdx ] ++; - } - } - // Early CU determination if( m_pcEncCfg->getUseEarlyCU() && rpcBestCU->isSkipped(0) ) @@ -827,6 +783,11 @@ { Int idQP = m_pcEncCfg->getMaxDeltaQP(); +#if REPN_FORMAT_IN_VPS + iMinQP = Clip3( -rpcTempCU->getSlice()->getQpBDOffsetY(), MAX_QP, iBaseQP-idQP ); + iMaxQP = Clip3( -rpcTempCU->getSlice()->getQpBDOffsetY(), MAX_QP, iBaseQP+idQP ); +#else iMinQP = Clip3( -rpcTempCU->getSlice()->getSPS()->getQpBDOffsetY(), MAX_QP, iBaseQP-idQP ); iMaxQP = Clip3( -rpcTempCU->getSlice()->getSPS()->getQpBDOffsetY(), MAX_QP, iBaseQP+idQP ); +#endif if ( (rpcTempCU->getSlice()->getSPS()->getUseLossless()) && (lowestQP < iMinQP) && rpcTempCU->getSlice()->getPPS()->getUseDQP() ) { @@ -878,5 +839,5 @@ // further split - if( bSubBranch && bTrySplitDQP && uiDepth < g_uiMaxCUDepth - g_uiAddCUDepth ) + if( bSubBranch && uiDepth < g_uiMaxCUDepth - g_uiAddCUDepth ) { UChar uhNextDepth = uiDepth+1; @@ -890,5 +851,9 @@ Bool bInSlice = pcSubBestPartCU->getSCUAddr()+pcSubBestPartCU->getTotalNumPart()>pcSlice->getSliceSegmentCurStartCUAddr()&&pcSubBestPartCU->getSCUAddr()getSliceSegmentCurEndCUAddr(); +#if REPN_FORMAT_IN_VPS + if(bInSlice && ( pcSubBestPartCU->getCUPelX() < pcSlice->getPicWidthInLumaSamples() ) && ( pcSubBestPartCU->getCUPelY() < pcSlice->getPicHeightInLumaSamples() ) ) +#else if(bInSlice && ( pcSubBestPartCU->getCUPelX() < pcSlice->getSPS()->getPicWidthInLumaSamples() ) && ( pcSubBestPartCU->getCUPelY() < pcSlice->getSPS()->getPicHeightInLumaSamples() ) ) +#endif { if( m_bUseSBACRD ) @@ -1038,6 +1003,11 @@ UInt uiPosX = ( uiExternalAddress % pcPic->getFrameWidthInCU() ) * g_uiMaxCUWidth+ g_auiRasterToPelX[ g_auiZscanToRaster[uiInternalAddress] ]; UInt uiPosY = ( uiExternalAddress / pcPic->getFrameWidthInCU() ) * g_uiMaxCUHeight+ g_auiRasterToPelY[ g_auiZscanToRaster[uiInternalAddress] ]; +#if REPN_FORMAT_IN_VPS + UInt uiWidth = pcSlice->getPicWidthInLumaSamples(); + UInt uiHeight = pcSlice->getPicHeightInLumaSamples(); +#else UInt uiWidth = pcSlice->getSPS()->getPicWidthInLumaSamples(); UInt uiHeight = pcSlice->getSPS()->getPicHeightInLumaSamples(); +#endif while(uiPosX>=uiWidth||uiPosY>=uiHeight) { @@ -1136,5 +1106,9 @@ iQpOffset = Int(floor( dQpOffset + 0.49999 )); } +#if REPN_FORMAT_IN_VPS + return Clip3(-pcCU->getSlice()->getQpBDOffsetY(), MAX_QP, iBaseQp+iQpOffset ); +#else return Clip3(-pcCU->getSlice()->getSPS()->getQpBDOffsetY(), MAX_QP, iBaseQp+iQpOffset ); +#endif } @@ -1160,5 +1134,9 @@ pcSlice->getSliceSegmentCurStartCUAddr() < pcPic->getPicSym()->getInverseCUOrderMap(pcCU->getAddr())*pcCU->getPic()->getNumPartInCU()+uiAbsPartIdx+( pcPic->getNumPartInCU() >> (uiDepth<<1) ); // We need to split, so don't try these modes. +#if REPN_FORMAT_IN_VPS + if(!bSliceStart&&( uiRPelX < pcSlice->getPicWidthInLumaSamples() ) && ( uiBPelY < pcSlice->getPicHeightInLumaSamples() ) ) +#else if(!bSliceStart&&( uiRPelX < pcSlice->getSPS()->getPicWidthInLumaSamples() ) && ( uiBPelY < pcSlice->getSPS()->getPicHeightInLumaSamples() ) ) +#endif { m_pcEntropyCoder->encodeSplitFlag( pcCU, uiAbsPartIdx, uiDepth ); @@ -1181,5 +1159,9 @@ uiTPelY = pcCU->getCUPelY() + g_auiRasterToPelY[ g_auiZscanToRaster[uiAbsPartIdx] ]; Bool bInSlice = pcCU->getSCUAddr()+uiAbsPartIdx+uiQNumParts>pcSlice->getSliceSegmentCurStartCUAddr()&&pcCU->getSCUAddr()+uiAbsPartIdxgetSliceSegmentCurEndCUAddr(); +#if REPN_FORMAT_IN_VPS + if(bInSlice&&( uiLPelX < pcSlice->getPicWidthInLumaSamples() ) && ( uiTPelY < pcSlice->getPicHeightInLumaSamples() ) ) +#else if(bInSlice&&( uiLPelX < pcSlice->getSPS()->getPicWidthInLumaSamples() ) && ( uiTPelY < pcSlice->getSPS()->getPicHeightInLumaSamples() ) ) +#endif { xEncodeCU( pcCU, uiAbsPartIdx, uiDepth+1 ); @@ -1706,5 +1688,9 @@ Bool bSliceEnd = pcSlice->getSliceSegmentCurEndCUAddr() > rpcPic->getPicSym()->getInverseCUOrderMap(pcCU->getAddr())*pcCU->getPic()->getNumPartInCU()+uiAbsPartIdx && pcSlice->getSliceSegmentCurEndCUAddr() < rpcPic->getPicSym()->getInverseCUOrderMap(pcCU->getAddr())*pcCU->getPic()->getNumPartInCU()+uiAbsPartIdx+( pcCU->getPic()->getNumPartInCU() >> (uiDepth<<1) ); +#if REPN_FORMAT_IN_VPS + if(!bSliceEnd && !bSliceStart && ( uiRPelX < pcSlice->getPicWidthInLumaSamples() ) && ( uiBPelY < pcSlice->getPicHeightInLumaSamples() ) ) +#else if(!bSliceEnd && !bSliceStart && ( uiRPelX < pcSlice->getSPS()->getPicWidthInLumaSamples() ) && ( uiBPelY < pcSlice->getSPS()->getPicHeightInLumaSamples() ) ) +#endif { UInt uiAbsPartIdxInRaster = g_auiZscanToRaster[uiAbsPartIdx]; @@ -1727,5 +1713,9 @@ Bool bInSlice = rpcPic->getPicSym()->getInverseCUOrderMap(pcCU->getAddr())*pcCU->getPic()->getNumPartInCU()+uiAbsPartIdx+uiQNumParts > pcSlice->getSliceSegmentCurStartCUAddr() && rpcPic->getPicSym()->getInverseCUOrderMap(pcCU->getAddr())*pcCU->getPic()->getNumPartInCU()+uiAbsPartIdx < pcSlice->getSliceSegmentCurEndCUAddr(); +#if REPN_FORMAT_IN_VPS + if(bInSlice&&( uiSubCULPelX < pcSlice->getPicWidthInLumaSamples() ) && ( uiSubCUTPelY < pcSlice->getPicHeightInLumaSamples() ) ) +#else if(bInSlice&&( uiSubCULPelX < pcSlice->getSPS()->getPicWidthInLumaSamples() ) && ( uiSubCUTPelY < pcSlice->getSPS()->getPicHeightInLumaSamples() ) ) +#endif { xCopyYuv2Pic( rpcPic, uiCUAddr, uiAbsPartIdx, uiDepth+1, uiSrcDepth, pcCU, uiSubCULPelX, uiSubCUTPelY ); // Copy Yuv data to picture Yuv Index: trunk/source/Lib/TLibEncoder/TEncGOP.cpp =================================================================== --- trunk/source/Lib/TLibEncoder/TEncGOP.cpp (revision 352) +++ trunk/source/Lib/TLibEncoder/TEncGOP.cpp (revision 442) @@ -307,4 +307,43 @@ } +#if N0383_IL_CONSTRAINED_TILE_SETS_SEI +SEIInterLayerConstrainedTileSets* TEncGOP::xCreateSEIInterLayerConstrainedTileSets() +{ + SEIInterLayerConstrainedTileSets *seiInterLayerConstrainedTileSets = new SEIInterLayerConstrainedTileSets(); + seiInterLayerConstrainedTileSets->m_ilAllTilesExactSampleValueMatchFlag = false; + seiInterLayerConstrainedTileSets->m_ilOneTilePerTileSetFlag = false; + if (!seiInterLayerConstrainedTileSets->m_ilOneTilePerTileSetFlag) + { + seiInterLayerConstrainedTileSets->m_ilNumSetsInMessageMinus1 = m_pcCfg->getIlNumSetsInMessage() - 1; + if (seiInterLayerConstrainedTileSets->m_ilNumSetsInMessageMinus1) + { + seiInterLayerConstrainedTileSets->m_skippedTileSetPresentFlag = m_pcCfg->getSkippedTileSetPresentFlag(); + } + else + { + seiInterLayerConstrainedTileSets->m_skippedTileSetPresentFlag = false; + } + seiInterLayerConstrainedTileSets->m_ilNumSetsInMessageMinus1 += seiInterLayerConstrainedTileSets->m_skippedTileSetPresentFlag ? 1 : 0; + for (UInt i = 0; i < m_pcCfg->getIlNumSetsInMessage(); i++) + { + seiInterLayerConstrainedTileSets->m_ilctsId[i] = i; + seiInterLayerConstrainedTileSets->m_ilNumTileRectsInSetMinus1[i] = 0; + for( UInt j = 0; j <= seiInterLayerConstrainedTileSets->m_ilNumTileRectsInSetMinus1[i]; j++) + { + seiInterLayerConstrainedTileSets->m_ilTopLeftTileIndex[i][j] = m_pcCfg->getTopLeftTileIndex(i); + seiInterLayerConstrainedTileSets->m_ilBottomRightTileIndex[i][j] = m_pcCfg->getBottomRightTileIndex(i); + } + seiInterLayerConstrainedTileSets->m_ilcIdc[i] = m_pcCfg->getIlcIdc(i); + if (seiInterLayerConstrainedTileSets->m_ilAllTilesExactSampleValueMatchFlag) + { + seiInterLayerConstrainedTileSets->m_ilExactSampleValueMatchFlag[i] = false; + } + } + } + + return seiInterLayerConstrainedTileSets; +} +#endif + Void TEncGOP::xCreateLeadingSEIMessages (/*SEIMessages seiMessages,*/ AccessUnit &accessUnit, TComSPS *sps) { @@ -369,4 +408,17 @@ delete sei; } +#if N0383_IL_CONSTRAINED_TILE_SETS_SEI + if(m_pcCfg->getInterLayerConstrainedTileSetsSEIEnabled()) + { + SEIInterLayerConstrainedTileSets *sei = xCreateSEIInterLayerConstrainedTileSets (); + + nalu = NALUnit(NAL_UNIT_PREFIX_SEI, 0, m_pcCfg->getNumLayer()-1); // For highest layer + m_pcEntropyCoder->setBitstream(&nalu.m_Bitstream); + m_seiWriter.writeSEImessage(nalu.m_Bitstream, *sei, sps); + writeRBSPTrailingBits(nalu.m_Bitstream); + accessUnit.push_back(new NALUnitEBSP(nalu)); + delete sei; + } +#endif } @@ -375,7 +427,7 @@ // ==================================================================================================================== #if SVC_EXTENSION -Void TEncGOP::compressGOP( Int iPicIdInGOP, Int iPOCLast, Int iNumPicRcvd, TComList& rcListPic, TComList& rcListPicYuvRecOut, std::list& accessUnitsInGOP) -#else -Void TEncGOP::compressGOP( Int iPOCLast, Int iNumPicRcvd, TComList& rcListPic, TComList& rcListPicYuvRecOut, std::list& accessUnitsInGOP) +Void TEncGOP::compressGOP( Int iPicIdInGOP, Int iPOCLast, Int iNumPicRcvd, TComList& rcListPic, TComList& rcListPicYuvRecOut, std::list& accessUnitsInGOP, Bool isField, Bool isTff) +#else +Void TEncGOP::compressGOP( Int iPOCLast, Int iNumPicRcvd, TComList& rcListPic, TComList& rcListPicYuvRecOut, std::list& accessUnitsInGOP, Bool isField, Bool isTff) #endif { @@ -390,5 +442,5 @@ TComOutputBitstream* pcSubstreamsOut = NULL; - xInitGOP( iPOCLast, iNumPicRcvd, rcListPic, rcListPicYuvRecOut ); + xInitGOP( iPOCLast, iNumPicRcvd, rcListPic, rcListPicYuvRecOut, isField ); m_iNumPicCoded = 0; @@ -463,11 +515,23 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// Initial to start encoding - Int pocCurr = iPOCLast -iNumPicRcvd+ m_pcCfg->getGOPEntry(iGOPid).m_POC; - Int iTimeOffset = m_pcCfg->getGOPEntry(iGOPid).m_POC; - if(iPOCLast == 0) + Int iTimeOffset; + Int pocCurr; + + if(iPOCLast == 0) //case first frame or first top field { pocCurr=0; iTimeOffset = 1; } + else if(iPOCLast == 1 && isField) //case first bottom field, just like the first frame, the poc computation is not right anymore, we set the right value + { + pocCurr = 1; + iTimeOffset = 1; + } + else + { + pocCurr = iPOCLast - iNumPicRcvd + m_pcCfg->getGOPEntry(iGOPid).m_POC - isField; + iTimeOffset = m_pcCfg->getGOPEntry(iGOPid).m_POC; + } + if(pocCurr>=m_pcCfg->getFramesToBeEncoded()) { @@ -490,5 +554,5 @@ accessUnitsInGOP.push_back(AccessUnit()); AccessUnit& accessUnit = accessUnitsInGOP.back(); - xGetBuffer( rcListPic, rcListPicYuvRecOut, iNumPicRcvd, iTimeOffset, pcPic, pcPicYuvRecOut, pocCurr ); + xGetBuffer( rcListPic, rcListPicYuvRecOut, iNumPicRcvd, iTimeOffset, pcPic, pcPicYuvRecOut, pocCurr, isField ); // Slice data initialization @@ -499,9 +563,76 @@ #if SVC_EXTENSION pcPic->setLayerId( m_layerId ); - m_pcSliceEncoder->initEncSlice ( pcPic, iPOCLast, pocCurr, iNumPicRcvd, iGOPid, pcSlice, m_pcEncTop->getSPS(), m_pcEncTop->getPPS(), m_pcEncTop->getVPS() ); -#else - m_pcSliceEncoder->initEncSlice ( pcPic, iPOCLast, pocCurr, iNumPicRcvd, iGOPid, pcSlice, m_pcEncTop->getSPS(), m_pcEncTop->getPPS() ); -#endif - + m_pcSliceEncoder->initEncSlice ( pcPic, iPOCLast, pocCurr, iNumPicRcvd, iGOPid, pcSlice, m_pcEncTop->getSPS(), m_pcEncTop->getPPS(), m_pcEncTop->getVPS(), isField ); +#else + m_pcSliceEncoder->initEncSlice ( pcPic, iPOCLast, pocCurr, iNumPicRcvd, iGOPid, pcSlice, m_pcEncTop->getSPS(), m_pcEncTop->getPPS(), isField ); +#endif + + //Set Frame/Field coding + pcSlice->getPic()->setField(isField); + +#if POC_RESET_FLAG + if( !pcSlice->getPocResetFlag() ) // For picture that are not reset, we should adjust the value of POC calculated from the configuration files. + { + // Subtract POC adjustment value until now. + pcSlice->setPOC( pcSlice->getPOC() - m_pcEncTop->getPocAdjustmentValue() ); + } + else + { + // Check if this is the first slice in the picture + // In the encoder, the POC values are copied along with copySliceInfo, so we only need + // to do this for the first slice. + Int pocAdjustValue = pcSlice->getPOC() - m_pcEncTop->getPocAdjustmentValue(); + if( pcSlice->getSliceIdx() == 0 ) + { + TComList::iterator iterPic = rcListPic.begin(); + + // Iterate through all picture in DPB + while( iterPic != rcListPic.end() ) + { + TComPic *dpbPic = *iterPic; + if( dpbPic->getPOC() == pocCurr ) + { + if( dpbPic->getReconMark() ) + { + assert( !( dpbPic->getSlice(0)->isReferenced() ) && !( dpbPic->getOutputMark() ) ); + } + } + // Check if the picture pointed to by iterPic is either used for reference or + // needed for output, are in the same layer, and not the current picture. + if( /* ( ( dpbPic->getSlice(0)->isReferenced() ) || ( dpbPic->getOutputMark() ) ) + && */ ( dpbPic->getLayerId() == pcSlice->getLayerId() ) + && ( dpbPic->getReconMark() ) + ) + { + for(Int i = dpbPic->getNumAllocatedSlice()-1; i >= 0; i--) + { + TComSlice *slice = dpbPic->getSlice(i); + TComReferencePictureSet *rps = slice->getRPS(); + slice->setPOC( dpbPic->getSlice(i)->getPOC() - pocAdjustValue ); + + // Also adjust the POC value stored in the RPS of each such slice + for(Int j = rps->getNumberOfPictures(); j >= 0; j--) + { + rps->setPOC( j, rps->getPOC(j) - pocAdjustValue ); + } + // Also adjust the value of refPOC + for(Int k = 0; k < 2; k++) // For List 0 and List 1 + { + RefPicList list = (k == 1) ? REF_PIC_LIST_1 : REF_PIC_LIST_0; + for(Int j = 0; j < slice->getNumRefIdx(list); j++) + { + slice->setRefPOC( slice->getRefPOC(list, j) - pocAdjustValue, list, j); + } + } + } + } + iterPic++; + } + m_pcEncTop->setPocAdjustmentValue( m_pcEncTop->getPocAdjustmentValue() + pocAdjustValue ); + } + pcSlice->setPocValueBeforeReset( pcSlice->getPOC() - m_pcEncTop->getPocAdjustmentValue() + pocAdjustValue ); + pcSlice->setPOC( 0 ); + } +#endif #if M0040_ADAPTIVE_RESOLUTION_CHANGE if (m_pcEncTop->getAdaptiveResolutionChange() > 0 && m_layerId == 1 && pocCurr > m_pcEncTop->getAdaptiveResolutionChange()) @@ -530,4 +661,8 @@ #endif +#if IL_SL_SIGNALLING_N0371 + m_pcEncTop->getScalingList()->setLayerId( m_layerId ); +#endif + pcSlice->setLastIDR(m_iLastIDR); pcSlice->setSliceIdx(0); @@ -535,8 +670,11 @@ pcSlice->setLFCrossSliceBoundaryFlag( pcSlice->getPPS()->getLoopFilterAcrossSlicesEnabledFlag() ); pcSlice->setScalingList ( m_pcEncTop->getScalingList() ); - pcSlice->getScalingList()->setUseTransformSkip(m_pcEncTop->getPPS()->getUseTransformSkip()); if(m_pcEncTop->getUseScalingListId() == SCALING_LIST_OFF) { +#if IL_SL_SIGNALLING_N0371 + m_pcEncTop->getTrQuant()->setFlatScalingList( m_layerId ); +#else m_pcEncTop->getTrQuant()->setFlatScalingList(); +#endif m_pcEncTop->getTrQuant()->setUseScalingList(false); m_pcEncTop->getSPS()->setScalingListPresentFlag(false); @@ -545,5 +683,14 @@ else if(m_pcEncTop->getUseScalingListId() == SCALING_LIST_DEFAULT) { +#if IL_SL_SIGNALLING_N0371 + pcSlice->getScalingList()->setLayerId( m_layerId ); +#endif + +#if IL_SL_SIGNALLING_N0371 + pcSlice->setDefaultScalingList ( m_layerId ); +#else pcSlice->setDefaultScalingList (); +#endif + m_pcEncTop->getSPS()->setScalingListPresentFlag(false); m_pcEncTop->getPPS()->setScalingListPresentFlag(false); @@ -553,11 +700,41 @@ else if(m_pcEncTop->getUseScalingListId() == SCALING_LIST_FILE_READ) { +#if IL_SL_SIGNALLING_N0371 + pcSlice->getScalingList()->setLayerId( m_layerId ); +#endif + if(pcSlice->getScalingList()->xParseScalingList(m_pcCfg->getScalingListFile())) { +#if IL_SL_SIGNALLING_N0371 + pcSlice->setDefaultScalingList ( m_layerId ); +#else pcSlice->setDefaultScalingList (); - } +#endif + } +#if IL_SL_SIGNALLING_N0371 + pcSlice->getScalingList()->checkDcOfMatrix( m_layerId ); +#else pcSlice->getScalingList()->checkDcOfMatrix(); +#endif m_pcEncTop->getSPS()->setScalingListPresentFlag(pcSlice->checkDefaultScalingList()); + +#if IL_SL_SIGNALLING_N0371 + if( m_layerId > 0 ) + { + m_pcEncTop->getSPS()->setPredScalingListFlag (true); + m_pcEncTop->getSPS()->setScalingListRefLayerId( 0 ); + } +#endif + m_pcEncTop->getPPS()->setScalingListPresentFlag(false); + +#if IL_SL_SIGNALLING_N0371 + if( m_layerId > 0 ) + { + m_pcEncTop->getPPS()->setPredScalingListFlag (false); + m_pcEncTop->getPPS()->setScalingListRefLayerId( 0 ); + } +#endif + m_pcEncTop->getTrQuant()->setScalingList(pcSlice->getScalingList()); m_pcEncTop->getTrQuant()->setUseScalingList(true); @@ -576,4 +753,8 @@ pcSlice->setNalUnitType(getNalUnitType(pocCurr, m_iLastIDR)); #if SVC_EXTENSION +#if ILR_RESTR && ILR_RESTR_FIX + Int interLayerPredLayerIdcTmp[MAX_VPS_LAYER_ID_PLUS1]; + Int activeNumILRRefIdxTmp = 0; +#endif if (m_layerId > 0) { @@ -588,5 +769,17 @@ pcSlice->setBaseColPic( *cListPic, refLayerIdc ); -#if SIMPLIFIED_MV_POS_SCALING +#if ILR_RESTR && ILR_RESTR_FIX + // Apply temporal layer restriction to inter-layer prediction + Int maxTidIlRefPicsPlus1 = m_pcEncTop->getVPS()->getMaxTidIlRefPicsPlus1(pcSlice->getBaseColPic(refLayerIdc)->getSlice(0)->getLayerId()); + if( ((Int)(pcSlice->getBaseColPic(refLayerIdc)->getSlice(0)->getTLayer())<=maxTidIlRefPicsPlus1-1) || (maxTidIlRefPicsPlus1==0 && pcSlice->getBaseColPic(refLayerIdc)->getSlice(0)->getRapPicFlag()) ) + { + interLayerPredLayerIdcTmp[activeNumILRRefIdxTmp++] = refLayerIdc; // add picture to the list of valid inter-layer pictures + } + else + { + continue; // ILP is not valid due to temporal layer restriction + } +#endif + #if SCALED_REF_LAYER_OFFSETS const Window &scalEL = m_pcEncTop->getScaledRefLayerWindow(refLayerIdc); @@ -612,9 +805,8 @@ g_posScalingFactor[refLayerIdc][0] = ((widthBL << 16) + (widthEL >> 1)) / widthEL; g_posScalingFactor[refLayerIdc][1] = ((heightBL << 16) + (heightEL >> 1)) / heightEL; -#endif #if SVC_UPSAMPLING if( pcPic->isSpatialEnhLayer(refLayerIdc)) - { + { #if SCALED_REF_LAYER_OFFSETS m_pcPredSearch->upsampleBasePic( refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec(), pcPic->getPicYuvRec(), pcSlice->getSPS()->getScaledRefLayerWindow(refLayerIdc) ); @@ -630,39 +822,73 @@ #endif } - } -#endif - -#if REF_IDX_FRAMEWORK - if( m_layerId > 0 && (pocCurr % m_pcCfg->getIntraPeriod() == 0) ) - { + +#if ILR_RESTR && ILR_RESTR_FIX + // Update the list of active inter-layer pictures + for ( Int i = 0; i < activeNumILRRefIdxTmp; i++) + { + pcSlice->setInterLayerPredLayerIdc( interLayerPredLayerIdcTmp[i], i ); + } + pcSlice->setActiveNumILRRefIdx( activeNumILRRefIdxTmp ); + if ( pcSlice->getActiveNumILRRefIdx() == 0 ) + { + // No valid inter-layer pictures -> disable inter-layer prediction + pcSlice->setInterLayerPredEnabledFlag(false); + } +#endif + + if( pocCurr % m_pcCfg->getIntraPeriod() == 0 ) + { +#if N0147_IRAP_ALIGN_FLAG + if(pcSlice->getVPS()->getCrossLayerIrapAlignFlag()) + { + TComList *cListPic = m_ppcTEncTop[m_layerId]->getRefLayerEnc(0)->getListPic(); + TComPic* picLayer0 = pcSlice->getRefPic(*cListPic, pcSlice->getPOC() ); + if(picLayer0) + { + pcSlice->setNalUnitType(picLayer0->getSlice(0)->getNalUnitType()); + } + else + { + pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_CRA); + } + } + else +#endif + pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_CRA); + #if IDR_ALIGNMENT - TComList *cListPic = m_ppcTEncTop[m_layerId]->getRefLayerEnc(0)->getListPic(); - TComPic* picLayer0 = pcSlice->getRefPic(*cListPic, pcSlice->getPOC() ); - if( picLayer0->getSlice(0)->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR_W_RADL || picLayer0->getSlice(0)->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR_N_LP ) - { - pcSlice->setNalUnitType(picLayer0->getSlice(0)->getNalUnitType()); - } - else -#endif - pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_CRA); - } - - if( m_layerId > 0 && pcSlice->getActiveNumILRRefIdx() == 0 && pcSlice->getNalUnitType() >= NAL_UNIT_CODED_SLICE_BLA_W_LP && pcSlice->getNalUnitType() <= NAL_UNIT_CODED_SLICE_CRA ) - { - pcSlice->setSliceType(I_SLICE); - } - else if( m_layerId > 0 && !m_pcEncTop->getElRapSliceTypeB() ) - { - if( (pcSlice->getNalUnitType() >= NAL_UNIT_CODED_SLICE_BLA_W_LP) && - (pcSlice->getNalUnitType() <= NAL_UNIT_CODED_SLICE_CRA) && + TComList *cListPic = m_ppcTEncTop[m_layerId]->getRefLayerEnc(0)->getListPic(); + TComPic* picLayer0 = pcSlice->getRefPic(*cListPic, pcSlice->getPOC() ); + if( picLayer0->getSlice(0)->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR_W_RADL || picLayer0->getSlice(0)->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR_N_LP ) + { + pcSlice->setNalUnitType(picLayer0->getSlice(0)->getNalUnitType()); + } + else + { + pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_CRA); + } +#endif + } + + if( pcSlice->getActiveNumILRRefIdx() == 0 && pcSlice->getNalUnitType() >= NAL_UNIT_CODED_SLICE_BLA_W_LP && pcSlice->getNalUnitType() <= NAL_UNIT_CODED_SLICE_CRA ) + { + pcSlice->setSliceType(I_SLICE); + } + else if( !m_pcEncTop->getElRapSliceTypeB() ) + { + if( (pcSlice->getNalUnitType() >= NAL_UNIT_CODED_SLICE_BLA_W_LP) && + (pcSlice->getNalUnitType() <= NAL_UNIT_CODED_SLICE_CRA) && pcSlice->getSliceType() == B_SLICE ) - { - pcSlice->setSliceType(P_SLICE); - } - } -#endif + { + pcSlice->setSliceType(P_SLICE); + } + } + } +#endif //#if SVC_EXTENSION if(pcSlice->getTemporalLayerNonReferenceFlag()) { - if(pcSlice->getNalUnitType()==NAL_UNIT_CODED_SLICE_TRAIL_R) + if (pcSlice->getNalUnitType() == NAL_UNIT_CODED_SLICE_TRAIL_R && + !(m_iGopSize == 1 && pcSlice->getSliceType() == I_SLICE)) + // Add this condition to avoid POC issues with encoder_intra_main.cfg configuration (see #1127 in bug tracker) { pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_TRAIL_N); @@ -700,4 +926,61 @@ if(pcSlice->isTemporalLayerSwitchingPoint(rcListPic) || pcSlice->getSPS()->getTemporalIdNestingFlag()) { +#if ALIGN_TSA_STSA_PICS + if( pcSlice->getLayerId() > 0 ) + { + Bool oneRefLayerTSA = false, oneRefLayerNotTSA = false; + for( Int i = 0; i < pcSlice->getLayerId(); i++) + { + TComList *cListPic = m_ppcTEncTop[i]->getListPic(); + TComPic *lowerLayerPic = pcSlice->getRefPic(*cListPic, pcSlice->getPOC()); + if( lowerLayerPic && pcSlice->getVPS()->getDirectDependencyFlag(pcSlice->getLayerId(), i) ) + { + if( ( lowerLayerPic->getSlice(0)->getNalUnitType() == NAL_UNIT_CODED_SLICE_TSA_N ) || + ( lowerLayerPic->getSlice(0)->getNalUnitType() == NAL_UNIT_CODED_SLICE_TLA_R ) + ) + { + if(pcSlice->getTemporalLayerNonReferenceFlag() ) + { + pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_TSA_N); + } + else + { + pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_TLA_R ); + } + oneRefLayerTSA = true; + } + else + { + oneRefLayerNotTSA = true; + } + } + } + assert( !( oneRefLayerNotTSA && oneRefLayerTSA ) ); // Only one variable should be true - failure of this assert means + // that two independent reference layers that are not dependent on + // each other, but are reference for current layer have inconsistency + if( oneRefLayerNotTSA /*&& !oneRefLayerTSA*/ ) // No reference layer is TSA - set current as TRAIL + { + if(pcSlice->getTemporalLayerNonReferenceFlag() ) + { + pcSlice->setNalUnitType( NAL_UNIT_CODED_SLICE_TRAIL_N ); + } + else + { + pcSlice->setNalUnitType( NAL_UNIT_CODED_SLICE_TRAIL_R ); + } + } + else // This means there is no reference layer picture for current picture in this AU + { + if(pcSlice->getTemporalLayerNonReferenceFlag() ) + { + pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_TSA_N); + } + else + { + pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_TLA_R ); + } + } + } +#else if(pcSlice->getTemporalLayerNonReferenceFlag()) { @@ -708,4 +991,5 @@ pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_TLA_R); } +#endif } else if(pcSlice->isStepwiseTemporalLayerSwitchingPointCandidate(rcListPic)) @@ -741,4 +1025,61 @@ if(isSTSA==true) { +#if ALIGN_TSA_STSA_PICS + if( pcSlice->getLayerId() > 0 ) + { + Bool oneRefLayerSTSA = false, oneRefLayerNotSTSA = false; + for( Int i = 0; i < pcSlice->getLayerId(); i++) + { + TComList *cListPic = m_ppcTEncTop[i]->getListPic(); + TComPic *lowerLayerPic = pcSlice->getRefPic(*cListPic, pcSlice->getPOC()); + if( lowerLayerPic && pcSlice->getVPS()->getDirectDependencyFlag(pcSlice->getLayerId(), i) ) + { + if( ( lowerLayerPic->getSlice(0)->getNalUnitType() == NAL_UNIT_CODED_SLICE_STSA_N ) || + ( lowerLayerPic->getSlice(0)->getNalUnitType() == NAL_UNIT_CODED_SLICE_STSA_R ) + ) + { + if(pcSlice->getTemporalLayerNonReferenceFlag() ) + { + pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_STSA_N); + } + else + { + pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_STSA_R ); + } + oneRefLayerSTSA = true; + } + else + { + oneRefLayerNotSTSA = true; + } + } + } + assert( !( oneRefLayerNotSTSA && oneRefLayerSTSA ) ); // Only one variable should be true - failure of this assert means + // that two independent reference layers that are not dependent on + // each other, but are reference for current layer have inconsistency + if( oneRefLayerNotSTSA /*&& !oneRefLayerSTSA*/ ) // No reference layer is STSA - set current as TRAIL + { + if(pcSlice->getTemporalLayerNonReferenceFlag() ) + { + pcSlice->setNalUnitType( NAL_UNIT_CODED_SLICE_TRAIL_N ); + } + else + { + pcSlice->setNalUnitType( NAL_UNIT_CODED_SLICE_TRAIL_R ); + } + } + else // This means there is no reference layer picture for current picture in this AU + { + if(pcSlice->getTemporalLayerNonReferenceFlag() ) + { + pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_STSA_N); + } + else + { + pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_STSA_R ); + } + } + } +#else if(pcSlice->getTemporalLayerNonReferenceFlag()) { @@ -749,4 +1090,5 @@ pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_STSA_R); } +#endif } } @@ -759,9 +1101,13 @@ pcSlice->setNumRefIdx(REF_PIC_LIST_1,min(m_pcCfg->getGOPEntry(iGOPid).m_numRefPicsActive,pcSlice->getRPS()->getNumberOfPictures())); -#if REF_IDX_FRAMEWORK +#if SVC_EXTENSION if( m_layerId > 0 && pcSlice->getActiveNumILRRefIdx() ) { #if RESTR_CHK - if (pcSlice->getPOC()>0 && pcSlice->isRADL()&& pcPic->getSlice(0)->isRASL()) +#if POC_RESET_FLAG + if ( pocCurr > 0 && pcSlice->isRADL() && pcPic->getSlice(0)->getBaseColPic(pcPic->getSlice(0)->getInterLayerPredLayerIdc(0))->getSlice(0)->isRASL()) +#else + if (pcSlice->getPOC()>0 && pcSlice->isRADL() && pcPic->getSlice(0)->getBaseColPic(pcPic->getSlice(0)->getInterLayerPredLayerIdc(0))->getSlice(0)->isRASL()) +#endif { #if JCTVC_M0458_INTERLAYER_RPS_SIG @@ -797,5 +1143,5 @@ #endif } -#endif +#endif //SVC_EXTENSION #if ADAPTIVE_QP_SELECTION @@ -803,5 +1149,5 @@ #endif -#if REF_IDX_FRAMEWORK +#if SVC_EXTENSION #if M0457_COL_PICTURE_SIGNALING && !REMOVE_COL_PICTURE_SIGNALING if ( pcSlice->getSliceType() == B_SLICE && !(pcSlice->getActiveNumILRRefIdx() > 0 && m_pcEncTop->getNumMotionPredRefLayers() > 0) ) @@ -812,20 +1158,14 @@ pcSlice->setColFromL0Flag(1-uiColDir); } -#endif // Set reference list -#if REF_IDX_FRAMEWORK if(m_layerId == 0 || ( m_layerId > 0 && pcSlice->getActiveNumILRRefIdx() == 0 ) ) { pcSlice->setRefPicList( rcListPic); } -#else - pcSlice->setRefPicList ( rcListPic ); -#endif -#if REF_IDX_FRAMEWORK + if( m_layerId > 0 && pcSlice->getActiveNumILRRefIdx() ) { m_pcEncTop->setILRPic(pcPic); - #if REF_IDX_MFM #if M0457_COL_PICTURE_SIGNALING @@ -840,5 +1180,8 @@ #endif } -#endif +#else + // Set reference list + pcSlice->setRefPicList ( rcListPic ); +#endif //SVC_EXTENSION pcSlice->setRefPicListModificationSvc(); pcSlice->setRefPicList( rcListPic, false, m_pcEncTop->getIlpList()); @@ -890,5 +1233,8 @@ #endif } -#endif +#else //SVC_EXTENSION + // Set reference list + pcSlice->setRefPicList ( rcListPic ); +#endif //#if SVC_EXTENSION // Slice info. refinement @@ -904,5 +1250,5 @@ #endif { -#if !REF_IDX_FRAMEWORK +#if !SVC_EXTENSION pcSlice->setColFromL0Flag(1-uiColDir); #endif @@ -1021,5 +1367,9 @@ Int sliceQP = m_pcCfg->getInitialQP(); +#if POC_RESET_FLAG + if ( ( pocCurr == 0 && m_pcCfg->getInitialQP() > 0 ) || ( frameLevel == 0 && m_pcCfg->getForceIntraQP() ) ) // QP is specified +#else if ( ( pcSlice->getPOC() == 0 && m_pcCfg->getInitialQP() > 0 ) || ( frameLevel == 0 && m_pcCfg->getForceIntraQP() ) ) // QP is specified +#endif { Int NumberBFrames = ( m_pcCfg->getGOPSize() - 1 ); @@ -1071,5 +1421,9 @@ } +#if REPN_FORMAT_IN_VPS + sliceQP = Clip3( -pcSlice->getQpBDOffsetY(), MAX_QP, sliceQP ); +#else sliceQP = Clip3( -pcSlice->getSPS()->getQpBDOffsetY(), MAX_QP, sliceQP ); +#endif m_pcRateCtrl->getRCPic()->setPicEstQP( sliceQP ); @@ -1084,6 +1438,11 @@ UInt uiPosX = ( uiExternalAddress % pcPic->getFrameWidthInCU() ) * g_uiMaxCUWidth+ g_auiRasterToPelX[ g_auiZscanToRaster[uiInternalAddress] ]; UInt uiPosY = ( uiExternalAddress / pcPic->getFrameWidthInCU() ) * g_uiMaxCUHeight+ g_auiRasterToPelY[ g_auiZscanToRaster[uiInternalAddress] ]; +#if REPN_FORMAT_IN_VPS + UInt uiWidth = pcSlice->getPicWidthInLumaSamples(); + UInt uiHeight = pcSlice->getPicHeightInLumaSamples(); +#else UInt uiWidth = pcSlice->getSPS()->getPicWidthInLumaSamples(); UInt uiHeight = pcSlice->getSPS()->getPicHeightInLumaSamples(); +#endif while(uiPosX>=uiWidth||uiPosY>=uiHeight) { @@ -1164,4 +1523,11 @@ //intialize each tile of the current picture pcPic->getPicSym()->xInitTiles(); + +#if N0383_IL_CONSTRAINED_TILE_SETS_SEI + if (m_pcCfg->getInterLayerConstrainedTileSetsSEIEnabled()) + { + xBuildTileSetsMap(pcPic->getPicSym()); + } +#endif // Allocate some coders, now we know how many tiles there are. @@ -1310,5 +1676,9 @@ { #if SVC_EXTENSION +#if VPS_NUH_LAYER_ID + OutputNALUnit nalu(NAL_UNIT_VPS, 0, 0 ); // The value of nuh_layer_id of VPS NAL unit shall be equal to 0. +#else OutputNALUnit nalu(NAL_UNIT_VPS, 0, m_layerId); +#endif #if AVC_BASE if( ( m_layerId == 1 && m_pcEncTop->getVPS()->getAvcBaseLayerFlag() ) || ( m_layerId == 0 && !m_pcEncTop->getVPS()->getAvcBaseLayerFlag() ) ) @@ -1333,4 +1703,7 @@ #if SVC_EXTENSION nalu = NALUnit(NAL_UNIT_SPS, 0, m_layerId); +#if IL_SL_SIGNALLING_N0371 + pcSlice->getSPS()->setVPS( pcSlice->getVPS() ); +#endif #else nalu = NALUnit(NAL_UNIT_SPS); @@ -1452,6 +1825,10 @@ } } - pictureTimingSEI.m_auCpbRemovalDelay = std::max(1, m_totalCoded - m_lastBPSEI); // Syntax element signalled as minus, hence the . + pictureTimingSEI.m_auCpbRemovalDelay = std::min(std::max(1, m_totalCoded - m_lastBPSEI), static_cast(pow(2, static_cast(pcSlice->getSPS()->getVuiParameters()->getHrdParameters()->getCpbRemovalDelayLengthMinus1()+1)))); // Syntax element signalled as minus, hence the . +#if POC_RESET_FLAG + pictureTimingSEI.m_picDpbOutputDelay = pcSlice->getSPS()->getNumReorderPics(0) + pocCurr - m_totalCoded; +#else pictureTimingSEI.m_picDpbOutputDelay = pcSlice->getSPS()->getNumReorderPics(0) + pcSlice->getPOC() - m_totalCoded; +#endif Int factor = pcSlice->getSPS()->getVuiParameters()->getHrdParameters()->getTickDivisorMinus2() + 2; pictureTimingSEI.m_picDpbOutputDuDelay = factor * pictureTimingSEI.m_picDpbOutputDelay; @@ -1558,5 +1935,9 @@ SEIRecoveryPoint sei_recovery_point; sei_recovery_point.m_recoveryPocCnt = 0; +#if POC_RESET_FLAG + sei_recovery_point.m_exactMatchingFlag = ( pocCurr == 0 ) ? (true) : (false); +#else sei_recovery_point.m_exactMatchingFlag = ( pcSlice->getPOC() == 0 ) ? (true) : (false); +#endif sei_recovery_point.m_brokenLinkFlag = false; @@ -1619,5 +2000,5 @@ startCUAddrSliceSegmentIdx++; } -#if REF_IDX_FRAMEWORK && M0457_COL_PICTURE_SIGNALING +#if SVC_EXTENSION && M0457_COL_PICTURE_SIGNALING pcSlice->setNumMotionPredRefLayers(m_pcEncTop->getNumMotionPredRefLayers()); #endif @@ -1632,6 +2013,12 @@ uiPosX = ( uiExternalAddress % pcPic->getFrameWidthInCU() ) * g_uiMaxCUWidth+ g_auiRasterToPelX[ g_auiZscanToRaster[uiInternalAddress] ]; uiPosY = ( uiExternalAddress / pcPic->getFrameWidthInCU() ) * g_uiMaxCUHeight+ g_auiRasterToPelY[ g_auiZscanToRaster[uiInternalAddress] ]; + +#if REPN_FORMAT_IN_VPS + uiWidth = pcSlice->getPicWidthInLumaSamples(); + uiHeight = pcSlice->getPicHeightInLumaSamples(); +#else uiWidth = pcSlice->getSPS()->getPicWidthInLumaSamples(); uiHeight = pcSlice->getSPS()->getPicHeightInLumaSamples(); +#endif while(uiPosX>=uiWidth||uiPosY>=uiHeight) { @@ -1688,5 +2075,7 @@ tmpBitsBeforeWriting = m_pcEntropyCoder->getNumberOfWrittenBits(); #endif + m_pcEntropyCoder->encodeSliceHeader(pcSlice); + #if RATE_CONTROL_LAMBDA_DOMAIN actualHeadBits += ( m_pcEntropyCoder->getNumberOfWrittenBits() - tmpBitsBeforeWriting ); @@ -1975,4 +2364,18 @@ xCalculateAddPSNR( pcPic, pcPic->getPicYuvRec(), accessUnit, dEncTime ); + //In case of field coding, compute the interlaced PSNR for both fields + if (isField && ((!pcPic->isTopField() && isTff) || (pcPic->isTopField() && !isTff))) + { + //get complementary top field + TComPic* pcPicTop; + TComList::iterator iterPic = rcListPic.begin(); + while ((*iterPic)->getPOC() != pcPic->getPOC()-1) + { + iterPic ++; + } + pcPicTop = *(iterPic); + xCalculateInterlacedAddPSNR(pcPicTop, pcPic, pcPicTop->getPicYuvRec(), pcPic->getPicYuvRec(), accessUnit, dEncTime ); + } + if (digestStr) { @@ -2107,4 +2510,5 @@ OutputNALUnit nalu(NAL_UNIT_PREFIX_SEI, pcSlice->getTLayer()); m_pcEntropyCoder->setEntropyCoder(m_pcCavlcCoder, pcSlice); + pictureTimingSEI.m_picStruct = (isField && pcSlice->getPic()->isTopField())? 1 : isField? 2 : 0; m_seiWriter.writeSEImessage(nalu.m_Bitstream, pictureTimingSEI, pcSlice->getSPS()); writeRBSPTrailingBits(nalu.m_Bitstream); @@ -2225,12 +2629,12 @@ #if SVC_EXTENSION - assert ( m_iNumPicCoded <= 1 ); -#else - assert ( m_iNumPicCoded == iNumPicRcvd ); + assert ( m_iNumPicCoded <= 1 || (isField && iPOCLast == 1) ); +#else + assert ( (m_iNumPicCoded == iNumPicRcvd) || (isField && iPOCLast == 1) ); #endif } #if !SVC_EXTENSION -Void TEncGOP::printOutSummary(UInt uiNumAllPicCoded) +Void TEncGOP::printOutSummary(UInt uiNumAllPicCoded, Bool isField) { assert (uiNumAllPicCoded == m_gcAnalyzeAll.getNumPic()); @@ -2238,8 +2642,18 @@ //--CFG_KDY - m_gcAnalyzeAll.setFrmRate( m_pcCfg->getFrameRate() ); - m_gcAnalyzeI.setFrmRate( m_pcCfg->getFrameRate() ); - m_gcAnalyzeP.setFrmRate( m_pcCfg->getFrameRate() ); - m_gcAnalyzeB.setFrmRate( m_pcCfg->getFrameRate() ); + if(isField) + { + m_gcAnalyzeAll.setFrmRate( m_pcCfg->getFrameRate() * 2); + m_gcAnalyzeI.setFrmRate( m_pcCfg->getFrameRate() * 2); + m_gcAnalyzeP.setFrmRate( m_pcCfg->getFrameRate() * 2); + m_gcAnalyzeB.setFrmRate( m_pcCfg->getFrameRate() * 2); + } + else + { + m_gcAnalyzeAll.setFrmRate( m_pcCfg->getFrameRate() ); + m_gcAnalyzeI.setFrmRate( m_pcCfg->getFrameRate() ); + m_gcAnalyzeP.setFrmRate( m_pcCfg->getFrameRate() ); + m_gcAnalyzeB.setFrmRate( m_pcCfg->getFrameRate() ); + } //-- all @@ -2264,4 +2678,16 @@ m_gcAnalyzeB.printSummary('B'); #endif + + if(isField) + { + //-- interlaced summary + m_gcAnalyzeAll_in.setFrmRate( m_pcCfg->getFrameRate()); + printf( "\n\nSUMMARY INTERLACED ---------------------------------------------\n" ); + m_gcAnalyzeAll_in.printOutInterlaced('a', m_gcAnalyzeAll.getBits()); + +#if _SUMMARY_OUT_ + m_gcAnalyzeAll_in.printSummaryOutInterlaced(); +#endif + } printf("\nRVM: %.3lf\n" , xCalculateRVM()); @@ -2305,4 +2731,22 @@ // ==================================================================================================================== + +Void TEncGOP::xInitGOP( Int iPOCLast, Int iNumPicRcvd, TComList& rcListPic, TComList& rcListPicYuvRecOut, Bool isField ) +{ + assert( iNumPicRcvd > 0 ); + // Exception for the first frames + if ( ( isField && (iPOCLast == 0 || iPOCLast == 1) ) || (!isField && (iPOCLast == 0)) ) + { + m_iGopSize = 1; + } + else + { + m_iGopSize = m_pcCfg->getGOPSize(); + } + assert (m_iGopSize > 0); + + return; +} + Void TEncGOP::xInitGOP( Int iPOCLast, Int iNumPicRcvd, TComList& rcListPic, TComList& rcListPicYuvRecOut ) { @@ -2327,14 +2771,33 @@ TComPic*& rpcPic, TComPicYuv*& rpcPicYuvRecOut, - Int pocCurr ) + Int pocCurr, + Bool isField) { Int i; // Rec. output TComList::iterator iterPicYuvRec = rcListPicYuvRecOut.end(); - for ( i = 0; i < iNumPicRcvd - iTimeOffset + 1; i++ ) - { - iterPicYuvRec--; - } - + + if (isField) + { + for ( i = 0; i < ( (pocCurr == 0 ) || (pocCurr == 1 ) ? (iNumPicRcvd - iTimeOffset + 1) : (iNumPicRcvd - iTimeOffset + 2) ); i++ ) + { + iterPicYuvRec--; + } + } + else + { + for ( i = 0; i < (iNumPicRcvd - iTimeOffset + 1); i++ ) + { + iterPicYuvRec--; + } + } + + if (isField) + { + if(pocCurr == 1) + { + iterPicYuvRec++; + } + } rpcPicYuvRecOut = *(iterPicYuvRec); @@ -2421,28 +2884,28 @@ switch (type) { - case NAL_UNIT_CODED_SLICE_TRAIL_R: return "TRAIL_R"; - case NAL_UNIT_CODED_SLICE_TRAIL_N: return "TRAIL_N"; + case NAL_UNIT_CODED_SLICE_TRAIL_R: return "TRAIL_R"; + case NAL_UNIT_CODED_SLICE_TRAIL_N: return "TRAIL_N"; case NAL_UNIT_CODED_SLICE_TLA_R: return "TLA_R"; - case NAL_UNIT_CODED_SLICE_TSA_N: return "TSA_N"; - case NAL_UNIT_CODED_SLICE_STSA_R: return "STSA_R"; - case NAL_UNIT_CODED_SLICE_STSA_N: return "STSA_N"; + case NAL_UNIT_CODED_SLICE_TSA_N: return "TSA_N"; + case NAL_UNIT_CODED_SLICE_STSA_R: return "STSA_R"; + case NAL_UNIT_CODED_SLICE_STSA_N: return "STSA_N"; case NAL_UNIT_CODED_SLICE_BLA_W_LP: return "BLA_W_LP"; case NAL_UNIT_CODED_SLICE_BLA_W_RADL: return "BLA_W_RADL"; - case NAL_UNIT_CODED_SLICE_BLA_N_LP: return "BLA_N_LP"; + case NAL_UNIT_CODED_SLICE_BLA_N_LP: return "BLA_N_LP"; case NAL_UNIT_CODED_SLICE_IDR_W_RADL: return "IDR_W_RADL"; - case NAL_UNIT_CODED_SLICE_IDR_N_LP: return "IDR_N_LP"; - case NAL_UNIT_CODED_SLICE_CRA: return "CRA"; + case NAL_UNIT_CODED_SLICE_IDR_N_LP: return "IDR_N_LP"; + case NAL_UNIT_CODED_SLICE_CRA: return "CRA"; case NAL_UNIT_CODED_SLICE_RADL_R: return "RADL_R"; case NAL_UNIT_CODED_SLICE_RASL_R: return "RASL_R"; - case NAL_UNIT_VPS: return "VPS"; - case NAL_UNIT_SPS: return "SPS"; - case NAL_UNIT_PPS: return "PPS"; - case NAL_UNIT_ACCESS_UNIT_DELIMITER: return "AUD"; - case NAL_UNIT_EOS: return "EOS"; - case NAL_UNIT_EOB: return "EOB"; - case NAL_UNIT_FILLER_DATA: return "FILLER"; + case NAL_UNIT_VPS: return "VPS"; + case NAL_UNIT_SPS: return "SPS"; + case NAL_UNIT_PPS: return "PPS"; + case NAL_UNIT_ACCESS_UNIT_DELIMITER: return "AUD"; + case NAL_UNIT_EOS: return "EOS"; + case NAL_UNIT_EOB: return "EOB"; + case NAL_UNIT_FILLER_DATA: return "FILLER"; case NAL_UNIT_PREFIX_SEI: return "SEI"; case NAL_UNIT_SUFFIX_SEI: return "SEI"; - default: return "UNK"; + default: return "UNK"; } } @@ -2625,15 +3088,186 @@ for (Int iRefIndex = 0; iRefIndex < pcSlice->getNumRefIdx(RefPicList(iRefList)); iRefIndex++) { -#if REF_IDX_FRAMEWORK && VPS_EXTN_DIRECT_REF_LAYERS +#if SVC_EXTENSION +#if VPS_EXTN_DIRECT_REF_LAYERS if( pcSlice->getRefPic(RefPicList(iRefList), iRefIndex)->isILR(m_layerId) ) { - printf( "%d(%d) ", pcSlice->getRefPOC(RefPicList(iRefList), iRefIndex)-pcSlice->getLastIDR(), pcSlice->getRefPic(RefPicList(iRefList), iRefIndex)->getLayerId() ); + printf( "%d(%d)", pcSlice->getRefPOC(RefPicList(iRefList), iRefIndex)-pcSlice->getLastIDR(), pcSlice->getRefPic(RefPicList(iRefList), iRefIndex)->getLayerId() ); } else -#endif + { + printf ("%d", pcSlice->getRefPOC(RefPicList(iRefList), iRefIndex)-pcSlice->getLastIDR()); + } +#endif + if( pcSlice->getEnableTMVPFlag() && iRefList == 1 - pcSlice->getColFromL0Flag() && iRefIndex == pcSlice->getColRefIdx() ) + { + printf( "c" ); + } + + printf( " " ); +#else printf ("%d ", pcSlice->getRefPOC(RefPicList(iRefList), iRefIndex)-pcSlice->getLastIDR()); +#endif } printf("]"); } +} + + +Void reinterlace(Pel* top, Pel* bottom, Pel* dst, UInt stride, UInt width, UInt height, Bool isTff) +{ + + for (Int y = 0; y < height; y++) + { + for (Int x = 0; x < width; x++) + { + dst[x] = isTff ? (UChar) top[x] : (UChar) bottom[x]; + dst[stride+x] = isTff ? (UChar) bottom[x] : (UChar) top[x]; + } + top += stride; + bottom += stride; + dst += stride*2; + } +} + +Void TEncGOP::xCalculateInterlacedAddPSNR( TComPic* pcPicOrgTop, TComPic* pcPicOrgBottom, TComPicYuv* pcPicRecTop, TComPicYuv* pcPicRecBottom, const AccessUnit& accessUnit, Double dEncTime ) +{ + Int x, y; + + UInt64 uiSSDY_in = 0; + UInt64 uiSSDU_in = 0; + UInt64 uiSSDV_in = 0; + + Double dYPSNR_in = 0.0; + Double dUPSNR_in = 0.0; + Double dVPSNR_in = 0.0; + + /*------ INTERLACED PSNR -----------*/ + + /* Luma */ + + Pel* pOrgTop = pcPicOrgTop->getPicYuvOrg()->getLumaAddr(); + Pel* pOrgBottom = pcPicOrgBottom->getPicYuvOrg()->getLumaAddr(); + Pel* pRecTop = pcPicRecTop->getLumaAddr(); + Pel* pRecBottom = pcPicRecBottom->getLumaAddr(); + + Int iWidth; + Int iHeight; + Int iStride; + + iWidth = pcPicOrgTop->getPicYuvOrg()->getWidth () - m_pcEncTop->getPad(0); + iHeight = pcPicOrgTop->getPicYuvOrg()->getHeight() - m_pcEncTop->getPad(1); + iStride = pcPicOrgTop->getPicYuvOrg()->getStride(); + Int iSize = iWidth*iHeight; + bool isTff = pcPicOrgTop->isTopField(); + + TComPicYuv* pcOrgInterlaced = new TComPicYuv; + pcOrgInterlaced->create( iWidth, iHeight << 1, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth ); + + TComPicYuv* pcRecInterlaced = new TComPicYuv; + pcRecInterlaced->create( iWidth, iHeight << 1, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth ); + + Pel* pOrgInterlaced = pcOrgInterlaced->getLumaAddr(); + Pel* pRecInterlaced = pcRecInterlaced->getLumaAddr(); + + //=== Interlace fields ==== + reinterlace(pOrgTop, pOrgBottom, pOrgInterlaced, iStride, iWidth, iHeight, isTff); + reinterlace(pRecTop, pRecBottom, pRecInterlaced, iStride, iWidth, iHeight, isTff); + + //===== calculate PSNR ===== + for( y = 0; y < iHeight << 1; y++ ) + { + for( x = 0; x < iWidth; x++ ) + { + Int iDiff = (Int)( pOrgInterlaced[x] - pRecInterlaced[x] ); + uiSSDY_in += iDiff * iDiff; + } + pOrgInterlaced += iStride; + pRecInterlaced += iStride; + } + + /*Chroma*/ + + iHeight >>= 1; + iWidth >>= 1; + iStride >>= 1; + + pOrgTop = pcPicOrgTop->getPicYuvOrg()->getCbAddr(); + pOrgBottom = pcPicOrgBottom->getPicYuvOrg()->getCbAddr(); + pRecTop = pcPicRecTop->getCbAddr(); + pRecBottom = pcPicRecBottom->getCbAddr(); + pOrgInterlaced = pcOrgInterlaced->getCbAddr(); + pRecInterlaced = pcRecInterlaced->getCbAddr(); + + //=== Interlace fields ==== + reinterlace(pOrgTop, pOrgBottom, pOrgInterlaced, iStride, iWidth, iHeight, isTff); + reinterlace(pRecTop, pRecBottom, pRecInterlaced, iStride, iWidth, iHeight, isTff); + + //===== calculate PSNR ===== + for( y = 0; y < iHeight << 1; y++ ) + { + for( x = 0; x < iWidth; x++ ) + { + Int iDiff = (Int)( pOrgInterlaced[x] - pRecInterlaced[x] ); + uiSSDU_in += iDiff * iDiff; + } + pOrgInterlaced += iStride; + pRecInterlaced += iStride; + } + + pOrgTop = pcPicOrgTop->getPicYuvOrg()->getCrAddr(); + pOrgBottom = pcPicOrgBottom->getPicYuvOrg()->getCrAddr(); + pRecTop = pcPicRecTop->getCrAddr(); + pRecBottom = pcPicRecBottom->getCrAddr(); + pOrgInterlaced = pcOrgInterlaced->getCrAddr(); + pRecInterlaced = pcRecInterlaced->getCrAddr(); + + //=== Interlace fields ==== + reinterlace(pOrgTop, pOrgBottom, pOrgInterlaced, iStride, iWidth, iHeight, isTff); + reinterlace(pRecTop, pRecBottom, pRecInterlaced, iStride, iWidth, iHeight, isTff); + + //===== calculate PSNR ===== + for( y = 0; y < iHeight << 1; y++ ) + { + for( x = 0; x < iWidth; x++ ) + { + Int iDiff = (Int)( pOrgInterlaced[x] - pRecInterlaced[x] ); + uiSSDV_in += iDiff * iDiff; + } + pOrgInterlaced += iStride; + pRecInterlaced += iStride; + } + + Int maxvalY = 255 << (g_bitDepthY-8); + Int maxvalC = 255 << (g_bitDepthC-8); + Double fRefValueY = (Double) maxvalY * maxvalY * iSize*2; + Double fRefValueC = (Double) maxvalC * maxvalC * iSize*2 / 4.0; + dYPSNR_in = ( uiSSDY_in ? 10.0 * log10( fRefValueY / (Double)uiSSDY_in ) : 99.99 ); + dUPSNR_in = ( uiSSDU_in ? 10.0 * log10( fRefValueC / (Double)uiSSDU_in ) : 99.99 ); + dVPSNR_in = ( uiSSDV_in ? 10.0 * log10( fRefValueC / (Double)uiSSDV_in ) : 99.99 ); + + /* calculate the size of the access unit, excluding: + * - any AnnexB contributions (start_code_prefix, zero_byte, etc.,) + * - SEI NAL units + */ + UInt numRBSPBytes = 0; + for (AccessUnit::const_iterator it = accessUnit.begin(); it != accessUnit.end(); it++) + { + UInt numRBSPBytes_nal = UInt((*it)->m_nalUnitData.str().size()); + + if ((*it)->m_nalUnitType != NAL_UNIT_PREFIX_SEI && (*it)->m_nalUnitType != NAL_UNIT_SUFFIX_SEI) + numRBSPBytes += numRBSPBytes_nal; + } + + UInt uibits = numRBSPBytes * 8 ; + + //===== add PSNR ===== + m_gcAnalyzeAll_in.addResult (dYPSNR_in, dUPSNR_in, dVPSNR_in, (Double)uibits); + + printf("\n Interlaced frame %d: [Y %6.4lf dB U %6.4lf dB V %6.4lf dB]", pcPicOrgBottom->getPOC()/2 , dYPSNR_in, dUPSNR_in, dVPSNR_in ); + + pcOrgInterlaced->destroy(); + delete pcOrgInterlaced; + pcRecInterlaced->destroy(); + delete pcRecInterlaced; } @@ -2872,4 +3506,46 @@ return seiStartPos; } + +#if N0383_IL_CONSTRAINED_TILE_SETS_SEI +Void TEncGOP::xBuildTileSetsMap(TComPicSym* picSym) +{ + Int numCUs = picSym->getFrameWidthInCU() * picSym->getFrameHeightInCU(); + + for (Int i = 0; i < numCUs; i++) + { + picSym->setTileSetIdxMap(i, -1, 0, false); + } + + for (Int i = 0; i < m_pcCfg->getIlNumSetsInMessage(); i++) + { + TComTile* topLeftTile = picSym->getTComTile(m_pcCfg->getTopLeftTileIndex(i)); + TComTile* bottomRightTile = picSym->getTComTile(m_pcCfg->getBottomRightTileIndex(i)); + Int tileSetLeftEdgePosInCU = topLeftTile->getRightEdgePosInCU() - topLeftTile->getTileWidth() + 1; + Int tileSetRightEdgePosInCU = bottomRightTile->getRightEdgePosInCU(); + Int tileSetTopEdgePosInCU = topLeftTile->getBottomEdgePosInCU() - topLeftTile->getTileHeight() + 1; + Int tileSetBottomEdgePosInCU = bottomRightTile->getBottomEdgePosInCU(); + assert(tileSetLeftEdgePosInCU < tileSetRightEdgePosInCU && tileSetTopEdgePosInCU < tileSetBottomEdgePosInCU); + for (Int j = tileSetTopEdgePosInCU; j <= tileSetBottomEdgePosInCU; j++) + { + for (Int k = tileSetLeftEdgePosInCU; k <= tileSetRightEdgePosInCU; k++) + { + picSym->setTileSetIdxMap(j * picSym->getFrameWidthInCU() + k, i, m_pcCfg->getIlcIdc(i), false); + } + } + } + + if (m_pcCfg->getSkippedTileSetPresentFlag()) + { + Int skippedTileSetIdx = m_pcCfg->getIlNumSetsInMessage(); + for (Int i = 0; i < numCUs; i++) + { + if (picSym->getTileSetIdxMap(i) < 0) + { + picSym->setTileSetIdxMap(i, skippedTileSetIdx, 0, true); + } + } + } +} +#endif Void TEncGOP::dblMetric( TComPic* pcPic, UInt uiNumSlices ) Index: trunk/source/Lib/TLibEncoder/TEncGOP.h =================================================================== --- trunk/source/Lib/TLibEncoder/TEncGOP.h (revision 352) +++ trunk/source/Lib/TLibEncoder/TEncGOP.h (revision 442) @@ -145,7 +145,7 @@ Void init ( TEncTop* pcTEncTop ); #if SVC_EXTENSION - Void compressGOP ( Int iPicIdInGOP, Int iPOCLast, Int iNumPicRcvd, TComList& rcListPic, TComList& rcListPicYuvRec, std::list& accessUnitsInGOP ); + Void compressGOP ( Int iPicIdInGOP, Int iPOCLast, Int iNumPicRcvd, TComList& rcListPic, TComList& rcListPicYuvRec, std::list& accessUnitsInGOP, Bool isField, Bool isTff ); #else - Void compressGOP ( Int iPOCLast, Int iNumPicRcvd, TComList& rcListPic, TComList& rcListPicYuvRec, std::list& accessUnitsInGOP ); + Void compressGOP ( Int iPOCLast, Int iNumPicRcvd, TComList& rcListPic, TComList& rcListPicYuvRec, std::list& accessUnitsInGOP, Bool isField, Bool isTff ); #endif Void xAttachSliceDataToNalUnit (OutputNALUnit& rNalu, TComOutputBitstream*& rpcBitstreamRedirect); @@ -156,5 +156,7 @@ TComList* getListPic() { return m_pcListPic; } - Void printOutSummary ( UInt uiNumAllPicCoded ); +#if !SVC_EXTENSION + Void printOutSummary ( UInt uiNumAllPicCoded, Bool isField); +#endif Void preLoopFilterPicAll ( TComPic* pcPic, UInt64& ruiDist, UInt64& ruiBits ); @@ -166,8 +168,11 @@ protected: + + Void xInitGOP( Int iPOCLast, Int iNumPicRcvd, TComList& rcListPic, TComList& rcListPicYuvRecOut, Bool isField ); Void xInitGOP ( Int iPOC, Int iNumPicRcvd, TComList& rcListPic, TComList& rcListPicYuvRecOut ); - Void xGetBuffer ( TComList& rcListPic, TComList& rcListPicYuvRecOut, Int iNumPicRcvd, Int iTimeOffset, TComPic*& rpcPic, TComPicYuv*& rpcPicYuvRecOut, Int pocCurr ); + Void xGetBuffer ( TComList& rcListPic, TComList& rcListPicYuvRecOut, Int iNumPicRcvd, Int iTimeOffset, TComPic*& rpcPic, TComPicYuv*& rpcPicYuvRecOut, Int pocCurr, Bool isField ); Void xCalculateAddPSNR ( TComPic* pcPic, TComPicYuv* pcPicD, const AccessUnit&, Double dEncTime ); + Void xCalculateInterlacedAddPSNR( TComPic* pcPicOrgTop, TComPic* pcPicOrgBottom, TComPicYuv* pcPicRecTop, TComPicYuv* pcPicRecBottom, const AccessUnit& accessUnit, Double dEncTime ); UInt64 xFindDistortionFrame (TComPicYuv* pcPic0, TComPicYuv* pcPic1); @@ -183,4 +188,8 @@ SEIToneMappingInfo* xCreateSEIToneMappingInfo(); + +#if N0383_IL_CONSTRAINED_TILE_SETS_SEI + SEIInterLayerConstrainedTileSets* xCreateSEIInterLayerConstrainedTileSets(); +#endif Void xCreateLeadingSEIMessages (/*SEIMessages seiMessages,*/ AccessUnit &accessUnit, TComSPS *sps); @@ -197,4 +206,7 @@ m_nestedPictureTimingSEIPresentInAU = false; } +#if N0383_IL_CONSTRAINED_TILE_SETS_SEI + Void xBuildTileSetsMap(TComPicSym* picSym); +#endif Void dblMetric( TComPic* pcPic, UInt uiNumSlices ); #if M0457_COL_PICTURE_SIGNALING && !REMOVE_COL_PICTURE_SIGNALING Index: trunk/source/Lib/TLibEncoder/TEncSbac.cpp =================================================================== --- trunk/source/Lib/TLibEncoder/TEncSbac.cpp (revision 352) +++ trunk/source/Lib/TLibEncoder/TEncSbac.cpp (revision 442) @@ -804,5 +804,9 @@ Int iDQp = pcCU->getQP( uiAbsPartIdx ) - pcCU->getRefQP( uiAbsPartIdx ); +#if REPN_FORMAT_IN_VPS + Int qpBdOffsetY = pcCU->getSlice()->getQpBDOffsetY(); +#else Int qpBdOffsetY = pcCU->getSlice()->getSPS()->getQpBDOffsetY(); +#endif iDQp = (iDQp + 78 + qpBdOffsetY + (qpBdOffsetY/2)) % (52 + qpBdOffsetY) - 26 - (qpBdOffsetY/2); Index: trunk/source/Lib/TLibEncoder/TEncSearch.cpp =================================================================== --- trunk/source/Lib/TLibEncoder/TEncSearch.cpp (revision 352) +++ trunk/source/Lib/TLibEncoder/TEncSearch.cpp (revision 442) @@ -1104,5 +1104,9 @@ pcCU ->setTrIdxSubParts ( uiTrDepth, uiAbsPartIdx, uiFullDepth ); +#if REPN_FORMAT_IN_VPS + m_pcTrQuant->setQPforQuant ( pcCU->getQP( 0 ), TEXT_LUMA, pcCU->getSlice()->getQpBDOffsetY(), 0 ); +#else m_pcTrQuant->setQPforQuant ( pcCU->getQP( 0 ), TEXT_LUMA, pcCU->getSlice()->getSPS()->getQpBDOffsetY(), 0 ); +#endif #if RDOQ_CHROMA_LAMBDA @@ -3217,4 +3221,38 @@ 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++ ) { @@ -3266,4 +3304,10 @@ for ( Int iRefIdxTemp = 0; iRefIdxTemp < pcCU->getSlice()->getNumRefIdx(eRefPicList); iRefIdxTemp++ ) { +#if N0383_IL_CONSTRAINED_TILE_SETS_SEI + if (pcCU->getSlice()->getRefPic( eRefPicList, iRefIdxTemp )->isILR(pcCU->getLayerId()) && disableILP) + { + continue; + } +#endif #if (ENCODER_FAST_MODE) TComPic* pcPic = pcCU->getSlice()->getRefPic( eRefPicList, iRefIdxTemp ); @@ -3484,4 +3528,10 @@ testIter = false; //the fixed part is ILR, skip this iteration } +#if N0383_IL_CONSTRAINED_TILE_SETS_SEI + if (pcPic->isILR(pcCU->getLayerId()) && disableILP) + { + testIter = false; + } +#endif if(testIter) { @@ -3499,4 +3549,10 @@ testRefIdx = false; //the refined part is ILR, skip this reference pic } +#if N0383_IL_CONSTRAINED_TILE_SETS_SEI + if (pcPic->isILR(pcCU->getLayerId()) && disableILP) + { + testRefIdx = false; + } +#endif if(testRefIdx) { @@ -4610,6 +4666,11 @@ while((uiWidth>>uiMaxTrMode) < (g_uiMaxCUWidth>>g_uiMaxCUDepth)) uiMaxTrMode--; +#if REPN_FORMAT_IN_VPS + qpMin = bHighPass ? Clip3( -pcCU->getSlice()->getQpBDOffsetY(), MAX_QP, pcCU->getQP(0) - m_iMaxDeltaQP ) : pcCU->getQP( 0 ); + qpMax = bHighPass ? Clip3( -pcCU->getSlice()->getQpBDOffsetY(), MAX_QP, pcCU->getQP(0) + m_iMaxDeltaQP ) : pcCU->getQP( 0 ); +#else qpMin = bHighPass ? Clip3( -pcCU->getSlice()->getSPS()->getQpBDOffsetY(), MAX_QP, pcCU->getQP(0) - m_iMaxDeltaQP ) : pcCU->getQP( 0 ); qpMax = bHighPass ? Clip3( -pcCU->getSlice()->getSPS()->getQpBDOffsetY(), MAX_QP, pcCU->getQP(0) + m_iMaxDeltaQP ) : pcCU->getQP( 0 ); +#endif rpcYuvResi->subtract( pcYuvOrg, pcYuvPred, 0, uiWidth ); @@ -4860,5 +4921,9 @@ } +#if REPN_FORMAT_IN_VPS + m_pcTrQuant->setQPforQuant( pcCU->getQP( 0 ), TEXT_LUMA, pcCU->getSlice()->getQpBDOffsetY(), 0 ); +#else m_pcTrQuant->setQPforQuant( pcCU->getQP( 0 ), TEXT_LUMA, pcCU->getSlice()->getSPS()->getQpBDOffsetY(), 0 ); +#endif #if RDOQ_CHROMA_LAMBDA @@ -4946,5 +5011,9 @@ Pel *pcResiCurrY = m_pcQTTempTComYuv[ uiQTTempAccessLayer ].getLumaAddr( absTUPartIdx ); +#if REPN_FORMAT_IN_VPS m_pcTrQuant->setQPforQuant( pcCU->getQP( 0 ), TEXT_LUMA, pcCU->getSlice()->getSPS()->getQpBDOffsetY(), 0 ); +#else + m_pcTrQuant->setQPforQuant( pcCU->getQP( 0 ), TEXT_LUMA, pcCU->getSlice()->getSPS()->getQpBDOffsetY(), 0 ); +#endif Int scalingListType = 3 + g_eTTable[(Int)TEXT_LUMA]; @@ -5195,5 +5264,9 @@ } +#if REPN_FORMAT_IN_VPS + m_pcTrQuant->setQPforQuant( pcCU->getQP( 0 ), TEXT_LUMA, pcCU->getSlice()->getQpBDOffsetY(), 0 ); +#else m_pcTrQuant->setQPforQuant( pcCU->getQP( 0 ), TEXT_LUMA, pcCU->getSlice()->getSPS()->getQpBDOffsetY(), 0 ); +#endif #if RDOQ_CHROMA_LAMBDA @@ -5214,5 +5287,9 @@ const UInt uiTsSingleBitsY = m_pcEntropyCoder->getNumberOfWrittenBits(); +#if REPN_FORMAT_IN_VPS + m_pcTrQuant->setQPforQuant( pcCU->getQP( 0 ), TEXT_LUMA, pcCU->getSlice()->getQpBDOffsetY(), 0 ); +#else m_pcTrQuant->setQPforQuant( pcCU->getQP( 0 ), TEXT_LUMA, pcCU->getSlice()->getSPS()->getQpBDOffsetY(), 0 ); +#endif Int scalingListType = 3 + g_eTTable[(Int)TEXT_LUMA]; Index: trunk/source/Lib/TLibEncoder/TEncSlice.cpp =================================================================== --- trunk/source/Lib/TLibEncoder/TEncSlice.cpp (revision 352) +++ trunk/source/Lib/TLibEncoder/TEncSlice.cpp (revision 442) @@ -180,7 +180,7 @@ #if SVC_EXTENSION //\param vps VPS associated with the slice -Void TEncSlice::initEncSlice( TComPic* pcPic, Int pocLast, Int pocCurr, Int iNumPicRcvd, Int iGOPid, TComSlice*& rpcSlice, TComSPS* pSPS, TComPPS *pPPS, TComVPS *vps ) -#else -Void TEncSlice::initEncSlice( TComPic* pcPic, Int pocLast, Int pocCurr, Int iNumPicRcvd, Int iGOPid, TComSlice*& rpcSlice, TComSPS* pSPS, TComPPS *pPPS ) +Void TEncSlice::initEncSlice( TComPic* pcPic, Int pocLast, Int pocCurr, Int iNumPicRcvd, Int iGOPid, TComSlice*& rpcSlice, TComSPS* pSPS, TComPPS *pPPS, TComVPS *vps, Bool isField ) +#else +Void TEncSlice::initEncSlice( TComPic* pcPic, Int pocLast, Int pocCurr, Int iNumPicRcvd, Int iGOPid, TComSlice*& rpcSlice, TComSPS* pSPS, TComPPS *pPPS, Bool isField ) #endif { @@ -260,5 +260,9 @@ 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()))) +#endif { dQP += m_pcCfg->getGOPEntry(iGOPid).m_QPOffset; @@ -294,5 +298,7 @@ Int NumberBFrames = ( m_pcCfg->getGOPSize() - 1 ); Int SHIFT_QP = 12; - Double dLambda_scale = 1.0 - Clip3( 0.0, 0.5, 0.05*(Double)NumberBFrames ); + + Double dLambda_scale = 1.0 - Clip3( 0.0, 0.5, 0.05*(Double)(isField ? NumberBFrames/2 : NumberBFrames) ); + #if FULL_NBIT Int bitdepth_luma_qp_scale = 6 * (g_bitDepth - 8); @@ -327,5 +333,9 @@ } +#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 ) ) ); +#endif m_pdRdPicLambda[iDQpIdx] = dLambda; @@ -400,5 +410,5 @@ eSliceType = (pocLast == 0 || pocCurr % m_pcCfg->getIntraPeriod() == 0 || m_pcGOPEncoder->getGOPSize() == 0) ? I_SLICE : eSliceType; -#if REF_IDX_FRAMEWORK +#if SVC_EXTENSION if(m_pcCfg->getLayerId() > 0) { @@ -412,5 +422,9 @@ { 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 ) ) ); +#endif } @@ -467,5 +481,9 @@ 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); @@ -485,5 +503,5 @@ xStoreWPparam( pPPS->getUseWP(), pPPS->getWPBiPred() ); -#if SVC_EXTENSION && REF_IDX_FRAMEWORK +#if SVC_EXTENSION if( layerId > 0 ) { @@ -606,5 +624,9 @@ } +#if REPN_FORMAT_IN_VPS + qp = max( -pcSlice->getQpBDOffsetY(), min( MAX_QP, (Int) floor( recalQP + 0.5 ) ) ); +#else qp = max( -pcSPS->getQpBDOffsetY(), min( MAX_QP, (Int) floor( recalQP + 0.5 ) ) ); +#endif m_pdRdPicLambda[deltqQpIdx] = lambda; @@ -849,6 +871,11 @@ pcCU->initCU( rpcPic, uiCUAddr ); +#if REPN_FORMAT_IN_VPS + Int height = min( pcSlice->getSPS()->getMaxCUHeight(),pcSlice->getPicHeightInLumaSamples() - uiCUAddr / rpcPic->getFrameWidthInCU() * pcSlice->getSPS()->getMaxCUHeight() ); + Int width = min( pcSlice->getSPS()->getMaxCUWidth(), pcSlice->getPicWidthInLumaSamples() - uiCUAddr % rpcPic->getFrameWidthInCU() * pcSlice->getSPS()->getMaxCUWidth() ); +#else Int height = min( pcSlice->getSPS()->getMaxCUHeight(),pcSlice->getSPS()->getPicHeightInLumaSamples() - uiCUAddr / rpcPic->getFrameWidthInCU() * pcSlice->getSPS()->getMaxCUHeight() ); Int width = min( pcSlice->getSPS()->getMaxCUWidth(),pcSlice->getSPS()->getPicWidthInLumaSamples() - uiCUAddr % rpcPic->getFrameWidthInCU() * pcSlice->getSPS()->getMaxCUWidth() ); +#endif iSumHad = m_pcCuEncoder->updateLCUDataISlice(pcCU, uiCUAddr, width, height); @@ -1148,5 +1175,9 @@ #endif +#if REPN_FORMAT_IN_VPS + estQP = Clip3( -pcSlice->getQpBDOffsetY(), MAX_QP, estQP ); +#else estQP = Clip3( -pcSlice->getSPS()->getQpBDOffsetY(), MAX_QP, estQP ); +#endif m_pcRdCost->setLambda(estLambda); @@ -1176,6 +1207,11 @@ #if !M0036_RC_IMPROVEMENT UInt SAD = m_pcCuEncoder->getLCUPredictionSAD(); +#if REPN_FORMAT_IN_VPS + Int height = min( pcSlice->getSPS()->getMaxCUHeight(),pcSlice->getPicHeightInLumaSamples() - uiCUAddr / rpcPic->getFrameWidthInCU() * pcSlice->getSPS()->getMaxCUHeight() ); + Int width = min( pcSlice->getSPS()->getMaxCUWidth(),pcSlice->>getPicWidthInLumaSamples() - uiCUAddr % rpcPic->getFrameWidthInCU() * pcSlice->getSPS()->getMaxCUWidth() ); +#else Int height = min( pcSlice->getSPS()->getMaxCUHeight(),pcSlice->getSPS()->getPicHeightInLumaSamples() - uiCUAddr / rpcPic->getFrameWidthInCU() * pcSlice->getSPS()->getMaxCUHeight() ); Int width = min( pcSlice->getSPS()->getMaxCUWidth(),pcSlice->getSPS()->getPicWidthInLumaSamples() - uiCUAddr % rpcPic->getFrameWidthInCU() * pcSlice->getSPS()->getMaxCUWidth() ); +#endif Double MAD = (Double)SAD / (Double)(height * width); MAD = MAD * MAD; @@ -1253,6 +1289,11 @@ #if !M0036_RC_IMPROVEMENT UInt SAD = m_pcCuEncoder->getLCUPredictionSAD(); +#if REPN_FORMAT_IN_VPS + Int height = min( pcSlice->getSPS()->getMaxCUHeight(),pcSlice->getPicHeightInLumaSamples() - uiCUAddr / rpcPic->getFrameWidthInCU() * pcSlice->getSPS()->getMaxCUHeight() ); + Int width = min( pcSlice->getSPS()->getMaxCUWidth(),pcSlice->getPicWidthInLumaSamples() - uiCUAddr % rpcPic->getFrameWidthInCU() * pcSlice->getSPS()->getMaxCUWidth() ); +#else Int height = min( pcSlice->getSPS()->getMaxCUHeight(),pcSlice->getSPS()->getPicHeightInLumaSamples() - uiCUAddr / rpcPic->getFrameWidthInCU() * pcSlice->getSPS()->getMaxCUHeight() ); Int width = min( pcSlice->getSPS()->getMaxCUWidth(),pcSlice->getSPS()->getPicWidthInLumaSamples() - uiCUAddr % rpcPic->getFrameWidthInCU() * pcSlice->getSPS()->getMaxCUWidth() ); +#endif Double MAD = (Double)SAD / (Double)(height * width); MAD = MAD * MAD; @@ -1919,6 +1960,11 @@ UInt uiPosX = ( uiExternalAddress % rpcPic->getFrameWidthInCU() ) * g_uiMaxCUWidth+ g_auiRasterToPelX[ g_auiZscanToRaster[uiInternalAddress] ]; UInt uiPosY = ( uiExternalAddress / rpcPic->getFrameWidthInCU() ) * g_uiMaxCUHeight+ g_auiRasterToPelY[ g_auiZscanToRaster[uiInternalAddress] ]; +#if REPN_FORMAT_IN_VPS + UInt uiWidth = pcSlice->getPicWidthInLumaSamples(); + UInt uiHeight = pcSlice->getPicHeightInLumaSamples(); +#else UInt uiWidth = pcSlice->getSPS()->getPicWidthInLumaSamples(); UInt uiHeight = pcSlice->getSPS()->getPicHeightInLumaSamples(); +#endif while((uiPosX>=uiWidth||uiPosY>=uiHeight)&&!(uiPosX>=uiWidth&&uiPosY>=uiHeight)) { @@ -1942,6 +1988,11 @@ uiPosX = ( uiExternalAddress % rpcPic->getFrameWidthInCU() ) * g_uiMaxCUWidth+ g_auiRasterToPelX[ g_auiZscanToRaster[uiInternalAddress] ]; uiPosY = ( uiExternalAddress / rpcPic->getFrameWidthInCU() ) * g_uiMaxCUHeight+ g_auiRasterToPelY[ g_auiZscanToRaster[uiInternalAddress] ]; +#if REPN_FORMAT_IN_VPS + uiWidth = pcSlice->getPicWidthInLumaSamples(); + uiHeight = pcSlice->getPicHeightInLumaSamples(); +#else uiWidth = pcSlice->getSPS()->getPicWidthInLumaSamples(); uiHeight = pcSlice->getSPS()->getPicHeightInLumaSamples(); +#endif while((uiPosX>=uiWidth||uiPosY>=uiHeight)&&!(uiPosX>=uiWidth&&uiPosY>=uiHeight)) { Index: trunk/source/Lib/TLibEncoder/TEncSlice.h =================================================================== --- trunk/source/Lib/TLibEncoder/TEncSlice.h (revision 352) +++ trunk/source/Lib/TLibEncoder/TEncSlice.h (revision 442) @@ -118,8 +118,8 @@ #if SVC_EXTENSION Void initEncSlice ( TComPic* pcPic, Int pocLast, Int pocCurr, Int iNumPicRcvd, - Int iGOPid, TComSlice*& rpcSlice, TComSPS* pSPS, TComPPS *pPPS, TComVPS *vps ); + Int iGOPid, TComSlice*& rpcSlice, TComSPS* pSPS, TComPPS *pPPS, TComVPS *vps, Bool isField ); #else Void initEncSlice ( TComPic* pcPic, Int pocLast, Int pocCurr, Int iNumPicRcvd, - Int iGOPid, TComSlice*& rpcSlice, TComSPS* pSPS, TComPPS *pPPS ); + Int iGOPid, TComSlice*& rpcSlice, TComSPS* pSPS, TComPPS *pPPS, Bool isField ); #endif Index: trunk/source/Lib/TLibEncoder/TEncTop.cpp =================================================================== --- trunk/source/Lib/TLibEncoder/TEncTop.cpp (revision 352) +++ trunk/source/Lib/TLibEncoder/TEncTop.cpp (revision 442) @@ -83,7 +83,6 @@ m_pcBitCounters = NULL; m_pcRdCosts = NULL; -#if REF_IDX_FRAMEWORK +#if SVC_EXTENSION memset(m_cIlpPic, 0, sizeof(m_cIlpPic)); -#endif #if REF_IDX_MFM m_bMFMEnabledFlag = false; @@ -91,4 +90,8 @@ #if SCALED_REF_LAYER_OFFSETS m_numScaledRefLayerOffsets = 0; +#endif +#endif +#if POC_RESET_FLAG + m_pocAdjustmentValue = 0; #endif } @@ -107,5 +110,5 @@ initROM(); #endif - + // create processing unit classes #if SVC_EXTENSION @@ -288,9 +291,5 @@ delete[] m_pcRdCosts; -#if !SVC_EXTENSION - // destroy ROM - destroyROM(); -#endif -#if REF_IDX_FRAMEWORK +#if SVC_EXTENSION for(Int i=0; i>1; y++) + { + for (Int x = 0; x < width; x++) + { + dstField[x] = org[x]; + } + + dstField += stride; + org += stride*2; + } + +} + +#if SVC_EXTENSION +Void TEncTop::encodePrep( TComPicYuv* pcPicYuvOrg, Bool isTff ) +{ + if (pcPicYuvOrg) + { + /* -- TOP FIELD -- */ + /* -- Top field initialization -- */ + + TComPic *pcTopField; + xGetNewPicBuffer( pcTopField ); + pcTopField->getPicSym()->allocSaoParam(&m_cEncSAO); + pcTopField->setReconMark (false); + + pcTopField->getSlice(0)->setPOC( m_iPOCLast ); + pcTopField->getPicYuvRec()->setBorderExtension(false); + pcTopField->setTopField(isTff); + + Int nHeight = pcPicYuvOrg->getHeight(); + Int nWidth = pcPicYuvOrg->getWidth(); + Int nStride = pcPicYuvOrg->getStride(); + Int nPadLuma = pcPicYuvOrg->getLumaMargin(); + Int nPadChroma = pcPicYuvOrg->getChromaMargin(); + + // Get pointers + Pel * PicBufY = pcPicYuvOrg->getBufY(); + Pel * PicBufU = pcPicYuvOrg->getBufU(); + Pel * PicBufV = pcPicYuvOrg->getBufV(); + + Pel * pcTopFieldY = pcTopField->getPicYuvOrg()->getLumaAddr(); + Pel * pcTopFieldU = pcTopField->getPicYuvOrg()->getCbAddr(); + Pel * pcTopFieldV = pcTopField->getPicYuvOrg()->getCrAddr(); + + // compute image characteristics + if ( getUseAdaptiveQP() ) + { + m_cPreanalyzer.xPreanalyze( dynamic_cast( pcTopField ) ); + } + + /* -- Defield -- */ + + Bool isTop = isTff; + + separateFields(PicBufY + nPadLuma + nStride*nPadLuma, pcTopFieldY, nStride, nWidth, nHeight, isTop); + separateFields(PicBufU + nPadChroma + (nStride >> 1)*nPadChroma, pcTopFieldU, nStride >> 1, nWidth >> 1, nHeight >> 1, isTop); + separateFields(PicBufV + nPadChroma + (nStride >> 1)*nPadChroma, pcTopFieldV, nStride >> 1, nWidth >> 1, nHeight >> 1, isTop); + + /* -- BOTTOM FIELD -- */ + /* -- Bottom field initialization -- */ + + TComPic* pcBottomField; + xGetNewPicBuffer( pcBottomField ); + pcBottomField->getPicSym()->allocSaoParam(&m_cEncSAO); + pcBottomField->setReconMark (false); + + pcBottomField->getSlice(0)->setPOC( m_iPOCLast); + pcBottomField->getPicYuvRec()->setBorderExtension(false); + pcBottomField->setTopField(!isTff); + + nHeight = pcPicYuvOrg->getHeight(); + nWidth = pcPicYuvOrg->getWidth(); + nStride = pcPicYuvOrg->getStride(); + nPadLuma = pcPicYuvOrg->getLumaMargin(); + nPadChroma = pcPicYuvOrg->getChromaMargin(); + + // Get pointers + PicBufY = pcPicYuvOrg->getBufY(); + PicBufU = pcPicYuvOrg->getBufU(); + PicBufV = pcPicYuvOrg->getBufV(); + + Pel * pcBottomFieldY = pcBottomField->getPicYuvOrg()->getLumaAddr(); + Pel * pcBottomFieldU = pcBottomField->getPicYuvOrg()->getCbAddr(); + Pel * pcBottomFieldV = pcBottomField->getPicYuvOrg()->getCrAddr(); + + // Compute image characteristics + if ( getUseAdaptiveQP() ) + { + m_cPreanalyzer.xPreanalyze( dynamic_cast( pcBottomField ) ); + } + + /* -- Defield -- */ + + isTop = !isTff; + + separateFields(PicBufY + nPadLuma + nStride*nPadLuma, pcBottomFieldY, nStride, nWidth, nHeight, isTop); + separateFields(PicBufU + nPadChroma + (nStride >> 1)*nPadChroma, pcBottomFieldU, nStride >> 1, nWidth >> 1, nHeight >> 1, isTop); + separateFields(PicBufV + nPadChroma + (nStride >> 1)*nPadChroma, pcBottomFieldV, nStride >> 1, nWidth >> 1, nHeight >> 1, isTop); + + } +} + +Void TEncTop::encode( TComPicYuv* pcPicYuvOrg, TComList& rcListPicYuvRecOut, std::list& accessUnitsOut, Int iPicIdInGOP, Bool isTff ) +{ + // compress GOP + if (m_iPOCLast == 0) // compress field 0 + { + m_cGOPEncoder.compressGOP(iPicIdInGOP, m_iPOCLast, m_iNumPicRcvd, m_cListPic, rcListPicYuvRecOut, accessUnitsOut, true, isTff); + } + + if (pcPicYuvOrg) + { + TComPicYuv* rpcPicYuvRec = new TComPicYuv; + if ( rcListPicYuvRecOut.size() == (UInt)m_iGOPSize ) + { + rpcPicYuvRec = rcListPicYuvRecOut.popFront(); + } + else + { + rpcPicYuvRec->create( m_iSourceWidth, m_iSourceHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth ); + } + rcListPicYuvRecOut.pushBack( rpcPicYuvRec ); + } + + // compress GOP + m_cGOPEncoder.compressGOP(iPicIdInGOP, m_iPOCLast, m_iNumPicRcvd, m_cListPic, rcListPicYuvRecOut, accessUnitsOut, true, isTff); + + m_uiNumAllPicCoded ++; +} +#else +Void TEncTop::encode(Bool flush, TComPicYuv* pcPicYuvOrg, TComList& rcListPicYuvRecOut, std::list& accessUnitsOut, Int& iNumEncoded, Bool isTff) +{ + /* -- TOP FIELD -- */ + + if (pcPicYuvOrg) + { + + /* -- Top field initialization -- */ + + TComPic *pcTopField; + xGetNewPicBuffer( pcTopField ); + pcTopField->getPicSym()->allocSaoParam(&m_cEncSAO); + pcTopField->setReconMark (false); + + pcTopField->getSlice(0)->setPOC( m_iPOCLast ); + pcTopField->getPicYuvRec()->setBorderExtension(false); + pcTopField->setTopField(isTff); + + Int nHeight = pcPicYuvOrg->getHeight(); + Int nWidth = pcPicYuvOrg->getWidth(); + Int nStride = pcPicYuvOrg->getStride(); + Int nPadLuma = pcPicYuvOrg->getLumaMargin(); + Int nPadChroma = pcPicYuvOrg->getChromaMargin(); + + // Get pointers + Pel * PicBufY = pcPicYuvOrg->getBufY(); + Pel * PicBufU = pcPicYuvOrg->getBufU(); + Pel * PicBufV = pcPicYuvOrg->getBufV(); + + Pel * pcTopFieldY = pcTopField->getPicYuvOrg()->getLumaAddr(); + Pel * pcTopFieldU = pcTopField->getPicYuvOrg()->getCbAddr(); + Pel * pcTopFieldV = pcTopField->getPicYuvOrg()->getCrAddr(); + + // compute image characteristics + if ( getUseAdaptiveQP() ) + { + m_cPreanalyzer.xPreanalyze( dynamic_cast( pcTopField ) ); + } + + /* -- Defield -- */ + + Bool isTop = isTff; + + separateFields(PicBufY + nPadLuma + nStride*nPadLuma, pcTopFieldY, nStride, nWidth, nHeight, isTop); + separateFields(PicBufU + nPadChroma + (nStride >> 1)*nPadChroma, pcTopFieldU, nStride >> 1, nWidth >> 1, nHeight >> 1, isTop); + separateFields(PicBufV + nPadChroma + (nStride >> 1)*nPadChroma, pcTopFieldV, nStride >> 1, nWidth >> 1, nHeight >> 1, isTop); + + } + + if (m_iPOCLast == 0) // compress field 0 + { + m_cGOPEncoder.compressGOP(m_iPOCLast, m_iNumPicRcvd, m_cListPic, rcListPicYuvRecOut, accessUnitsOut, true, isTff); + } + + /* -- BOTTOM FIELD -- */ + + if (pcPicYuvOrg) + { + + /* -- Bottom field initialization -- */ + + TComPic* pcBottomField; + xGetNewPicBuffer( pcBottomField ); + pcBottomField->getPicSym()->allocSaoParam(&m_cEncSAO); + pcBottomField->setReconMark (false); + + TComPicYuv* rpcPicYuvRec = new TComPicYuv; + if ( rcListPicYuvRecOut.size() == (UInt)m_iGOPSize ) + { + rpcPicYuvRec = rcListPicYuvRecOut.popFront(); + } + else + { + rpcPicYuvRec->create( m_iSourceWidth, m_iSourceHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth ); + } + rcListPicYuvRecOut.pushBack( rpcPicYuvRec ); + + pcBottomField->getSlice(0)->setPOC( m_iPOCLast); + pcBottomField->getPicYuvRec()->setBorderExtension(false); + pcBottomField->setTopField(!isTff); + + int nHeight = pcPicYuvOrg->getHeight(); + int nWidth = pcPicYuvOrg->getWidth(); + int nStride = pcPicYuvOrg->getStride(); + int nPadLuma = pcPicYuvOrg->getLumaMargin(); + int nPadChroma = pcPicYuvOrg->getChromaMargin(); + + // Get pointers + Pel * PicBufY = pcPicYuvOrg->getBufY(); + Pel * PicBufU = pcPicYuvOrg->getBufU(); + Pel * PicBufV = pcPicYuvOrg->getBufV(); + + Pel * pcBottomFieldY = pcBottomField->getPicYuvOrg()->getLumaAddr(); + Pel * pcBottomFieldU = pcBottomField->getPicYuvOrg()->getCbAddr(); + Pel * pcBottomFieldV = pcBottomField->getPicYuvOrg()->getCrAddr(); + + // Compute image characteristics + if ( getUseAdaptiveQP() ) + { + m_cPreanalyzer.xPreanalyze( dynamic_cast( pcBottomField ) ); + } + + /* -- Defield -- */ + + Bool isTop = !isTff; + + separateFields(PicBufY + nPadLuma + nStride*nPadLuma, pcBottomFieldY, nStride, nWidth, nHeight, isTop); + separateFields(PicBufU + nPadChroma + (nStride >> 1)*nPadChroma, pcBottomFieldU, nStride >> 1, nWidth >> 1, nHeight >> 1, isTop); + separateFields(PicBufV + nPadChroma + (nStride >> 1)*nPadChroma, pcBottomFieldV, nStride >> 1, nWidth >> 1, nHeight >> 1, isTop); + + } + + if ( ( !(m_iNumPicRcvd) || (!flush && m_iPOCLast != 1 && m_iNumPicRcvd != m_iGOPSize && m_iGOPSize)) ) + { + iNumEncoded = 0; + return; + } + + // compress GOP + m_cGOPEncoder.compressGOP(m_iPOCLast, m_iNumPicRcvd, m_cListPic, rcListPicYuvRecOut, accessUnitsOut, true, isTff); + + iNumEncoded = m_iNumPicRcvd; + m_iNumPicRcvd = 0; m_uiNumAllPicCoded += iNumEncoded; } @@ -523,5 +791,9 @@ //only for scalable extension +#if SCALABILITY_MASK_E0104 + assert( m_cVPS.getScalabilityMask(2) == true ); +#else assert( m_cVPS.getScalabilityMask(1) == true ); +#endif } } @@ -560,5 +832,9 @@ //only for scalable extension +#if SCALABILITY_MASK_E0104 + assert( m_cVPS.getScalabilityMask(2) == true ); +#else assert( m_cVPS.getScalabilityMask(1) == true ); +#endif } } @@ -682,4 +958,11 @@ } +#if REPN_FORMAT_IN_VPS + m_cSPS.setBitDepthY( m_cVPS.getVpsRepFormat( m_cVPS.getVpsRepFormatIdx( m_layerId ) )->getBitDepthVpsLuma() ); + m_cSPS.setBitDepthC( m_cVPS.getVpsRepFormat( m_cVPS.getVpsRepFormatIdx( m_layerId ) )->getBitDepthVpsChroma() ); + + m_cSPS.setQpBDOffsetY ( 6*(m_cVPS.getVpsRepFormat( m_cVPS.getVpsRepFormatIdx( m_layerId ) )->getBitDepthVpsLuma() - 8) ); + m_cSPS.setQpBDOffsetC ( 6*(m_cVPS.getVpsRepFormat( m_cVPS.getVpsRepFormatIdx( m_layerId ) )->getBitDepthVpsChroma() - 8) ); +#else m_cSPS.setBitDepthY( g_bitDepthY ); m_cSPS.setBitDepthC( g_bitDepthC ); @@ -687,4 +970,5 @@ m_cSPS.setQpBDOffsetY ( 6*(g_bitDepthY - 8) ); m_cSPS.setQpBDOffsetC ( 6*(g_bitDepthC - 8) ); +#endif m_cSPS.setUseSAO( m_bUseSAO ); @@ -745,8 +1029,24 @@ Void TEncTop::xInitPPS() { +#if IL_SL_SIGNALLING_N0371 + m_cPPS.setLayerId(m_layerId); +#endif + m_cPPS.setConstrainedIntraPred( m_bUseConstrainedIntraPred ); Bool bUseDQP = (getMaxCuDQPDepth() > 0)? true : false; +#if REPN_FORMAT_IN_VPS + Int lowestQP; + if( m_layerId == 0 || m_cSPS.getUpdateRepFormatFlag() ) + { + lowestQP = - m_cSPS.getQpBDOffsetY(); + } + else + { + lowestQP = - (m_cVPS.getVpsRepFormat( m_cVPS.getVpsRepFormatIdx( m_layerId ) )->getBitDepthVpsLuma() - 8) * 6; + } +#else Int lowestQP = - m_cSPS.getQpBDOffsetY(); +#endif if(getUseLossless()) @@ -860,5 +1160,5 @@ } } -#if REF_IDX_FRAMEWORK +#if SVC_EXTENSION if (!m_layerId) { @@ -869,17 +1169,19 @@ m_cPPS.setListsModificationPresentFlag(true); } -#endif -#if SVC_EXTENSION + m_cPPS.setPPSId ( m_iPPSIdCnt ); m_cPPS.setSPSId ( m_iSPSIdCnt ); #endif +#if POC_RESET_FLAG + m_cPPS.setNumExtraSliceHeaderBits( 2 ); +#endif } //Function for initializing m_RPSList, a list of TComReferencePictureSet, based on the GOPEntry objects read from the config file. -Void TEncTop::xInitRPS() +Void TEncTop::xInitRPS(Bool isFieldCoding) { TComReferencePictureSet* rps; - m_cSPS.createRPSList(getGOPSize()+m_extraRPSs); + m_cSPS.createRPSList(getGOPSize()+m_extraRPSs+1); TComRPSList* rpsList = m_cSPS.getRPSList(); @@ -982,5 +1284,5 @@ printf("Warning: number of negative pictures in RPS is different between intra and inter RPS specified in the config file.\n"); rps->setNumberOfNegativePictures(numNeg); - rps->setNumberOfPositivePictures(numNeg+numPos); + rps->setNumberOfPictures(numNeg+numPos); } if (numPos != rps->getNumberOfPositivePictures()) @@ -988,5 +1290,5 @@ printf("Warning: number of positive pictures in RPS is different between intra and inter RPS specified in the config file.\n"); rps->setNumberOfPositivePictures(numPos); - rps->setNumberOfPositivePictures(numNeg+numPos); + rps->setNumberOfPictures(numNeg+numPos); } RPSTemp.setNumberOfPictures(numNeg+numPos); @@ -1052,5 +1354,21 @@ #endif //INTER_RPS_AUTO } - + //In case of field coding, we need to set special parameters for the first bottom field of the sequence, since it is not specified in the cfg file. + //The position = GOPSize + extraRPSs which is (a priori) unused is reserved for this field in the RPS. + if (isFieldCoding) + { + rps = rpsList->getReferencePictureSet(getGOPSize()+m_extraRPSs); + rps->setNumberOfPictures(1); + rps->setNumberOfNegativePictures(1); + rps->setNumberOfPositivePictures(0); + rps->setNumberOfLongtermPictures(0); + rps->setDeltaPOC(0,-1); + rps->setPOC(0,0); + rps->setUsed(0,true); + rps->setInterRPSPrediction(false); + rps->setDeltaRIdxMinus1(0); + rps->setDeltaRPS(0); + rps->setNumRefIdc(0); +} } @@ -1061,5 +1379,4 @@ { slice->setRPSidx(GOPid); - for(Int extraNum=m_iGOPSize; extraNumgetPic()->isField()) + { + slice->setRPSidx(m_iGOPSize+m_extraRPSs); + } + slice->setRPS(getSPS()->getRPSList()->getReferencePictureSet(slice->getRPSidx())); slice->getRPS()->setNumberOfPictures(slice->getRPS()->getNumberOfNegativePictures()+slice->getRPS()->getNumberOfPositivePictures()); - } @@ -1215,5 +1536,6 @@ #endif -#if REF_IDX_FRAMEWORK +#if SVC_EXTENSION +#if !REPN_FORMAT_IN_VPS Void TEncTop::xInitILRP() { @@ -1249,5 +1571,57 @@ } } - +#else +Void TEncTop::xInitILRP() +{ + RepFormat *repFormat = m_cVPS.getVpsRepFormat( m_cVPS.getVpsRepFormatIdx( m_layerId ) ); + Int bitDepthY,bitDepthC,picWidth,picHeight; + + if( m_cSPS.getUpdateRepFormatFlag() ) + { + bitDepthY = m_cSPS.getBitDepthY(); + bitDepthC = m_cSPS.getBitDepthC(); + picWidth = m_cSPS.getPicWidthInLumaSamples(); + picHeight = m_cSPS.getPicHeightInLumaSamples(); + } + else + { + bitDepthY = repFormat->getBitDepthVpsLuma(); + bitDepthC = repFormat->getBitDepthVpsChroma(); + picWidth = repFormat->getPicWidthVpsInLumaSamples(); + picHeight = repFormat->getPicHeightVpsInLumaSamples(); + } + + if(m_layerId > 0) + { + g_bitDepthY = bitDepthY; + g_bitDepthC = bitDepthC; + g_uiMaxCUWidth = m_cSPS.getMaxCUWidth(); + g_uiMaxCUHeight = m_cSPS.getMaxCUHeight(); + g_uiMaxCUDepth = m_cSPS.getMaxCUDepth(); + g_uiAddCUDepth = max (0, m_cSPS.getLog2MinCodingBlockSize() - (Int)m_cSPS.getQuadtreeTULog2MinSize() ); + + Int numReorderPics[MAX_TLAYER]; + Window &conformanceWindow = m_cSPS.getConformanceWindow(); + Window defaultDisplayWindow = m_cSPS.getVuiParametersPresentFlag() ? m_cSPS.getVuiParameters()->getDefaultDisplayWindow() : Window(); + + if (m_cIlpPic[0] == NULL) + { + for (Int j=0; j < MAX_LAYERS /*MAX_NUM_REF*/; j++) // consider to set to NumDirectRefLayers[LayerIdInVps[nuh_layer_id]] + { + m_cIlpPic[j] = new TComPic; +#if SVC_UPSAMPLING + m_cIlpPic[j]->create(picWidth, picHeight, 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, true); +#endif + for (Int i=0; igetPicSym()->getNumberOfCUsInFrame(); i++) + { + m_cIlpPic[j]->getPicSym()->getCU(i)->initCU(m_cIlpPic[j], i); + } + } + } + } +} +#endif Void TEncTop::setILRPic(TComPic *pcPic) { @@ -1263,4 +1637,8 @@ 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()); + } } } Index: trunk/source/Lib/TLibEncoder/TEncTop.h =================================================================== --- trunk/source/Lib/TLibEncoder/TEncTop.h (revision 352) +++ trunk/source/Lib/TLibEncoder/TEncTop.h (revision 442) @@ -130,10 +130,8 @@ #if SVC_EXTENSION + TEncTop** m_ppcTEncTop; TEncTop* getLayerEnc(UInt layer) { return m_ppcTEncTop[layer]; } -#endif -#if REF_IDX_FRAMEWORK TComPic* m_cIlpPic[MAX_NUM_REF]; ///< Inter layer Prediction picture = upsampled picture -#endif #if REF_IDX_MFM Bool m_bMFMEnabledFlag; @@ -145,4 +143,8 @@ UInt m_numScaledRefLayerOffsets; Window m_scaledRefLayerWindow[MAX_LAYERS]; +#endif +#if POC_RESET_FLAG + Int m_pocAdjustmentValue; +#endif #endif protected: @@ -152,6 +154,6 @@ Void xInitPPSforTiles (); - Void xInitRPS (); ///< initialize PPS from encoder options -#if REF_IDX_FRAMEWORK + Void xInitRPS (Bool isFieldCoding); ///< initialize PPS from encoder options +#if SVC_EXTENSION Void xInitILRP(); #endif @@ -162,5 +164,5 @@ Void create (); Void destroy (); - Void init (); + Void init (Bool isFieldCoding); Void deletePicBuffer (); @@ -207,5 +209,4 @@ Int getNumPicRcvd () { return m_iNumPicRcvd; } Void setNumPicRcvd ( Int num ) { m_iNumPicRcvd = num; } -#endif #if SCALED_REF_LAYER_OFFSETS Void setNumScaledRefLayerOffsets(Int x) { m_numScaledRefLayerOffsets = x; } @@ -213,4 +214,5 @@ Window& getScaledRefLayerWindow(Int x) { return m_scaledRefLayerWindow[x]; } #endif +#endif // ------------------------------------------------------------------------------------------------------------------- @@ -220,8 +222,6 @@ /// encode several number of pictures until end-of-sequence #if SVC_EXTENSION -#if REF_IDX_FRAMEWORK TComPic** getIlpList() { return m_cIlpPic; } Void setILRPic(TComPic *pcPic); -#endif #if REF_IDX_MFM Void setMFMEnabledFlag (Bool flag) {m_bMFMEnabledFlag = flag;} @@ -236,15 +236,25 @@ fstream* getBLSyntaxFile() { return m_pBLSyntaxFile; } #endif - Void encode( TComPicYuv* pcPicYuvOrg, TComList& rcListPicYuvRecOut, std::list& accessUnitsOut, Int iPicIdInGOP ); + Void encode( TComPicYuv* pcPicYuvOrg, TComList& rcListPicYuvRecOut, std::list& accessUnitsOut, Int iPicIdInGOP ); Void encodePrep( TComPicYuv* pcPicYuvOrg ); + Void encode( TComPicYuv* pcPicYuvOrg, TComList& rcListPicYuvRecOut, std::list& accessUnitsOut, Int iPicIdInGOP, Bool isTff ); + Void encodePrep( TComPicYuv* pcPicYuvOrg, Bool isTff ); #if VPS_EXTN_DIRECT_REF_LAYERS TEncTop* getRefLayerEnc(UInt refLayerIdc); #endif -#else +#if POC_RESET_FLAG + Int getPocAdjustmentValue() { return m_pocAdjustmentValue;} + Void setPocAdjustmentValue(Int x) { m_pocAdjustmentValue = x; } +#endif +#else //SVC_EXTENSION Void encode( Bool bEos, TComPicYuv* pcPicYuvOrg, TComList& rcListPicYuvRecOut, - std::list& accessUnitsOut, Int& iNumEncoded ); -#endif - - void printSummary() { m_cGOPEncoder.printOutSummary (m_uiNumAllPicCoded); } + std::list& accessUnitsOut, Int& iNumEncoded ); + + /// encode several number of pictures until end-of-sequence + Void encode( bool bEos, TComPicYuv* pcPicYuvOrg, TComList& rcListPicYuvRecOut, + std::list& accessUnitsOut, Int& iNumEncoded, Bool isTff); + + Void printSummary(Bool isField) { m_cGOPEncoder.printOutSummary (m_uiNumAllPicCoded, isField); } +#endif //#if SVC_EXTENSION };