diff options
| author | Jingning Han <jingning@google.com> | 2018-11-06 17:10:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-11-06 17:10:24 +0000 |
| commit | ee8920732d1b1446799c5cb9195cfcb2df1fefe8 (patch) | |
| tree | 77a7bf0dd762a15953380d99d6a57a5adc5a3d33 /vp9/encoder | |
| parent | df159d67b2b2c3d81d5cbaf2067d7c5169456a0e (diff) | |
| parent | 9718a01e42e3e7232c6fe8dd1068052a7e7f5f2b (diff) | |
| download | libvpx-ee8920732d1b1446799c5cb9195cfcb2df1fefe8.tar libvpx-ee8920732d1b1446799c5cb9195cfcb2df1fefe8.tar.gz libvpx-ee8920732d1b1446799c5cb9195cfcb2df1fefe8.tar.bz2 libvpx-ee8920732d1b1446799c5cb9195cfcb2df1fefe8.zip | |
Merge "Track maximum layer depth in a GOP"
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_firstpass.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c index 5924430de..b61e2adee 100644 --- a/vp9/encoder/vp9_firstpass.c +++ b/vp9/encoder/vp9_firstpass.c @@ -2127,6 +2127,7 @@ static void find_arf_order(VP9_COMP *cpi, GF_GROUP *gf_group, gf_group->gfu_boost[*index_counter] = NORMAL_BOOST; ++(*index_counter); } + gf_group->max_layer_depth = VPXMAX(gf_group->max_layer_depth, depth); return; } @@ -2189,6 +2190,7 @@ static void define_gf_group_structure(VP9_COMP *cpi) { gf_group->frame_start = cpi->common.current_video_frame; gf_group->frame_end = gf_group->frame_start + rc->baseline_gf_interval; + gf_group->max_layer_depth = 0; // For key frames the frame target rate is already set and it // is also the golden frame. @@ -2206,6 +2208,7 @@ static void define_gf_group_structure(VP9_COMP *cpi) { gf_group->arf_src_offset[frame_index] = (unsigned char)(rc->baseline_gf_interval - 1); gf_group->frame_gop_index[frame_index] = rc->baseline_gf_interval; + gf_group->max_layer_depth = 1; ++frame_index; } |