shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Converting configure_skippable_frame() to is_skippable_frame()."

--- a/vp9/encoder/vp9_encoder.c

+++ b/vp9/encoder/vp9_encoder.c

@@ -2013,18 +2013,16 @@

   }

 }

-static void configure_skippable_frame(VP9_COMP *cpi) {

+static int is_skippable_frame(const VP9_COMP *cpi) {

   // If the current frame does not have non-zero motion vector detected in the

   // first  pass, and so do its previous and forward frames, then this frame

   // can be skipped for partition check, and the partition size is assigned

   // according to the variance

+  const SVC *const svc = &cpi->svc;

+  const TWO_PASS *const twopass = is_spatial_svc(cpi) ?

+      &svc->layer_context[svc->spatial_layer_id].twopass : &cpi->twopass;

-  SVC *const svc = &cpi->svc;

-  TWO_PASS *const twopass = is_spatial_svc(cpi) ?

-                            &svc->layer_context[svc->spatial_layer_id].twopass

-                            : &cpi->twopass;

-

-  cpi->skippable_frame = (!frame_is_intra_only(&cpi->common) &&

+  return (!frame_is_intra_only(&cpi->common) &&

     twopass->stats_in - 2 > twopass->stats_in_start &&

     twopass->stats_in < twopass->stats_in_end &&

     (twopass->stats_in - 1)->pcnt_inter - (twopass->stats_in - 1)->pcnt_motion

@@ -2198,7 +2196,7 @@

   // second pass according to the first pass stats

   if (oxcf->pass == 2 &&

       (!cpi->use_svc || is_spatial_svc(cpi))) {

-    configure_skippable_frame(cpi);

+    cpi->skippable_frame = is_skippable_frame(cpi);

   }

   // For 1 pass CBR, check if we are dropping this frame.