diff options
| author | Scott LaVarnway <slavarnway@google.com> | 2012-08-21 15:19:58 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-08-21 15:19:58 -0700 |
| commit | 2a96d6b0d5b8dc61e48a672ff178ef23f9bcdb47 (patch) | |
| tree | 4434854ce82b91b880139ccb1700ba4935065573 | |
| parent | 8bec177dc441c0f619f80471205ddeaa249e2e12 (diff) | |
| parent | 6ce58e84d331610f6c9d74b9ebaa6209484c058b (diff) | |
| download | libvpx-2a96d6b0d5b8dc61e48a672ff178ef23f9bcdb47.tar libvpx-2a96d6b0d5b8dc61e48a672ff178ef23f9bcdb47.tar.gz libvpx-2a96d6b0d5b8dc61e48a672ff178ef23f9bcdb47.tar.bz2 libvpx-2a96d6b0d5b8dc61e48a672ff178ef23f9bcdb47.zip | |
Merge "Removed last_kf_gf_q"
| -rw-r--r-- | vp8/common/onyxc_int.h | 1 | ||||
| -rw-r--r-- | vp8/decoder/decodframe.c | 7 | ||||
| -rw-r--r-- | vp8/encoder/onyx_if.c | 4 |
3 files changed, 0 insertions, 12 deletions
diff --git a/vp8/common/onyxc_int.h b/vp8/common/onyxc_int.h index d7d02c2cf..c44ba8d23 100644 --- a/vp8/common/onyxc_int.h +++ b/vp8/common/onyxc_int.h @@ -108,7 +108,6 @@ typedef struct VP8Common 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; diff --git a/vp8/decoder/decodframe.c b/vp8/decoder/decodframe.c index ed2d34574..20bffdbca 100644 --- a/vp8/decoder/decodframe.c +++ b/vp8/decoder/decodframe.c @@ -1217,13 +1217,6 @@ int vp8_decode_frame(VP8D_COMP *pbi) /* 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)); diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index dc6080340..1d27ae017 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -4633,10 +4633,6 @@ static void encode_frame_to_data_rate #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 |