shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Removed last_kf_gf_q"

--- a/vp8/common/onyxc_int.h

+++ b/vp8/common/onyxc_int.h

@@ -108,7 +108,6 @@

     int full_pixel;

     int base_qindex;

-    int last_kf_gf_q;  /* Q used on the last GF or KF */

     int y1dc_delta_q;

     int y2dc_delta_q;

--- a/vp8/decoder/decodframe.c

+++ b/vp8/decoder/decodframe.c

@@ -1217,13 +1217,6 @@

     /* vpx_log("Decoder: Frame Decoded, Size Roughly:%d bytes  \n",bc->pos+pbi->bc2.pos); */

-    /* If this was a kf or Gf note the Q used */

-    if ((pc->frame_type == KEY_FRAME) ||

-         pc->refresh_golden_frame || pc->refresh_alt_ref_frame)

-    {

-        pc->last_kf_gf_q = pc->base_qindex;

-    }

-

     if (pc->refresh_entropy_probs == 0)

     {

         vpx_memcpy(&pc->fc, &pc->lfc, sizeof(pc->fc));

--- a/vp8/encoder/onyx_if.c

+++ b/vp8/encoder/onyx_if.c

@@ -4633,10 +4633,6 @@

 #endif

-    /* If this was a kf or Gf note the Q */

-    if ((cm->frame_type == KEY_FRAME) || cm->refresh_golden_frame || cm->refresh_alt_ref_frame)

-        cm->last_kf_gf_q = cm->base_qindex;

-

     if (cm->refresh_golden_frame == 1)

         cm->frame_flags = cm->frame_flags | FRAMEFLAGS_GOLDEN;

     else