diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-04-10 20:51:27 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-04-10 20:51:27 -0700 |
| commit | 8e4d5e41a8be6dcd9d53683bdc1b3052a7566733 (patch) | |
| tree | 43e4efedde056d1c313173711792382b090ddbc3 /vp9/encoder | |
| parent | c8406c65594529bbd97b0a2fa5823e6c9c8a8a19 (diff) | |
| parent | a286ff8077e054b8a43e8bb2bc5afb17d331d9d8 (diff) | |
| download | libvpx-8e4d5e41a8be6dcd9d53683bdc1b3052a7566733.tar libvpx-8e4d5e41a8be6dcd9d53683bdc1b3052a7566733.tar.gz libvpx-8e4d5e41a8be6dcd9d53683bdc1b3052a7566733.tar.bz2 libvpx-8e4d5e41a8be6dcd9d53683bdc1b3052a7566733.zip | |
Merge "Moving last_frame_type update out from vp9_rc_postencode_update."
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_onyx_if.c | 1 | ||||
| -rw-r--r-- | vp9/encoder/vp9_ratectrl.c | 3 | ||||
| -rw-r--r-- | vp9/encoder/vp9_ratectrl.h | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index 7df1806e9..4be6d6ce5 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -2658,6 +2658,7 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi, get_ref_frame_flags(cpi); + cm->last_frame_type = cm->frame_type; vp9_rc_postencode_update(cpi, *size); if (cm->frame_type == KEY_FRAME) { diff --git a/vp9/encoder/vp9_ratectrl.c b/vp9/encoder/vp9_ratectrl.c index 6a9ffd25d..00489cd23 100644 --- a/vp9/encoder/vp9_ratectrl.c +++ b/vp9/encoder/vp9_ratectrl.c @@ -1065,11 +1065,10 @@ static void update_golden_frame_stats(VP9_COMP *cpi) { } void vp9_rc_postencode_update(VP9_COMP *cpi, uint64_t bytes_used) { - VP9_COMMON *const cm = &cpi->common; + const VP9_COMMON *const cm = &cpi->common; const VP9_CONFIG *const oxcf = &cpi->oxcf; RATE_CONTROL *const rc = &cpi->rc; - cm->last_frame_type = cm->frame_type; // Update rate control heuristics rc->projected_frame_size = (int)(bytes_used << 3); diff --git a/vp9/encoder/vp9_ratectrl.h b/vp9/encoder/vp9_ratectrl.h index 7693c2b13..0b12a4c58 100644 --- a/vp9/encoder/vp9_ratectrl.h +++ b/vp9/encoder/vp9_ratectrl.h @@ -125,8 +125,7 @@ void vp9_rc_get_svc_params(struct VP9_COMP *cpi); // Post encode update of the rate control parameters based // on bytes used -void vp9_rc_postencode_update(struct VP9_COMP *cpi, - uint64_t bytes_used); +void vp9_rc_postencode_update(struct VP9_COMP *cpi, uint64_t bytes_used); // Post encode update of the rate control parameters for dropped frames void vp9_rc_postencode_update_drop_frame(struct VP9_COMP *cpi); |