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
3f3199e7
Commit
3f3199e7
authored
Jun 16, 2014
by
Dmitry Kovalev
Committed by
Gerrit Code Review
Jun 16, 2014
Browse files
Merge "vp9_pickmode.c: fix vs12 compiler warnings"
parents
f7869c81
45648532
Changes
1
Hide whitespace changes
Inline
Side-by-side
vp9/encoder/vp9_pickmode.c
View file @
3f3199e7
...
...
@@ -158,15 +158,16 @@ static void model_rd_for_sb_y(VP9_COMP *cpi, BLOCK_SIZE bsize,
int64_t
dist
;
struct
macroblock_plane
*
const
p
=
&
x
->
plane
[
0
];
struct
macroblockd_plane
*
const
pd
=
&
xd
->
plane
[
0
];
const
int
quant
=
pd
->
dequant
[
1
];
const
uint32_t
dc_quant
=
pd
->
dequant
[
0
];
const
uint32_t
ac_quant
=
pd
->
dequant
[
1
];
unsigned
int
var
=
cpi
->
fn_ptr
[
bsize
].
vf
(
p
->
src
.
buf
,
p
->
src
.
stride
,
pd
->
dst
.
buf
,
pd
->
dst
.
stride
,
&
sse
);
*
var_y
=
var
;
*
sse_y
=
sse
;
if
(
sse
<
pd
->
dequant
[
0
]
*
pd
->
de
quant
[
0
]
>>
6
)
if
(
sse
<
dc_quant
*
dc_
quant
>>
6
)
x
->
skip_txfm
=
1
;
else
if
(
var
<
quant
*
quant
>>
6
)
else
if
(
var
<
ac_
quant
*
ac_
quant
>>
6
)
x
->
skip_txfm
=
2
;
else
x
->
skip_txfm
=
0
;
...
...
@@ -177,7 +178,7 @@ static void model_rd_for_sb_y(VP9_COMP *cpi, BLOCK_SIZE bsize,
if
((
sse
>>
3
)
>
var
)
sse
=
var
;
vp9_model_rd_from_var_lapndz
(
var
+
sse
,
1
<<
num_pels_log2_lookup
[
bsize
],
quant
>>
3
,
&
rate
,
&
dist
);
ac_
quant
>>
3
,
&
rate
,
&
dist
);
*
out_rate_sum
=
rate
;
*
out_dist_sum
=
dist
<<
3
;
}
...
...
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