Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
aom-rav1e
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Xiph.Org
aom-rav1e
Commits
6cf3b98a
Commit
6cf3b98a
authored
Nov 07, 2013
by
Deb Mukherjee
Committed by
Gerrit Code Review
Nov 07, 2013
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Miscelleneous changes in detokenize for speed"
parents
4bdb1d2e
551829d8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
11 deletions
+16
-11
vp9/decoder/vp9_detokenize.c
vp9/decoder/vp9_detokenize.c
+16
-11
No files found.
vp9/decoder/vp9_detokenize.c
View file @
6cf3b98a
...
...
@@ -61,16 +61,18 @@ static const vp9_prob cat6_prob[15] = {
254
,
254
,
254
,
252
,
249
,
243
,
230
,
196
,
177
,
153
,
140
,
133
,
130
,
129
,
0
};
static
const
int
token_to_counttoken
[
MAX_ENTROPY_TOKENS
]
=
{
ZERO_TOKEN
,
ONE_TOKEN
,
TWO_TOKEN
,
TWO_TOKEN
,
TWO_TOKEN
,
TWO_TOKEN
,
TWO_TOKEN
,
TWO_TOKEN
,
TWO_TOKEN
,
TWO_TOKEN
,
TWO_TOKEN
,
DCT_EOB_MODEL_TOKEN
};
#define INCREMENT_COUNT(token) \
do { \
if (!cm->frame_parallel_decoding_mode) { \
++coef_counts[type][ref][band][pt] \
[token >= TWO_TOKEN ? \
(token == DCT_EOB_TOKEN ? \
DCT_EOB_MODEL_TOKEN : TWO_TOKEN) : \
token]; \
} \
} while (0)
if (!cm->frame_parallel_decoding_mode) { \
++coef_counts[band][pt][token_to_counttoken[token]]; \
} \
} while (0);
#define WRITE_COEF_CONTINUE(val, token) \
{ \
...
...
@@ -101,7 +103,10 @@ static int decode_coefs(VP9_COMMON *cm, const MACROBLOCKD *xd,
vp9_prob
coef_probs_full
[
COEF_BANDS
][
PREV_COEF_CONTEXTS
][
ENTROPY_NODES
];
uint8_t
load_map
[
COEF_BANDS
][
PREV_COEF_CONTEXTS
]
=
{
{
0
}
};
const
vp9_prob
*
prob
;
vp9_coeff_count_model
*
coef_counts
=
counts
->
coef
[
tx_size
];
unsigned
int
(
*
coef_counts
)[
PREV_COEF_CONTEXTS
][
UNCONSTRAINED_NODES
+
1
]
=
counts
->
coef
[
tx_size
][
type
][
ref
];
unsigned
int
(
*
eob_branch_count
)[
PREV_COEF_CONTEXTS
]
=
counts
->
eob_branch
[
tx_size
][
type
][
ref
];
const
int16_t
*
scan
,
*
nb
;
const
uint8_t
*
const
band_translate
=
get_band_translate
(
tx_size
);
get_scan
(
xd
,
tx_size
,
type
,
block_idx
,
&
scan
,
&
nb
);
...
...
@@ -116,7 +121,7 @@ static int decode_coefs(VP9_COMMON *cm, const MACROBLOCKD *xd,
band
=
get_coef_band
(
band_translate
,
c
);
prob
=
coef_probs
[
band
][
pt
];
if
(
!
cm
->
frame_parallel_decoding_mode
)
++
counts
->
eob_branch
[
tx_size
][
type
][
ref
]
[
band
][
pt
];
++
eob_branch_count
[
band
][
pt
];
if
(
!
vp9_read
(
r
,
prob
[
EOB_CONTEXT_NODE
]))
break
;
...
...
@@ -204,7 +209,7 @@ static int decode_coefs(VP9_COMMON *cm, const MACROBLOCKD *xd,
if
(
c
<
seg_eob
)
{
if
(
!
cm
->
frame_parallel_decoding_mode
)
++
coef_counts
[
type
][
ref
][
band
][
pt
][
DCT_EOB_MODEL_TOKEN
];
++
coef_counts
[
band
][
pt
][
DCT_EOB_MODEL_TOKEN
];
}
return
c
;
...
...
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