Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
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
7300db5f
Commit
7300db5f
authored
May 27, 2017
by
Yushin Cho
Browse files
Fix pvq to use OD_ICDF when directly accessing skip_cdf
Change-Id: Iac66b12dc6b1e6c3bc3c3ae54af45a97c81e34de
parent
0481e8b6
Changes
1
Hide whitespace changes
Inline
Side-by-side
av1/encoder/pvq_encoder.c
View file @
7300db5f
...
...
@@ -847,8 +847,8 @@ PVQ_SKIP_TYPE od_pvq_encode(daala_enc_ctx *enc,
int
tell2
;
od_rollback_buffer
dc_buf
;
dc_rate
=
-
OD_LOG2
((
double
)(
skip_cdf
[
3
]
-
skip_cdf
[
2
])
/
(
double
)(
skip_cdf
[
2
]
-
skip_cdf
[
1
]));
dc_rate
=
-
OD_LOG2
((
double
)(
OD_ICDF
(
skip_cdf
[
3
]
)
-
OD_ICDF
(
skip_cdf
[
2
])
)
/
(
double
)(
OD_ICDF
(
skip_cdf
[
2
]
)
-
OD_ICDF
(
skip_cdf
[
1
]))
)
;
dc_rate
+=
1
;
#if !CONFIG_ANS
...
...
@@ -931,12 +931,12 @@ PVQ_SKIP_TYPE od_pvq_encode(daala_enc_ctx *enc,
{
double
skip_rate
;
if
(
out
[
0
]
!=
0
)
{
skip_rate
=
-
OD_LOG2
((
skip_cdf
[
1
]
-
skip_cdf
[
0
])
/
(
double
)
skip_cdf
[
3
]);
skip_rate
=
-
OD_LOG2
((
OD_ICDF
(
skip_cdf
[
1
]
)
-
OD_ICDF
(
skip_cdf
[
0
])
)
/
(
double
)
OD_ICDF
(
skip_cdf
[
3
])
)
;
}
else
{
skip_rate
=
-
OD_LOG2
(
skip_cdf
[
0
]
/
(
double
)
skip_cdf
[
3
]);
skip_rate
=
-
OD_LOG2
(
OD_ICDF
(
skip_cdf
[
0
]
)
/
(
double
)
OD_ICDF
(
skip_cdf
[
3
])
)
;
}
tell
-=
(
int
)
floor
(.
5
+
8
*
skip_rate
);
}
...
...
@@ -951,8 +951,8 @@ PVQ_SKIP_TYPE od_pvq_encode(daala_enc_ctx *enc,
int
tell2
;
od_rollback_buffer
dc_buf
;
dc_rate
=
-
OD_LOG2
((
double
)(
skip_cdf
[
1
]
-
skip_cdf
[
0
])
/
(
double
)
skip_cdf
[
0
]);
dc_rate
=
-
OD_LOG2
((
double
)(
OD_ICDF
(
skip_cdf
[
1
]
)
-
OD_ICDF
(
skip_cdf
[
0
])
)
/
(
double
)
OD_ICDF
(
skip_cdf
[
0
])
)
;
dc_rate
+=
1
;
#if !CONFIG_ANS
...
...
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