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
09d7d76b
Commit
09d7d76b
authored
Jun 22, 2016
by
Hui Su
Committed by
Gerrit Code Review
Jun 22, 2016
Browse files
Merge "Remove an unnecessary if()" into nextgenv2
parents
467bb162
9981cb8b
Changes
1
Hide whitespace changes
Inline
Side-by-side
vp10/encoder/encodemb.c
View file @
09d7d76b
...
...
@@ -283,29 +283,28 @@ int vp10_optimize_b(MACROBLOCK *mb, int plane, int block,
best
=
0
;
}
if
(
shortcut
)
{
#if CONFIG_NEW_QUANT
dx
=
dequant_coeff_nuq
(
x
,
dequant_ptr
[
rc
!=
0
],
dequant_val
[
band_translate
[
i
]])
-
(
coeff
[
rc
]
<<
shift
);
dx
=
dequant_coeff_nuq
(
x
,
dequant_ptr
[
rc
!=
0
],
dequant_val
[
band_translate
[
i
]])
-
(
coeff
[
rc
]
<<
shift
);
#if CONFIG_VP9_HIGHBITDEPTH
if
(
xd
->
cur_buf
->
flags
&
YV12_FLAG_HIGHBITDEPTH
)
{
dx
>>=
xd
->
bd
-
8
;
}
if
(
xd
->
cur_buf
->
flags
&
YV12_FLAG_HIGHBITDEPTH
)
{
dx
>>=
xd
->
bd
-
8
;
}
#endif // CONFIG_VP9_HIGHBITDEPTH
#else // CONFIG_NEW_QUANT
#if CONFIG_VP9_HIGHBITDEPTH
if
(
xd
->
cur_buf
->
flags
&
YV12_FLAG_HIGHBITDEPTH
)
{
dx
-=
((
dequant_ptr
[
rc
!=
0
]
>>
(
xd
->
bd
-
8
))
+
sz
)
^
sz
;
}
else
{
dx
-=
(
dequant_ptr
[
rc
!=
0
]
+
sz
)
^
sz
;
}
#else
if
(
xd
->
cur_buf
->
flags
&
YV12_FLAG_HIGHBITDEPTH
)
{
dx
-=
((
dequant_ptr
[
rc
!=
0
]
>>
(
xd
->
bd
-
8
))
+
sz
)
^
sz
;
}
else
{
dx
-=
(
dequant_ptr
[
rc
!=
0
]
+
sz
)
^
sz
;
}
#else
dx
-=
(
dequant_ptr
[
rc
!=
0
]
+
sz
)
^
sz
;
#endif // CONFIG_VP9_HIGHBITDEPTH
#endif // CONFIG_NEW_QUANT
d2
=
dx
*
dx
;
}
d2
=
dx
*
dx
;
tokens
[
i
][
1
].
rate
=
base_bits
+
(
best
?
rate1
:
rate0
);
tokens
[
i
][
1
].
error
=
d2
+
(
best
?
error1
:
error0
);
tokens
[
i
][
1
].
next
=
next
;
...
...
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