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
Yushin Cho
aom-rav1e
Commits
336e2552
Commit
336e2552
authored
Oct 09, 2014
by
hkuang
Committed by
Gerrit Code Review
Oct 09, 2014
Browse files
Merge "Remove unnecessary scale check in set_ref."
parents
9a29fdba
15a3e5f7
Changes
2
Hide whitespace changes
Inline
Side-by-side
vp9/decoder/vp9_decodeframe.c
View file @
336e2552
...
...
@@ -389,9 +389,6 @@ static void set_ref(VP9_COMMON *const cm, MACROBLOCKD *const xd,
MB_MODE_INFO
*
const
mbmi
=
&
xd
->
mi
[
0
].
src_mi
->
mbmi
;
RefBuffer
*
ref_buffer
=
&
cm
->
frame_refs
[
mbmi
->
ref_frame
[
idx
]
-
LAST_FRAME
];
xd
->
block_refs
[
idx
]
=
ref_buffer
;
if
(
!
vp9_is_valid_scale
(
&
ref_buffer
->
sf
))
vpx_internal_error
(
&
cm
->
error
,
VPX_CODEC_UNSUP_BITSTREAM
,
"Invalid scale factors"
);
if
(
ref_buffer
->
buf
->
corrupted
)
vpx_internal_error
(
&
cm
->
error
,
VPX_CODEC_CORRUPT_FRAME
,
"Block reference is corrupt"
);
...
...
vp9/decoder/vp9_decodemv.c
View file @
336e2552
...
...
@@ -436,8 +436,7 @@ static void read_inter_block_mode_info(VP9_COMMON *const cm,
for
(
ref
=
0
;
ref
<
1
+
is_compound
;
++
ref
)
{
const
MV_REFERENCE_FRAME
frame
=
mbmi
->
ref_frame
[
ref
];
const
int
ref_idx
=
frame
-
LAST_FRAME
;
if
(
cm
->
frame_refs
[
ref_idx
].
sf
.
x_scale_fp
==
REF_INVALID_SCALE
||
cm
->
frame_refs
[
ref_idx
].
sf
.
y_scale_fp
==
REF_INVALID_SCALE
)
if
((
!
vp9_is_valid_scale
(
&
cm
->
frame_refs
[
ref_idx
].
sf
)))
vpx_internal_error
(
&
cm
->
error
,
VPX_CODEC_UNSUP_BITSTREAM
,
"Reference frame has invalid dimensions"
);
vp9_find_mv_refs
(
cm
,
xd
,
tile
,
mi
,
frame
,
mbmi
->
ref_mvs
[
frame
],
...
...
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