diff options
| author | Yaowu Xu <yaowu@google.com> | 2014-04-08 07:17:38 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-04-08 07:17:38 -0700 |
| commit | e2ab65ab7d499a6f4a8e4b3d4de6eb1fde861281 (patch) | |
| tree | 3d357c7b864d45f798df3a0a3bdbda4d1f17b908 /vp9/encoder | |
| parent | 8f68468917296320f2337bb8c8c4ae2de79e1817 (diff) | |
| parent | 4664b219a298387c009b393de2c2a023adfaa741 (diff) | |
| download | libvpx-e2ab65ab7d499a6f4a8e4b3d4de6eb1fde861281.tar libvpx-e2ab65ab7d499a6f4a8e4b3d4de6eb1fde861281.tar.gz libvpx-e2ab65ab7d499a6f4a8e4b3d4de6eb1fde861281.tar.bz2 libvpx-e2ab65ab7d499a6f4a8e4b3d4de6eb1fde861281.zip | |
Merge "vp9_ratectrl: change ARF overlays rate correction factor"
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_ratectrl.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/vp9/encoder/vp9_ratectrl.c b/vp9/encoder/vp9_ratectrl.c index b84865ad0..71d34fc10 100644 --- a/vp9/encoder/vp9_ratectrl.c +++ b/vp9/encoder/vp9_ratectrl.c @@ -227,6 +227,7 @@ static double get_rate_correction_factor(const VP9_COMP *cpi) { return cpi->rc.key_frame_rate_correction_factor; } else { if ((cpi->refresh_alt_ref_frame || cpi->refresh_golden_frame) && + !cpi->rc.is_src_frame_alt_ref && !(cpi->use_svc && cpi->oxcf.end_usage == USAGE_STREAM_FROM_SERVER)) return cpi->rc.gf_rate_correction_factor; else @@ -239,6 +240,7 @@ static void set_rate_correction_factor(VP9_COMP *cpi, double factor) { cpi->rc.key_frame_rate_correction_factor = factor; } else { if ((cpi->refresh_alt_ref_frame || cpi->refresh_golden_frame) && + !cpi->rc.is_src_frame_alt_ref && !(cpi->use_svc && cpi->oxcf.end_usage == USAGE_STREAM_FROM_SERVER)) cpi->rc.gf_rate_correction_factor = factor; else |