shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Move two functions to encoder"

--- a/vp9/common/vp9_seg_common.c

+++ b/vp9/common/vp9_seg_common.c

@@ -41,11 +41,6 @@

   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];

 }

@@ -52,11 +47,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,

--- a/vp9/common/vp9_seg_common.h

+++ b/vp9/common/vp9_seg_common.h

@@ -55,17 +55,9 @@

                            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,

--- a/vp9/encoder/vp9_onyx_if.c

+++ b/vp9/encoder/vp9_onyx_if.c

@@ -329,7 +329,6 @@

     }

   }

 }

-

 static void configure_static_seg_features(VP9_COMP *cpi) {

   VP9_COMMON *cm = &cpi->common;

   struct segmentation *seg = &cm->seg;

--- a/vp9/encoder/vp9_segmentation.c

+++ b/vp9/encoder/vp9_segmentation.c

@@ -58,6 +58,15 @@

   // 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) {

--- a/vp9/encoder/vp9_segmentation.h

+++ b/vp9/encoder/vp9_segmentation.h

@@ -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);