shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Preparing vp9_deblock and vp9_denoise to alpha support." into experimental

--- a/vp9/common/vp9_postproc.c

+++ b/vp9/common/vp9_postproc.c

@@ -132,7 +132,7 @@

 /****************************************************************************

  */

-void vp9_post_proc_down_and_across_c(uint8_t *src_ptr,

+void vp9_post_proc_down_and_across_c(const uint8_t *src_ptr,

                                      uint8_t *dst_ptr,

                                      int src_pixels_per_line,

                                      int dst_pixels_per_line,

@@ -139,7 +139,8 @@

                                      int rows,

                                      int cols,

                                      int flimit) {

-  uint8_t *p_src, *p_dst;

+  uint8_t const *p_src;

+  uint8_t *p_dst;

   int row;

   int col;

   int i;

@@ -313,51 +314,52 @@

                                 source->uv_height, source->uv_width, ppl);

 }

-void vp9_deblock(YV12_BUFFER_CONFIG         *source,

-                 YV12_BUFFER_CONFIG         *post,

-                 int                         q,

-                 int                         low_var_thresh,

-                 int                         flag) {

-  double level = 6.0e-05 * q * q * q - .0067 * q * q + .306 * q + .0065;

-  int ppl = (int)(level + .5);

-  (void) low_var_thresh;

-  (void) flag;

+void vp9_deblock(const YV12_BUFFER_CONFIG *src, YV12_BUFFER_CONFIG *dst,

+                 int q) {

+  const int ppl = (int)(6.0e-05 * q * q * q - 0.0067 * q * q + 0.306 * q

+                        + 0.0065 + 0.5);

+  int i;

-  vp9_post_proc_down_and_across(source->y_buffer, post->y_buffer,

-                                source->y_stride, post->y_stride,

-                                source->y_height, source->y_width, ppl);

+  const uint8_t *const srcs[3] = {src->y_buffer, src->u_buffer, src->v_buffer};

+  const int src_strides[3] = {src->y_stride, src->uv_stride, src->uv_stride};

+  const int src_widths[3] = {src->y_width, src->uv_width, src->uv_width};

+  const int src_heights[3] = {src->y_height, src->uv_height, src->uv_height};

-  vp9_post_proc_down_and_across(source->u_buffer, post->u_buffer,

-                                source->uv_stride, post->uv_stride,

-                                source->uv_height, source->uv_width, ppl);

+  uint8_t *const dsts[3] = {dst->y_buffer, dst->u_buffer, dst->v_buffer};

+  const int dst_strides[3] = {dst->y_stride, dst->uv_stride, dst->uv_stride};

-  vp9_post_proc_down_and_across(source->v_buffer, post->v_buffer,

-                                source->uv_stride, post->uv_stride,

-                                source->uv_height, source->uv_width, ppl);

+  for (i = 0; i < MAX_MB_PLANE; ++i)

+    vp9_post_proc_down_and_across(srcs[i], dsts[i],

+                                  src_strides[i], dst_strides[i],

+                                  src_heights[i], src_widths[i], ppl);

 }

-void vp9_denoise(YV12_BUFFER_CONFIG *src, YV12_BUFFER_CONFIG *post,

-                 int q, int low_var_thresh, int flag) {

-  double level = 6.0e-05 * q * q * q - .0067 * q * q + .306 * q + .0065;

-  int ppl = (int)(level + .5);

-  (void) post;

-  (void) low_var_thresh;

-  (void) flag;

+void vp9_denoise(const YV12_BUFFER_CONFIG *src, YV12_BUFFER_CONFIG *dst,

+                 int q) {

+  const int ppl = (int)(6.0e-05 * q * q * q - 0.0067 * q * q + 0.306 * q

+                        + 0.0065 + 0.5);

+  int i;

-  vp9_post_proc_down_and_across(src->y_buffer + 2 * src->y_stride + 2,

-                                src->y_buffer + 2 * src->y_stride + 2,

-                                src->y_stride, src->y_stride, src->y_height - 4,

-                                src->y_width - 4, ppl);

+  const uint8_t *const srcs[3] = {src->y_buffer, src->u_buffer, src->v_buffer};

+  const int src_strides[3] = {src->y_stride, src->uv_stride, src->uv_stride};

+  const int src_widths[3] = {src->y_width, src->uv_width, src->uv_width};

+  const int src_heights[3] = {src->y_height, src->uv_height, src->uv_height};

-  vp9_post_proc_down_and_across(src->u_buffer + 2 * src->uv_stride + 2,

-                                src->u_buffer + 2 * src->uv_stride + 2,

-                                src->uv_stride, src->uv_stride,

-                                src->uv_height - 4, src->uv_width - 4, ppl);

+  uint8_t *const dsts[3] = {dst->y_buffer, dst->u_buffer, dst->v_buffer};

+  const int dst_strides[3] = {dst->y_stride, dst->uv_stride, dst->uv_stride};

-  vp9_post_proc_down_and_across(src->v_buffer + 2 * src->uv_stride + 2,

-                                src->v_buffer + 2 * src->uv_stride + 2,

-                                src->uv_stride, src->uv_stride,

-                                src->uv_height - 4, src->uv_width - 4, ppl);

+  for (i = 0; i < MAX_MB_PLANE; ++i) {

+    const int src_stride = src_strides[i];

+    const uint8_t *const src = srcs[i] + 2 * src_stride + 2;

+    const int src_width = src_widths[i] - 4;

+    const int src_height = src_heights[i] - 4;

+

+    const int dst_stride = dst_strides[i];

+    uint8_t *const dst = dsts[i] + 2 * dst_stride + 2;

+

+    vp9_post_proc_down_and_across(src, dst, src_stride, dst_stride,

+                                  src_height, src_width, ppl);

+  }

 }

 double vp9_gaussian(double sigma, double mu, double x) {

@@ -642,7 +644,7 @@

     deblock_and_de_macro_block(oci->frame_to_show, &oci->post_proc_buffer,

                                q + (deblock_level - 5) * 10, 1, 0);

   } else if (flags & VP9D_DEBLOCK) {

-    vp9_deblock(oci->frame_to_show, &oci->post_proc_buffer, q, 1, 0);

+    vp9_deblock(oci->frame_to_show, &oci->post_proc_buffer, q);

   } else {

     vp8_yv12_copy_frame(oci->frame_to_show, &oci->post_proc_buffer);

   }

--- a/vp9/common/vp9_postproc.h

+++ b/vp9/common/vp9_postproc.h

@@ -29,10 +29,8 @@

 int vp9_post_proc_frame(struct VP9Common *oci, YV12_BUFFER_CONFIG *dest,

                         vp9_ppflags_t *flags);

-void vp9_denoise(YV12_BUFFER_CONFIG *source, YV12_BUFFER_CONFIG *post,

-                 int q, int low_var_thresh, int flag);

+void vp9_denoise(const YV12_BUFFER_CONFIG *src, YV12_BUFFER_CONFIG *dst, int q);

-void vp9_deblock(YV12_BUFFER_CONFIG *source, YV12_BUFFER_CONFIG *post,

-                 int q, int low_var_thresh, int flag);

+void vp9_deblock(const YV12_BUFFER_CONFIG *src, YV12_BUFFER_CONFIG *dst, int q);

 #endif  // VP9_COMMON_VP9_POSTPROC_H_

--- a/vp9/common/vp9_rtcd_defs.sh

+++ b/vp9/common/vp9_rtcd_defs.sh

@@ -140,7 +140,7 @@

 specialize vp9_mbpost_proc_across_ip sse2

 vp9_mbpost_proc_across_ip_sse2=vp9_mbpost_proc_across_ip_xmm

-prototype void vp9_post_proc_down_and_across "uint8_t *src_ptr, uint8_t *dst_ptr, int src_pixels_per_line, int dst_pixels_per_line, int rows, int cols, int flimit"

+prototype void vp9_post_proc_down_and_across "const uint8_t *src_ptr, uint8_t *dst_ptr, int src_pixels_per_line, int dst_pixels_per_line, int rows, int cols, int flimit"

 specialize vp9_post_proc_down_and_across mmx sse2

 vp9_post_proc_down_and_across_sse2=vp9_post_proc_down_and_across_xmm

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

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

@@ -2863,7 +2863,7 @@

         break;

     }

-    vp9_denoise(cpi->Source, cpi->Source, l, 1, 0);

+    vp9_denoise(cpi->Source, cpi->Source, l);

   }

 #endif

@@ -3948,7 +3948,7 @@

           double weight = 0;

 #if CONFIG_POSTPROC

           vp9_deblock(cm->frame_to_show, &cm->post_proc_buffer,

-                      cm->filter_level * 10 / 6, 1, 0);

+                      cm->filter_level * 10 / 6);

 #endif

           vp9_clear_system_state();

-- 

⑨