diff options
| author | Debargha Mukherjee <debargha@google.com> | 2015-12-01 13:20:02 -0800 |
|---|---|---|
| committer | Debargha Mukherjee <debargha@google.com> | 2015-12-01 14:24:50 -0800 |
| commit | 7ceba7c26b111d7140187f3b1d99c3c6e141f3bf (patch) | |
| tree | f177c7c9d3c7a5ceedbaa10f4a834e20b8064834 /vp9/encoder | |
| parent | 01a2b40e959ea129dfd0e85f994d6f250026244b (diff) | |
| download | libvpx-7ceba7c26b111d7140187f3b1d99c3c6e141f3bf.tar libvpx-7ceba7c26b111d7140187f3b1d99c3c6e141f3bf.tar.gz libvpx-7ceba7c26b111d7140187f3b1d99c3c6e141f3bf.tar.bz2 libvpx-7ceba7c26b111d7140187f3b1d99c3c6e141f3bf.zip | |
Fix a spatial svc assert failure
Fixes spatial svc rc assert failure introdcued in:
https://chromium-review.googlesource.com/#/c/312959/1
Change-Id: I6096bfbc484859d71a5fb55e6a3248a31885af61
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_svc_layercontext.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_svc_layercontext.c b/vp9/encoder/vp9_svc_layercontext.c index 13da155c7..b0617c1ca 100644 --- a/vp9/encoder/vp9_svc_layercontext.c +++ b/vp9/encoder/vp9_svc_layercontext.c @@ -279,7 +279,7 @@ void vp9_restore_layer_context(VP9_COMP *const cpi) { // Reset the frames_since_key and frames_to_key counters to their values // before the layer restore. Keep these defined for the stream (not layer). if (cpi->svc.number_temporal_layers > 1 || - cpi->svc.number_spatial_layers > 1) { + (cpi->svc.number_spatial_layers > 1 && !is_two_pass_svc(cpi))) { cpi->rc.frames_since_key = old_frame_since_key; cpi->rc.frames_to_key = old_frame_to_key; } |