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
98466e89
Commit
98466e89
authored
Apr 05, 2013
by
John Koleszar
Committed by
Gerrit Code Review
Apr 05, 2013
Browse files
Merge "Simplifying get_delta_q function." into experimental
parents
ffc92da4
52128c58
Changes
1
Hide whitespace changes
Inline
Side-by-side
vp9/decoder/vp9_decodframe.c
View file @
98466e89
...
...
@@ -910,22 +910,18 @@ static void decode_mb(VP9D_COMP *pbi, MACROBLOCKD *xd,
#endif
}
static
int
get_delta_q
(
vp9_reader
*
r
,
int
*
dq
)
{
const
int
old_value
=
*
dq
;
static
int
get_delta_q
(
vp9_reader
*
bc
,
int
prev
,
int
*
q_update
)
{
int
ret_val
=
0
;
if
(
vp9_read_bit
(
bc
))
{
ret_val
=
vp9_read_literal
(
bc
,
4
);
if
(
vp9_read_bit
(
bc
))
ret_val
=
-
ret_val
;
if
(
vp9_read_bit
(
r
))
{
// Update bit
int
value
=
vp9_read_literal
(
r
,
4
);
if
(
vp9_read_bit
(
r
))
// Sign bit
value
=
-
value
;
*
dq
=
value
;
}
// Trigger a quantizer update if the delta-q value has changed
if
(
ret_val
!=
prev
)
*
q_update
=
1
;
return
ret_val
;
return
old_value
!=
*
dq
;
}
#ifdef PACKET_TESTING
...
...
@@ -1725,9 +1721,9 @@ int vp9_decode_frame(VP9D_COMP *pbi, const uint8_t **p_data_end) {
pc
->
base_qindex
=
vp9_read_literal
(
&
header_bc
,
QINDEX_BITS
);
// AC 1st order Q = default
pc
->
y1dc_delta_q
=
get_delta_q
(
&
header_bc
,
pc
->
y1dc_delta_q
,
&
q_update
);
pc
->
uvdc_delta_q
=
get_delta_q
(
&
header_bc
,
pc
->
uvdc_delta_q
,
&
q_update
);
pc
->
uvac_delta_q
=
get_delta_q
(
&
header_bc
,
pc
->
uvac_delta_q
,
&
q_update
);
q_update
=
get_delta_q
(
&
header_bc
,
&
pc
->
y1dc_delta_q
)
|
get_delta_q
(
&
header_bc
,
&
pc
->
uvdc_delta_q
)
|
get_delta_q
(
&
header_bc
,
&
pc
->
uvac_delta_q
);
if
(
q_update
)
vp9_init_de_quantizer
(
pbi
);
...
...
Write
Preview
Supports
Markdown
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