diff --git a/source/App/EncoderApp/EncAppCfg.cpp b/source/App/EncoderApp/EncAppCfg.cpp index 18ca0949fc593ea38fca6dd112d2f11d56b2f7da..c3f340c9444d7fa3fa46c5dd84e89f34bd6c4716 100644 --- a/source/App/EncoderApp/EncAppCfg.cpp +++ b/source/App/EncoderApp/EncAppCfg.cpp @@ -3674,7 +3674,7 @@ void EncAppCfg::xPrintParameter() #if JVET_O1164_RPR if( m_rprEnabled ) { - msg( VERBOSE, "RPR:%1.2lfx, %1.2lfx|%d", m_scalingRatioHor, m_scalingRatioVer, m_switchPocPeriod ); + msg( VERBOSE, "RPR:(%1.2lfx, %1.2lfx)|%d", m_scalingRatioHor, m_scalingRatioVer, m_switchPocPeriod ); } else { diff --git a/source/Lib/CommonLib/Picture.cpp b/source/Lib/CommonLib/Picture.cpp index b08b42891c3f4940288450a106df6a0df821d0b8..776b2fa95636aee15a75726fd28371b574b2d3bf 100644 --- a/source/Lib/CommonLib/Picture.cpp +++ b/source/Lib/CommonLib/Picture.cpp @@ -1394,12 +1394,20 @@ void Picture::extendPicBorder() PelBuf Picture::getBuf( const ComponentID compID, const PictureType &type ) { +#if JVET_O1164_RPR + return M_BUFS( ( type == PIC_ORIGINAL || type == PIC_TRUE_ORIGINAL || type == PIC_ORIGINAL_INPUT || type == PIC_TRUE_ORIGINAL_INPUT ) ? 0 : scheduler.getSplitPicId(), type ).getBuf( compID ); +#else return M_BUFS( ( type == PIC_ORIGINAL || type == PIC_TRUE_ORIGINAL ) ? 0 : scheduler.getSplitPicId(), type ).getBuf( compID ); +#endif } const CPelBuf Picture::getBuf( const ComponentID compID, const PictureType &type ) const { +#if JVET_O1164_RPR + return M_BUFS( ( type == PIC_ORIGINAL || type == PIC_TRUE_ORIGINAL || type == PIC_ORIGINAL_INPUT || type == PIC_TRUE_ORIGINAL_INPUT ) ? 0 : scheduler.getSplitPicId(), type ).getBuf( compID ); +#else return M_BUFS( ( type == PIC_ORIGINAL || type == PIC_TRUE_ORIGINAL ) ? 0 : scheduler.getSplitPicId(), type ).getBuf( compID ); +#endif } PelBuf Picture::getBuf( const CompArea &blk, const PictureType &type ) @@ -1410,8 +1418,11 @@ PelBuf Picture::getBuf( const CompArea &blk, const PictureType &type ) } #if ENABLE_SPLIT_PARALLELISM +#if JVET_O1164_RPR + const int jId = ( type == PIC_ORIGINAL || type == PIC_TRUE_ORIGINAL || type == PIC_ORIGINAL_INPUT || type == PIC_TRUE_ORIGINAL_INPUT ) ? 0 : scheduler.getSplitPicId(); +#else const int jId = ( type == PIC_ORIGINAL || type == PIC_TRUE_ORIGINAL ) ? 0 : scheduler.getSplitPicId(); - +#endif #endif #if !KEEP_PRED_AND_RESI_SIGNALS if( type == PIC_RESIDUAL || type == PIC_PREDICTION )