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
50ec6311
Commit
50ec6311
authored
Dec 16, 2013
by
Yaowu Xu
Committed by
Gerrit Code Review
Dec 16, 2013
Browse files
Move two functions to encoder
As they are used by encoder only. Change-Id: I7b1e6955b218aba66fe156523521a8121c9a84a4
parent
e7198563
Changes
5
Hide whitespace changes
Inline
Side-by-side
vp9/common/vp9_seg_common.c
View file @
50ec6311
...
...
@@ -41,11 +41,6 @@ void vp9_enable_segfeature(struct segmentation *seg, int segment_id,
seg
->
feature_mask
[
segment_id
]
|=
1
<<
feature_id
;
}
void
vp9_disable_segfeature
(
struct
segmentation
*
seg
,
int
segment_id
,
SEG_LVL_FEATURES
feature_id
)
{
seg
->
feature_mask
[
segment_id
]
&=
~
(
1
<<
feature_id
);
}
int
vp9_seg_feature_data_max
(
SEG_LVL_FEATURES
feature_id
)
{
return
seg_feature_data_max
[
feature_id
];
}
...
...
@@ -54,11 +49,6 @@ int vp9_is_segfeature_signed(SEG_LVL_FEATURES feature_id) {
return
seg_feature_data_signed
[
feature_id
];
}
void
vp9_clear_segdata
(
struct
segmentation
*
seg
,
int
segment_id
,
SEG_LVL_FEATURES
feature_id
)
{
seg
->
feature_data
[
segment_id
][
feature_id
]
=
0
;
}
void
vp9_set_segdata
(
struct
segmentation
*
seg
,
int
segment_id
,
SEG_LVL_FEATURES
feature_id
,
int
seg_data
)
{
assert
(
seg_data
<=
seg_feature_data_max
[
feature_id
]);
...
...
vp9/common/vp9_seg_common.h
View file @
50ec6311
...
...
@@ -55,18 +55,10 @@ void vp9_enable_segfeature(struct segmentation *seg,
int
segment_id
,
SEG_LVL_FEATURES
feature_id
);
void
vp9_disable_segfeature
(
struct
segmentation
*
seg
,
int
segment_id
,
SEG_LVL_FEATURES
feature_id
);
int
vp9_seg_feature_data_max
(
SEG_LVL_FEATURES
feature_id
);
int
vp9_is_segfeature_signed
(
SEG_LVL_FEATURES
feature_id
);
void
vp9_clear_segdata
(
struct
segmentation
*
seg
,
int
segment_id
,
SEG_LVL_FEATURES
feature_id
);
void
vp9_set_segdata
(
struct
segmentation
*
seg
,
int
segment_id
,
SEG_LVL_FEATURES
feature_id
,
...
...
vp9/encoder/vp9_onyx_if.c
View file @
50ec6311
...
...
@@ -329,7 +329,6 @@ static void setup_in_frame_q_adj(VP9_COMP *cpi) {
}
}
}
static
void
configure_static_seg_features
(
VP9_COMP
*
cpi
)
{
VP9_COMMON
*
cm
=
&
cpi
->
common
;
struct
segmentation
*
seg
=
&
cm
->
seg
;
...
...
vp9/encoder/vp9_segmentation.c
View file @
50ec6311
...
...
@@ -58,6 +58,15 @@ void vp9_set_segment_data(VP9_PTR ptr,
// vpx_memcpy(cpi->mb.e_mbd.segment_feature_mask, 0,
// sizeof(cpi->mb.e_mbd.segment_feature_mask));
}
void
vp9_disable_segfeature
(
struct
segmentation
*
seg
,
int
segment_id
,
SEG_LVL_FEATURES
feature_id
)
{
seg
->
feature_mask
[
segment_id
]
&=
~
(
1
<<
feature_id
);
}
void
vp9_clear_segdata
(
struct
segmentation
*
seg
,
int
segment_id
,
SEG_LVL_FEATURES
feature_id
)
{
seg
->
feature_data
[
segment_id
][
feature_id
]
=
0
;
}
// Based on set of segment counts calculate a probability tree
static
void
calc_segtree_probs
(
int
*
segcounts
,
vp9_prob
*
segment_tree_probs
)
{
...
...
vp9/encoder/vp9_segmentation.h
View file @
50ec6311
...
...
@@ -18,6 +18,12 @@
void
vp9_enable_segmentation
(
VP9_PTR
ptr
);
void
vp9_disable_segmentation
(
VP9_PTR
ptr
);
void
vp9_disable_segfeature
(
struct
segmentation
*
seg
,
int
segment_id
,
SEG_LVL_FEATURES
feature_id
);
void
vp9_clear_segdata
(
struct
segmentation
*
seg
,
int
segment_id
,
SEG_LVL_FEATURES
feature_id
);
// Valid values for a segment are 0 to 3
// Segmentation map is arrange as [Rows][Columns]
void
vp9_set_segmentation_map
(
VP9_PTR
ptr
,
unsigned
char
*
segmentation_map
);
...
...
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