generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Inlining vp9_set_segmentation_map() function."

Browse Source
This commit is contained in:
Dmitry Kovalev 2014-04-22 11:42:07 -07:00 committed by Gerrit Code Review
commit a5cd9afb8c
3 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vp9/encoder/vp9_onyx_if.c
View File

@ -2895,9 +2895,10 @@ int vp9_set_roimap(VP9_COMP *cpi, unsigned char *map, unsigned int rows,
unsigned int threshold[MAX_SEGMENTS]) { unsigned int threshold[MAX_SEGMENTS]) {
signed char feature_data[SEG_LVL_MAX][MAX_SEGMENTS]; signed char feature_data[SEG_LVL_MAX][MAX_SEGMENTS];
struct segmentation *seg = &cpi->common.seg; struct segmentation *seg = &cpi->common.seg;
const VP9_COMMON *const cm = &cpi->common;
int i; int i;
if (cpi->common.mb_rows != rows || cpi->common.mb_cols != cols) if (cm->mb_rows != rows || cm->mb_cols != cols)
return -1; return -1;
if (!map) { if (!map) {
@ -2905,8 +2906,7 @@ int vp9_set_roimap(VP9_COMP *cpi, unsigned char *map, unsigned int rows,
return 0; return 0;
} }
// Set the segmentation Map vpx_memcpy(cpi->segmentation_map, map, cm->mi_rows * cm->mi_cols);
vp9_set_segmentation_map(cpi, map);
// Activate segmentation. // Activate segmentation.
vp9_enable_segmentation(seg); vp9_enable_segmentation(seg);

12
vp9/encoder/vp9_segmentation.c
View File

@ -29,18 +29,6 @@ void vp9_disable_segmentation(struct segmentation *seg) {
seg->enabled = 0; seg->enabled = 0;
} }
void vp9_set_segmentation_map(VP9_COMP *cpi, unsigned char *segmentation_map) {
struct segmentation *const seg = &cpi->common.seg;
// Copy in the new segmentation map
vpx_memcpy(cpi->segmentation_map, segmentation_map,
(cpi->common.mi_rows * cpi->common.mi_cols));
// Signal that the map should be updated.
seg->update_map = 1;
seg->update_data = 1;
}
void vp9_set_segment_data(struct segmentation *seg, void vp9_set_segment_data(struct segmentation *seg,
signed char *feature_data, signed char *feature_data,
unsigned char abs_delta) { unsigned char abs_delta) {

3
vp9/encoder/vp9_segmentation.h
View File

@ -28,9 +28,6 @@ void vp9_disable_segfeature(struct segmentation *seg,
void vp9_clear_segdata(struct segmentation *seg, void vp9_clear_segdata(struct segmentation *seg,
int segment_id, int segment_id,
SEG_LVL_FEATURES feature_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_COMP *cpi, unsigned char *segmentation_map);
// The values given for each segment can be either deltas (from the default // The values given for each segment can be either deltas (from the default
// value chosen for the frame) or absolute values. // value chosen for the frame) or absolute values.