shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Fix intra_count_low calculation in first pass"

--- a/vp9/encoder/vp9_firstpass.c

+++ b/vp9/encoder/vp9_firstpass.c

@@ -1037,10 +1037,11 @@

     // Other than for the first frame do a motion search.

     if (cm->current_video_frame > 0) {

-      int tmp_err, motion_error, raw_motion_error;

+      int tmp_err, motion_error, this_motion_error, raw_motion_error;

       // Assume 0,0 motion with no mv overhead.

       MV mv = { 0, 0 }, tmp_mv = { 0, 0 };

       struct buf_2d unscaled_last_source_buf_2d;

+      vp9_variance_fn_ptr_t v_fn_ptr = cpi->fn_ptr[bsize];

       xd->plane[0].pre[0].buf = first_ref_buf->y_buffer + recon_yoffset;

 #if CONFIG_VP9_HIGHBITDEPTH

@@ -1047,13 +1048,17 @@

       if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {

         motion_error = highbd_get_prediction_error(

             bsize, &x->plane[0].src, &xd->plane[0].pre[0], xd->bd);

+        this_motion_error = highbd_get_prediction_error(

+            bsize, &x->plane[0].src, &xd->plane[0].pre[0], 8);

       } else {

         motion_error =

             get_prediction_error(bsize, &x->plane[0].src, &xd->plane[0].pre[0]);

+        this_motion_error = motion_error;

       }

 #else

       motion_error =

           get_prediction_error(bsize, &x->plane[0].src, &xd->plane[0].pre[0]);

+      this_motion_error = motion_error;

 #endif  // CONFIG_VP9_HIGHBITDEPTH

       // Compute the motion error of the 0,0 motion using the last source

@@ -1080,6 +1085,15 @@

         // starting point (best reference) for the search.

         first_pass_motion_search(cpi, x, best_ref_mv, &mv, &motion_error);

+        v_fn_ptr.vf = get_block_variance_fn(bsize);

+#if CONFIG_VP9_HIGHBITDEPTH

+        if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {

+          v_fn_ptr.vf = highbd_get_block_variance_fn(bsize, 8);

+        }

+#endif  // CONFIG_VP9_HIGHBITDEPTH

+        this_motion_error =

+            vp9_get_mvpred_var(x, &mv, best_ref_mv, &v_fn_ptr, 0);

+

         // If the current best reference mv is not centered on 0,0 then do a

         // 0,0 based search as well.

         if (!is_zero_mv(best_ref_mv)) {

@@ -1089,6 +1103,8 @@

           if (tmp_err < motion_error) {

             motion_error = tmp_err;

             mv = tmp_mv;

+            this_motion_error =

+                vp9_get_mvpred_var(x, &tmp_mv, &zero_mv, &v_fn_ptr, 0);

           }

         }

@@ -1275,7 +1291,7 @@

         int scaled_low_intra_thresh = scale_sse_threshold(cm, LOW_I_THRESH);

         if (this_intra_error < scaled_low_intra_thresh) {

           fp_acc_data->frame_noise_energy += fp_estimate_block_noise(x, bsize);

-          if (motion_error < scaled_low_intra_thresh) {

+          if (this_motion_error < scaled_low_intra_thresh) {

             fp_acc_data->intra_count_low += 1.0;

           } else {

             fp_acc_data->intra_count_high += 1.0;