diff options
| author | Paul Wilkins <paulwilkins@google.com> | 2014-10-16 15:49:13 +0100 |
|---|---|---|
| committer | Paul Wilkins <paulwilkins@google.com> | 2014-10-16 15:52:08 +0100 |
| commit | 468032961d2ce9f0c85a2498a51024aaf92965ca (patch) | |
| tree | 5ce1f4f04798a053630b3465fabe4c6663eb38e8 /vp9/encoder/vp9_bitstream.c | |
| parent | 2c133152f7900ac51eff616bd2cf6a8ee46dfd57 (diff) | |
| download | libvpx-468032961d2ce9f0c85a2498a51024aaf92965ca.tar libvpx-468032961d2ce9f0c85a2498a51024aaf92965ca.tar.gz libvpx-468032961d2ce9f0c85a2498a51024aaf92965ca.tar.bz2 libvpx-468032961d2ce9f0c85a2498a51024aaf92965ca.zip | |
Revert "[spatial svc]Another workaround to avoid using prev_mi"
This reverts commit c113457af9880b8e15a36cdaabfd414d1c245693.
Temporary revert to allow clean revert of another commit.
Change-Id: Ia9b7b755e6c48e1b6e383329f121fef175a24b27
Diffstat (limited to 'vp9/encoder/vp9_bitstream.c')
| -rw-r--r-- | vp9/encoder/vp9_bitstream.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/vp9/encoder/vp9_bitstream.c b/vp9/encoder/vp9_bitstream.c index 3954fe6a7..694cac76f 100644 --- a/vp9/encoder/vp9_bitstream.c +++ b/vp9/encoder/vp9_bitstream.c @@ -1013,11 +1013,7 @@ static void write_frame_size_with_refs(VP9_COMP *cpi, ((cpi->svc.number_temporal_layers > 1 && cpi->oxcf.rc_mode == VPX_CBR) || (cpi->svc.number_spatial_layers > 1 && - cpi->svc.layer_context[cpi->svc.spatial_layer_id].is_key_frame) || - (is_two_pass_svc(cpi) && - cpi->svc.encode_empty_frame_state == ENCODING && - cpi->svc.layer_context[0].frames_from_key_frame < - cpi->svc.number_temporal_layers + 1))) { + cpi->svc.layer_context[cpi->svc.spatial_layer_id].is_key_frame))) { found = 0; } vp9_wb_write_bit(wb, found); @@ -1109,7 +1105,8 @@ static void write_uncompressed_header(VP9_COMP *cpi, // will change to show_frame flag to 0, then add an one byte frame with // show_existing_frame flag which tells the decoder which frame we want to // show. - if (!cm->show_frame) + if (!cm->show_frame || + (is_two_pass_svc(cpi) && cm->error_resilient_mode == 0)) vp9_wb_write_bit(wb, cm->intra_only); if (!cm->error_resilient_mode) |