Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
aom-rav1e
Commits
12e5ec6a
Commit
12e5ec6a
authored
Nov 25, 2013
by
Jingning Han
Committed by
Gerrit Code Review
Nov 25, 2013
Browse files
Merge "Separate setup_scale_factor/extend_frame_borders"
parents
2d50c849
86d2a9b9
Changes
3
Hide whitespace changes
Inline
Side-by-side
vp9/common/vp9_reconinter.c
View file @
12e5ec6a
...
...
@@ -219,9 +219,6 @@ void vp9_setup_scale_factors(VP9_COMMON *cm, int i) {
vp9_setup_scale_factors_for_frame
(
sf
,
sfc
,
fb
->
y_crop_width
,
fb
->
y_crop_height
,
cm
->
width
,
cm
->
height
);
if
(
vp9_is_scaled
(
sfc
))
vp9_extend_frame_borders
(
fb
,
cm
->
subsampling_x
,
cm
->
subsampling_y
);
}
}
vp9/decoder/vp9_decodeframe.c
View file @
12e5ec6a
...
...
@@ -11,6 +11,8 @@
#include
<assert.h>
#include
"./vp9_rtcd.h"
#include
"./vpx_scale_rtcd.h"
#include
"vpx_mem/vpx_mem.h"
#include
"vpx_scale/vpx_scale.h"
...
...
@@ -1164,8 +1166,12 @@ static size_t read_uncompressed_header(VP9D_COMP *pbi,
cm
->
allow_high_precision_mv
=
vp9_rb_read_bit
(
rb
);
cm
->
mcomp_filter_type
=
read_interp_filter_type
(
rb
);
for
(
i
=
0
;
i
<
ALLOWED_REFS_PER_FRAME
;
++
i
)
for
(
i
=
0
;
i
<
ALLOWED_REFS_PER_FRAME
;
++
i
)
{
vp9_setup_scale_factors
(
cm
,
i
);
if
(
vp9_is_scaled
(
&
cm
->
active_ref_scale_comm
[
i
]))
vp9_extend_frame_borders
(
&
cm
->
yv12_fb
[
cm
->
active_ref_idx
[
i
]],
cm
->
subsampling_x
,
cm
->
subsampling_y
);
}
}
}
...
...
vp9/encoder/vp9_onyx_if.c
View file @
12e5ec6a
...
...
@@ -3615,8 +3615,12 @@ int vp9_get_compressed_data(VP9_PTR ptr, unsigned int *frame_flags,
VP9BORDERINPIXELS
);
// Calculate scaling factors for each of the 3 available references
for
(
i
=
0
;
i
<
ALLOWED_REFS_PER_FRAME
;
++
i
)
for
(
i
=
0
;
i
<
ALLOWED_REFS_PER_FRAME
;
++
i
)
{
vp9_setup_scale_factors
(
cm
,
i
);
if
(
vp9_is_scaled
(
&
cm
->
active_ref_scale_comm
[
i
]))
vp9_extend_frame_borders
(
&
cm
->
yv12_fb
[
cm
->
active_ref_idx
[
i
]],
cm
->
subsampling_x
,
cm
->
subsampling_y
);
}
vp9_setup_interp_filters
(
&
cpi
->
mb
.
e_mbd
,
DEFAULT_INTERP_FILTER
,
cm
);
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment