Skip to content
GitLab
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
78d3adbb
Commit
78d3adbb
authored
Nov 24, 2013
by
Dmitry Kovalev
Committed by
Gerrit Code Review
Nov 24, 2013
Browse files
Merge "Inlining and removing vp9_set_pred_flag_seg_id() function."
parents
f345da52
52b43a28
Changes
4
Hide whitespace changes
Inline
Side-by-side
vp9/common/vp9_pred_common.c
View file @
78d3adbb
...
...
@@ -396,10 +396,6 @@ unsigned char vp9_get_pred_context_tx_size(const MACROBLOCKD *xd) {
return
above_context
+
left_context
>
max_tx_size
;
}
void
vp9_set_pred_flag_seg_id
(
MACROBLOCKD
*
xd
,
uint8_t
pred_flag
)
{
xd
->
mi_8x8
[
0
]
->
mbmi
.
seg_id_predicted
=
pred_flag
;
}
int
vp9_get_segment_id
(
VP9_COMMON
*
cm
,
const
uint8_t
*
segment_ids
,
BLOCK_SIZE
bsize
,
int
mi_row
,
int
mi_col
)
{
const
int
mi_offset
=
mi_row
*
cm
->
mi_cols
+
mi_col
;
...
...
vp9/common/vp9_pred_common.h
View file @
78d3adbb
...
...
@@ -40,8 +40,6 @@ static INLINE vp9_prob vp9_get_pred_prob_seg_id(struct segmentation *seg,
return
seg
->
pred_probs
[
vp9_get_pred_context_seg_id
(
xd
)];
}
void
vp9_set_pred_flag_seg_id
(
MACROBLOCKD
*
xd
,
uint8_t
pred_flag
);
static
INLINE
int
vp9_get_pred_context_mbskip
(
const
MACROBLOCKD
*
xd
)
{
const
MODE_INFO
*
const
above_mi
=
get_above_mi
(
xd
);
const
MODE_INFO
*
const
left_mi
=
get_left_mi
(
xd
);
...
...
vp9/decoder/vp9_decodemv.c
View file @
78d3adbb
...
...
@@ -123,23 +123,23 @@ static int read_intra_segment_id(VP9_COMMON *const cm, MACROBLOCKD *const xd,
static
int
read_inter_segment_id
(
VP9_COMMON
*
const
cm
,
MACROBLOCKD
*
const
xd
,
int
mi_row
,
int
mi_col
,
vp9_reader
*
r
)
{
struct
segmentation
*
const
seg
=
&
cm
->
seg
;
const
BLOCK_SIZE
bsize
=
xd
->
mi_8x8
[
0
]
->
mbmi
.
sb_type
;
int
pred_segment_id
,
segment_id
;
MB_MODE_INFO
*
const
mbmi
=
&
xd
->
mi_8x8
[
0
]
->
mbmi
;
const
BLOCK_SIZE
bsize
=
mbmi
->
sb_type
;
int
predicted_segment_id
,
segment_id
;
if
(
!
seg
->
enabled
)
return
0
;
// Default for disabled segmentation
pred_segment_id
=
vp9_get_segment_id
(
cm
,
cm
->
last_frame_seg_map
,
bsize
,
mi_row
,
mi_col
);
pred
icted
_segment_id
=
vp9_get_segment_id
(
cm
,
cm
->
last_frame_seg_map
,
bsize
,
mi_row
,
mi_col
);
if
(
!
seg
->
update_map
)
return
pred_segment_id
;
return
pred
icted
_segment_id
;
if
(
seg
->
temporal_update
)
{
const
vp9_prob
pred_prob
=
vp9_get_pred_prob_seg_id
(
seg
,
xd
);
const
int
pred_flag
=
vp9_read
(
r
,
pred_prob
);
vp9_set_pred_flag_seg_id
(
xd
,
pred_flag
);
segment_id
=
pred_flag
?
pred_segment_id
:
read_segment_id
(
r
,
seg
);
mbmi
->
seg_id_predicted
=
vp9_read
(
r
,
pred_prob
);
segment_id
=
mbmi
->
seg_id_predicted
?
predicted_segment_id
:
read_segment_id
(
r
,
seg
);
}
else
{
segment_id
=
read_segment_id
(
r
,
seg
);
}
...
...
vp9/encoder/vp9_segmentation.c
View file @
78d3adbb
...
...
@@ -149,7 +149,7 @@ static void count_segs(VP9_COMP *cpi, const TileInfo *const tile,
// Store the prediction status for this mb and update counts
// as appropriate
vp9_set_pred_flag_seg_id
(
xd
,
pred_flag
)
;
xd
->
mi_8x8
[
0
]
->
mbmi
.
seg_id_predicted
=
pred_flag
;
temporal_predictor_count
[
pred_context
][
pred_flag
]
++
;
if
(
!
pred_flag
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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