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
9ba8aed1
Commit
9ba8aed1
authored
Mar 27, 2013
by
John Koleszar
Committed by
Gerrit Code Review
Mar 27, 2013
Browse files
Merge "Extract setup_frame_size and update_frame_context functions." into experimental
parents
648f93d5
8c69c193
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
vp9/common/vp9_seg_common.c
View file @
9ba8aed1
...
...
@@ -51,7 +51,7 @@ int vp9_seg_feature_data_max(SEG_LVL_FEATURES feature_id) {
}
int
vp9_is_segfeature_signed
(
SEG_LVL_FEATURES
feature_id
)
{
return
(
segfeaturedata_signed
[
feature_id
]
)
;
return
segfeaturedata_signed
[
feature_id
];
}
void
vp9_clear_segdata
(
MACROBLOCKD
*
xd
,
...
...
vp9/decoder/vp9_decodemv.c
View file @
9ba8aed1
...
...
@@ -490,7 +490,7 @@ static void read_switchable_interp_probs(VP9D_COMP* const pbi,
int
i
,
j
;
for
(
j
=
0
;
j
<=
VP9_SWITCHABLE_FILTERS
;
++
j
)
{
for
(
i
=
0
;
i
<
VP9_SWITCHABLE_FILTERS
-
1
;
++
i
)
{
cm
->
fc
.
switchable_interp_prob
[
j
][
i
]
=
vp9_read_
literal
(
bc
,
8
);
cm
->
fc
.
switchable_interp_prob
[
j
][
i
]
=
vp9_read_
prob
(
bc
);
}
}
//printf("DECODER: %d %d\n", cm->fc.switchable_interp_prob[0],
...
...
@@ -511,13 +511,13 @@ static void mb_mode_mv_init(VP9D_COMP *pbi, vp9_reader *bc) {
#if CONFIG_COMP_INTERINTRA_PRED
if
(
cm
->
use_interintra
)
{
if
(
vp9_read
(
bc
,
VP9_UPD_INTERINTRA_PROB
))
cm
->
fc
.
interintra_prob
=
(
vp9_prob
)
vp9_read_literal
(
bc
,
8
);
cm
->
fc
.
interintra_prob
=
vp9_read_prob
(
bc
);
}
#endif
// Decode the baseline probabilities for decoding reference frame
cm
->
prob_intra_coded
=
(
vp9_prob
)
vp9_read_literal
(
bc
,
8
);
cm
->
prob_last_coded
=
(
vp9_prob
)
vp9_read_literal
(
bc
,
8
);
cm
->
prob_gf_coded
=
(
vp9_prob
)
vp9_read_literal
(
bc
,
8
);
cm
->
prob_intra_coded
=
vp9_read_prob
(
bc
);
cm
->
prob_last_coded
=
vp9_read_prob
(
bc
);
cm
->
prob_gf_coded
=
vp9_read_prob
(
bc
);
// Computes a modified set of probabilities for use when reference
// frame prediction fails.
...
...
@@ -529,14 +529,14 @@ static void mb_mode_mv_init(VP9D_COMP *pbi, vp9_reader *bc) {
if
(
cm
->
comp_pred_mode
==
HYBRID_PREDICTION
)
{
int
i
;
for
(
i
=
0
;
i
<
COMP_PRED_CONTEXTS
;
i
++
)
cm
->
prob_comppred
[
i
]
=
(
vp9_prob
)
vp9_read_literal
(
bc
,
8
);
cm
->
prob_comppred
[
i
]
=
vp9_read_prob
(
bc
);
}
if
(
vp9_read_bit
(
bc
))
{
int
i
=
0
;
do
{
cm
->
fc
.
ymode_prob
[
i
]
=
(
vp9_prob
)
vp9_read_literal
(
bc
,
8
);
cm
->
fc
.
ymode_prob
[
i
]
=
vp9_read_prob
(
bc
);
}
while
(
++
i
<
VP9_YMODES
-
1
);
}
...
...
@@ -544,7 +544,7 @@ static void mb_mode_mv_init(VP9D_COMP *pbi, vp9_reader *bc) {
int
i
=
0
;
do
{
cm
->
fc
.
sb_ymode_prob
[
i
]
=
(
vp9_prob
)
vp9_read_literal
(
bc
,
8
);
cm
->
fc
.
sb_ymode_prob
[
i
]
=
vp9_read_prob
(
bc
);
}
while
(
++
i
<
VP9_I32X32_MODES
-
1
);
}
...
...
@@ -1141,7 +1141,7 @@ void vp9_decode_mode_mvs_init(VP9D_COMP* const pbi, BOOL_DECODER* const bc) {
if
(
pbi
->
common
.
mb_no_coeff_skip
)
{
int
k
;
for
(
k
=
0
;
k
<
MBSKIP_CONTEXTS
;
++
k
)
{
cm
->
mbskip_pred_probs
[
k
]
=
(
vp9_prob
)
vp9_read_literal
(
bc
,
8
);
cm
->
mbskip_pred_probs
[
k
]
=
vp9_read_prob
(
bc
);
}
}
...
...
vp9/decoder/vp9_decodframe.c
View file @
9ba8aed1
This diff is collapsed.
Click to expand it.
vp9/decoder/vp9_treereader.h
View file @
9ba8aed1
...
...
@@ -19,10 +19,10 @@ typedef BOOL_DECODER vp9_reader;
#define vp9_read decode_bool
#define vp9_read_literal decode_value
#define vp9_read_bit(R) vp9_read(R, vp9_prob_half)
/* Intent of tree data structure is to make decoding trivial. */
#define vp9_read_bit(r) vp9_read(r, vp9_prob_half)
#define vp9_read_prob(r) ((vp9_prob)vp9_read_literal(r, 8))
// Intent of tree data structure is to make decoding trivial.
static
int
treed_read
(
vp9_reader
*
const
r
,
/* !!! must return a 0 or 1 !!! */
vp9_tree
t
,
const
vp9_prob
*
const
p
)
{
...
...
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