Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
V
VVCSoftware_VTM
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Philip Cowan
VVCSoftware_VTM
Commits
9bee106f
Commit
9bee106f
authored
5 years ago
by
Frank Bossen
Browse files
Options
Downloads
Patches
Plain Diff
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
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
cfg/rpr/scale4.0x.cfg
+0
-6
0 additions, 6 deletions
cfg/rpr/scale4.0x.cfg
source/Lib/CommonLib/CommonDef.h
+1
-1
1 addition, 1 deletion
source/Lib/CommonLib/CommonDef.h
source/Lib/CommonLib/InterPrediction.cpp
+1
-1
1 addition, 1 deletion
source/Lib/CommonLib/InterPrediction.cpp
with
2 additions
and
8 deletions
cfg/rpr/scale4.0x.cfg
deleted
100644 → 0
+
0
−
6
View file @
cd7c601c
# Reference picture resampling CE settings for scaling ratio and number of encoded frames
ScalingRatioHor
:
4.0
ScalingRatioVer
:
4.0
FractionNumFrames
:
0.5
UpscaledOutput
:
1
This diff is collapsed.
Click to expand it.
source/Lib/CommonLib/CommonDef.h
+
1
−
1
View file @
9bee106f
...
...
@@ -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
sca
ling ratio
allowed in the software, it is used to allocated an internla buffer in the rescaling
static
const
int
MAX_SCALING_RATIO
=
2
;
// max
downsamp
ling 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
;
...
...
This diff is collapsed.
Click to expand it.
source/Lib/CommonLib/InterPrediction.cpp
+
1
−
1
View file @
9bee106f
...
...
@@ -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
)];
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment