diff options
| author | Marco Paniconi <marpan@google.com> | 2018-06-25 18:19:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-06-25 18:19:41 +0000 |
| commit | 74c890b98ba0ee3b7bcb77ce2656cd5d17f6a80b (patch) | |
| tree | fce9454da5066f9ad048f7b051291e54829e8c89 /vp9/encoder | |
| parent | 4fc3dadb3223d6d68878502b4e80d0a0e1dd3f5a (diff) | |
| parent | 3edef86c5f5651f4a89004012ec3efe3232351df (diff) | |
| download | libvpx-74c890b98ba0ee3b7bcb77ce2656cd5d17f6a80b.tar libvpx-74c890b98ba0ee3b7bcb77ce2656cd5d17f6a80b.tar.gz libvpx-74c890b98ba0ee3b7bcb77ce2656cd5d17f6a80b.tar.bz2 libvpx-74c890b98ba0ee3b7bcb77ce2656cd5d17f6a80b.zip | |
Merge "vp9-svc: Fix to frame dropping when layer is skipped."
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_ratectrl.c | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/vp9/encoder/vp9_ratectrl.c b/vp9/encoder/vp9_ratectrl.c index fdc8e1494..cea13b027 100644 --- a/vp9/encoder/vp9_ratectrl.c +++ b/vp9/encoder/vp9_ratectrl.c @@ -414,9 +414,12 @@ static int check_buffer_above_thresh(VP9_COMP *cpi, int drop_mark) { svc->number_temporal_layers); LAYER_CONTEXT *lc = &svc->layer_context[layer]; RATE_CONTROL *lrc = &lc->rc; - const int drop_mark_layer = - (int)(cpi->svc.framedrop_thresh[i] * lrc->optimal_buffer_level / 100); - if (!(lrc->buffer_level > drop_mark_layer)) return 0; + // Exclude check for layer whose bitrate is 0. + if (lc->target_bandwidth > 0) { + const int drop_mark_layer = (int)(cpi->svc.framedrop_thresh[i] * + lrc->optimal_buffer_level / 100); + if (!(lrc->buffer_level > drop_mark_layer)) return 0; + } } return 1; } @@ -439,12 +442,15 @@ static int check_buffer_below_thresh(VP9_COMP *cpi, int drop_mark) { svc->number_temporal_layers); LAYER_CONTEXT *lc = &svc->layer_context[layer]; RATE_CONTROL *lrc = &lc->rc; - const int drop_mark_layer = - (int)(cpi->svc.framedrop_thresh[i] * lrc->optimal_buffer_level / 100); - if (cpi->svc.framedrop_mode == FULL_SUPERFRAME_DROP) { - if (lrc->buffer_level <= drop_mark_layer) return 1; - } else { - if (!(lrc->buffer_level <= drop_mark_layer)) return 0; + // Exclude check for layer whose bitrate is 0. + if (lc->target_bandwidth > 0) { + const int drop_mark_layer = (int)(cpi->svc.framedrop_thresh[i] * + lrc->optimal_buffer_level / 100); + if (cpi->svc.framedrop_mode == FULL_SUPERFRAME_DROP) { + if (lrc->buffer_level <= drop_mark_layer) return 1; + } else { + if (!(lrc->buffer_level <= drop_mark_layer)) return 0; + } } } if (cpi->svc.framedrop_mode == FULL_SUPERFRAME_DROP) |