diff options
| author | Jingning Han <jingning@google.com> | 2018-08-17 10:45:46 -0700 |
|---|---|---|
| committer | Jingning Han <jingning@google.com> | 2018-08-17 16:18:32 -0700 |
| commit | eb327e418ed05d4e6df23701c514607a940a9ca0 (patch) | |
| tree | b6c707e9cb45568a810524c16acaecd485b24b28 /vp9 | |
| parent | 5226940ef2ae65ea324c82859557ebb39b023bae (diff) | |
| download | libvpx-eb327e418ed05d4e6df23701c514607a940a9ca0.tar libvpx-eb327e418ed05d4e6df23701c514607a940a9ca0.tar.gz libvpx-eb327e418ed05d4e6df23701c514607a940a9ca0.tar.bz2 libvpx-eb327e418ed05d4e6df23701c514607a940a9ca0.zip | |
Refactor init_gop_frame()
Remove implicit dependency on overlay frame update to break the
gop initialization loop.
Change-Id: I6a6d070cdf22a0e30c298523707bd746fd03f450
Diffstat (limited to 'vp9')
| -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 df4fe7fd3..771bc0d42 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -5455,6 +5455,9 @@ void init_gop_frames(VP9_COMP *cpi, GF_PICTURE *gf_picture, RefCntBuffer *frame_bufs = cm->buffer_pool->frame_bufs; int recon_frame_index[REFS_PER_FRAME + 1] = { -1, -1, -1, -1 }; + // TODO(jingning): To be used later for gf frame type parsing. + (void)gf_group; + for (i = 0; i < FRAME_BUFFERS && frame_idx < REFS_PER_FRAME + 1; ++i) { if (frame_bufs[i].ref_count == 0) { alloc_frame_mvs(cm, i); @@ -5508,7 +5511,8 @@ void init_gop_frames(VP9_COMP *cpi, GF_PICTURE *gf_picture, ++*tpl_group_frames; lst_index = frame_idx; - if (gf_group->update_type[frame_idx] == OVERLAY_UPDATE) break; + + if (frame_idx == cpi->rc.baseline_gf_interval + 1) break; } gld_index = frame_idx; |