Skip to content
Snippets Groups Projects
Commit 9bee106f authored by Frank Bossen's avatar Frank Bossen
Browse files

Fix #748: reduce amount of picture padding for RPR, remove 4x RPR cfg

parent cd7c601c
No related branches found
No related tags found
No related merge requests found
# Reference picture resampling CE settings for scaling ratio and number of encoded frames
ScalingRatioHor : 4.0
ScalingRatioVer : 4.0
FractionNumFrames : 0.5
UpscaledOutput : 1
......@@ -494,7 +494,7 @@ static const int EPBIN_WEIGHT_FACTOR = 4;
#endif
static const int ENC_PPS_ID_RPR = 3;
static const int SCALE_RATIO_BITS = 14;
static const int MAX_SCALING_RATIO = 8; // max scaling ratio allowed in the software, it is used to allocated an internla buffer in the rescaling
static const int MAX_SCALING_RATIO = 2; // max downsampling ratio for RPR
static const std::pair<int, int> SCALE_1X = std::pair<int, int>( 1 << SCALE_RATIO_BITS, 1 << SCALE_RATIO_BITS ); // scale ratio 1x
#if JVET_P0517_ADAPTIVE_COLOR_TRANSFORM
static const int DELTA_QP_FOR_Y_Cg = -5;
......
......@@ -2766,7 +2766,7 @@ bool InterPrediction::xPredInterBlkRPR( const std::pair<int, int>& scalingRatio,
refHeight = std::max<int>( 1, refHeight );
CHECK( MAX_CU_SIZE * MAX_SCALING_RATIO < refHeight + vFilterSize - 1 + extSize, "Buffer size is not enough, increase MAX_SCALING_RATIO" );
CHECK( MAX_CU_SIZE * MAX_SCALING_RATIO + 16 < refHeight + vFilterSize - 1 + extSize, "Buffer is not large enough, increase MAX_SCALING_RATIO" );
Pel buffer[( MAX_CU_SIZE + 16 ) * ( MAX_CU_SIZE * MAX_SCALING_RATIO + 16 )];
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment