diff options
| author | Jingning Han <jingning@google.com> | 2018-09-11 04:03:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-09-11 04:03:52 +0000 |
| commit | 6bc958713f8bc114157ae29c733548a22976e8c0 (patch) | |
| tree | d6fb950cef2a1e6b7c2fbebd7e72617bf21943e7 /vp9 | |
| parent | 6665540ed20b7ed665237e6b19e66cfaadd0a6c4 (diff) | |
| parent | b0688880281eb4015a00eb854fb0d6a352b35bdb (diff) | |
| download | libvpx-6bc958713f8bc114157ae29c733548a22976e8c0.tar libvpx-6bc958713f8bc114157ae29c733548a22976e8c0.tar.gz libvpx-6bc958713f8bc114157ae29c733548a22976e8c0.tar.bz2 libvpx-6bc958713f8bc114157ae29c733548a22976e8c0.zip | |
Merge "Assign layer depth for all coding frames"
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_firstpass.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c index 5108620c6..1f95bc6d5 100644 --- a/vp9/encoder/vp9_firstpass.c +++ b/vp9/encoder/vp9_firstpass.c @@ -2421,6 +2421,7 @@ static int define_gf_group_structure(VP9_COMP *cpi) { if (rc->source_alt_ref_pending) { gf_group->update_type[frame_index] = ARF_UPDATE; gf_group->rf_level[frame_index] = GF_ARF_STD; + gf_group->layer_depth[frame_index] = 1; gf_group->arf_src_offset[frame_index] = (unsigned char)(rc->baseline_gf_interval - 1); @@ -2444,8 +2445,6 @@ static int define_gf_group_structure(VP9_COMP *cpi) { } if (rc->source_alt_ref_pending && cpi->multi_layer_arf) { - gf_group->layer_depth[frame_index] = 1; - find_arf_order(cpi, gf_group, &frame_index, 2, 0, rc->baseline_gf_interval - 1); @@ -2482,6 +2481,7 @@ static int define_gf_group_structure(VP9_COMP *cpi) { gf_group->update_type[frame_index] = LF_UPDATE; gf_group->rf_level[frame_index] = INTER_NORMAL; + gf_group->layer_depth[frame_index] = MAX_ARF_LAYERS - 1; ++frame_index; } |