Skip to content
GitLab
Menu
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
3ab4d571
Commit
3ab4d571
authored
Apr 09, 2014
by
Alex Converse
Browse files
Remove unused tile arguments from vp_rdopt.
Change-Id: I721ff26e3d5dbef80b8cd2dd562adae3748f6687
parent
dcb51576
Changes
1
Hide whitespace changes
Inline
Side-by-side
vp9/encoder/vp9_rdopt.c
View file @
3ab4d571
...
@@ -2367,7 +2367,6 @@ int vp9_get_switchable_rate(const MACROBLOCK *x) {
...
@@ -2367,7 +2367,6 @@ int vp9_get_switchable_rate(const MACROBLOCK *x) {
}
}
static
void
single_motion_search
(
VP9_COMP
*
cpi
,
MACROBLOCK
*
x
,
static
void
single_motion_search
(
VP9_COMP
*
cpi
,
MACROBLOCK
*
x
,
const
TileInfo
*
const
tile
,
BLOCK_SIZE
bsize
,
BLOCK_SIZE
bsize
,
int
mi_row
,
int
mi_col
,
int
mi_row
,
int
mi_col
,
int_mv
*
tmp_mv
,
int
*
rate_mv
)
{
int_mv
*
tmp_mv
,
int
*
rate_mv
)
{
...
@@ -2685,7 +2684,6 @@ static INLINE void restore_dst_buf(MACROBLOCKD *xd,
...
@@ -2685,7 +2684,6 @@ static INLINE void restore_dst_buf(MACROBLOCKD *xd,
}
}
static
int64_t
handle_inter_mode
(
VP9_COMP
*
cpi
,
MACROBLOCK
*
x
,
static
int64_t
handle_inter_mode
(
VP9_COMP
*
cpi
,
MACROBLOCK
*
x
,
const
TileInfo
*
const
tile
,
BLOCK_SIZE
bsize
,
BLOCK_SIZE
bsize
,
int64_t
txfm_cache
[],
int64_t
txfm_cache
[],
int
*
rate2
,
int64_t
*
distortion
,
int
*
rate2
,
int64_t
*
distortion
,
...
@@ -2747,7 +2745,7 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
...
@@ -2747,7 +2745,7 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
*
rate2
+=
rate_mv
;
*
rate2
+=
rate_mv
;
}
else
{
}
else
{
int_mv
tmp_mv
;
int_mv
tmp_mv
;
single_motion_search
(
cpi
,
x
,
tile
,
bsize
,
mi_row
,
mi_col
,
single_motion_search
(
cpi
,
x
,
bsize
,
mi_row
,
mi_col
,
&
tmp_mv
,
&
rate_mv
);
&
tmp_mv
,
&
rate_mv
);
if
(
tmp_mv
.
as_int
==
INVALID_MV
)
if
(
tmp_mv
.
as_int
==
INVALID_MV
)
return
INT64_MAX
;
return
INT64_MAX
;
...
@@ -3437,7 +3435,7 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x,
...
@@ -3437,7 +3435,7 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x,
rate2
+=
intra_cost_penalty
;
rate2
+=
intra_cost_penalty
;
distortion2
=
distortion_y
+
distortion_uv
;
distortion2
=
distortion_y
+
distortion_uv
;
}
else
{
}
else
{
this_rd
=
handle_inter_mode
(
cpi
,
x
,
tile
,
bsize
,
this_rd
=
handle_inter_mode
(
cpi
,
x
,
bsize
,
tx_cache
,
tx_cache
,
&
rate2
,
&
distortion2
,
&
skippable
,
&
rate2
,
&
distortion2
,
&
skippable
,
&
rate_y
,
&
distortion_y
,
&
rate_y
,
&
distortion_y
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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