Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
e52d3efe
Commit
e52d3efe
authored
Nov 06, 2013
by
Deb Mukherjee
Committed by
Gerrit Code Review
Nov 06, 2013
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Removes stack allocation of token_cache"
parents
2f4bade3
8810db30
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
vp9/encoder/vp9_block.h
vp9/encoder/vp9_block.h
+1
-1
vp9/encoder/vp9_tokenize.c
vp9/encoder/vp9_tokenize.c
+3
-2
No files found.
vp9/encoder/vp9_block.h
View file @
e52d3efe
...
...
@@ -136,7 +136,7 @@ struct macroblock {
// note that token_costs is the cost when eob node is skipped
vp9_coeff_cost
token_costs
[
TX_SIZES
];
uint8_t
token_cache
[
1024
];
DECLARE_ALIGNED
(
16
,
uint8_t
,
token_cache
[
1024
]
)
;
int
optimize
;
...
...
vp9/encoder/vp9_tokenize.c
View file @
e52d3efe
...
...
@@ -81,6 +81,7 @@ struct tokenize_b_args {
MACROBLOCKD
*
xd
;
TOKENEXTRA
**
tp
;
TX_SIZE
tx_size
;
uint8_t
*
token_cache
;
};
static
void
set_entropy_context_b
(
int
plane
,
int
block
,
BLOCK_SIZE
plane_bsize
,
...
...
@@ -99,6 +100,7 @@ static void tokenize_b(int plane, int block, BLOCK_SIZE plane_bsize,
VP9_COMP
*
cpi
=
args
->
cpi
;
MACROBLOCKD
*
xd
=
args
->
xd
;
TOKENEXTRA
**
tp
=
args
->
tp
;
uint8_t
*
token_cache
=
args
->
token_cache
;
struct
macroblockd_plane
*
pd
=
&
xd
->
plane
[
plane
];
MB_MODE_INFO
*
mbmi
=
&
xd
->
mi_8x8
[
0
]
->
mbmi
;
int
pt
;
/* near block/prev token context index */
...
...
@@ -113,7 +115,6 @@ static void tokenize_b(int plane, int block, BLOCK_SIZE plane_bsize,
vp9_coeff_count
*
const
counts
=
cpi
->
coef_counts
[
tx_size
];
vp9_coeff_probs_model
*
const
coef_probs
=
cpi
->
common
.
fc
.
coef_probs
[
tx_size
];
const
int
ref
=
is_inter_block
(
mbmi
);
uint8_t
token_cache
[
1024
];
const
uint8_t
*
const
band_translate
=
get_band_translate
(
tx_size
);
const
int
seg_eob
=
get_tx_eob
(
&
cpi
->
common
.
seg
,
segment_id
,
tx_size
);
int
aoff
,
loff
;
...
...
@@ -197,7 +198,7 @@ void vp9_tokenize_sb(VP9_COMP *cpi, TOKENEXTRA **t, int dry_run,
const
int
mb_skip_context
=
vp9_get_pred_context_mbskip
(
xd
);
const
int
skip_inc
=
!
vp9_segfeature_active
(
&
cm
->
seg
,
mbmi
->
segment_id
,
SEG_LVL_SKIP
);
struct
tokenize_b_args
arg
=
{
cpi
,
xd
,
t
,
mbmi
->
tx_size
};
struct
tokenize_b_args
arg
=
{
cpi
,
xd
,
t
,
mbmi
->
tx_size
,
cpi
->
mb
.
token_cache
};
mbmi
->
skip_coeff
=
vp9_sb_is_skippable
(
xd
,
bsize
);
if
(
mbmi
->
skip_coeff
)
{
...
...
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