diff options
| author | Yaowu Xu <yaowu@google.com> | 2015-12-15 17:51:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-12-15 17:51:33 +0000 |
| commit | eace551c8738b878d3649f70d82dd13ca3a96a29 (patch) | |
| tree | 0dcf45b676ce035afd1c8e4aebb150ccd65eb7c3 /vp9/encoder/vp9_encoder.c | |
| parent | 12084f6d5751b32673868e29ccd00633f196ffaa (diff) | |
| parent | 99309004bf349f4d66beb2a90e934fb25855b1e9 (diff) | |
| download | libvpx-eace551c8738b878d3649f70d82dd13ca3a96a29.tar libvpx-eace551c8738b878d3649f70d82dd13ca3a96a29.tar.gz libvpx-eace551c8738b878d3649f70d82dd13ca3a96a29.tar.bz2 libvpx-eace551c8738b878d3649f70d82dd13ca3a96a29.zip | |
Merge changes Icf9b57c3,I9e12da84,Idf5ee179
* changes:
Fixed interval, fixed Q 1 pass test patch.
1 pass VBR mode bug fix.
Fixed interval, fixed Q 1 pass test patch.
Diffstat (limited to 'vp9/encoder/vp9_encoder.c')
| -rw-r--r-- | vp9/encoder/vp9_encoder.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index 9c4351897..e4681f601 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -1478,7 +1478,11 @@ void vp9_change_config(struct VP9_COMP *cpi, const VP9EncoderConfig *oxcf) { cpi->td.mb.e_mbd.bd = (int)cm->bit_depth; #endif // CONFIG_VP9_HIGHBITDEPTH - rc->baseline_gf_interval = (MIN_GF_INTERVAL + MAX_GF_INTERVAL) / 2; + if ((oxcf->pass == 0) && (oxcf->rc_mode == VPX_Q)) { + rc->baseline_gf_interval = FIXED_GF_INTERVAL; + } else { + rc->baseline_gf_interval = (MIN_GF_INTERVAL + MAX_GF_INTERVAL) / 2; + } cpi->refresh_golden_frame = 0; cpi->refresh_last_frame = 1; |