diff options
| author | Yaowu Xu <yaowu@google.com> | 2014-01-21 16:04:35 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-01-21 16:04:35 -0800 |
| commit | 000efb5711d2732f7197f15cd8497ddc4140a5b9 (patch) | |
| tree | 4bc1b36df04b61439231bed9f8a3561097a6acd5 /vp9 | |
| parent | c2b5a393451b59d444884b6e7fee2de51e8ab8e2 (diff) | |
| parent | dbae98082c1129191db46d94ddb45609fc7897c4 (diff) | |
| download | libvpx-000efb5711d2732f7197f15cd8497ddc4140a5b9.tar libvpx-000efb5711d2732f7197f15cd8497ddc4140a5b9.tar.gz libvpx-000efb5711d2732f7197f15cd8497ddc4140a5b9.tar.bz2 libvpx-000efb5711d2732f7197f15cd8497ddc4140a5b9.zip | |
Merge "Enforce key frame placement"
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_firstpass.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c index 0a5af18cb..fe57af284 100644 --- a/vp9/encoder/vp9_firstpass.c +++ b/vp9/encoder/vp9_firstpass.c @@ -2060,7 +2060,8 @@ void vp9_get_second_pass_params(VP9_COMP *cpi) { this_frame_coded_error = this_frame.coded_error; // keyframe and section processing ! - if (rc->frames_to_key == 0) { + if (rc->frames_to_key == 0 || + (cpi->common.frame_flags & FRAMEFLAGS_KEY)) { // Define next KF group and assign bits to it this_frame_copy = this_frame; find_next_key_frame(cpi, &this_frame_copy); |