shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Refactor find_arf_order()"

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

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

@@ -2116,7 +2116,7 @@

   // Process regular P frames

   if ((end - start < min_frame_interval) ||

-      (depth > cpi->oxcf.enable_auto_arf)) {

+      (depth > gf_group->allowed_max_layer_depth)) {

     int idx;

     for (idx = start; idx < end; ++idx) {

       gf_group->update_type[*index_counter] = LF_UPDATE;

@@ -2210,6 +2210,7 @@

   }

   if (rc->source_alt_ref_pending && cpi->multi_layer_arf) {

+    gf_group->allowed_max_layer_depth = cpi->oxcf.enable_auto_arf;

     find_arf_order(cpi, gf_group, &frame_index, 2, 1, rc->baseline_gf_interval);

     set_gf_overlay_frame_type(gf_group, frame_index,

--- a/vp9/encoder/vp9_firstpass.h

+++ b/vp9/encoder/vp9_firstpass.h

@@ -140,6 +140,8 @@

   int top_arf_idx;

   int stack_size;

   int gf_group_size;

+  int max_layer_depth;

+  int allowed_max_layer_depth;

 } GF_GROUP;

 typedef struct {