This reverts commit
254e2f5501d000ca66bc65c5f44bb6a882d4167c.
Reason for revert: <INSERT REASONING HERE>
Original change's description:
> vp9 svc: fix to make top layer frame non-ref
>
> Add mismatch check to the datarate test of changing svc pattern on the
> fly.
>
> Change-Id: I6a878736de44e6a40c077ed6430aabd7fadabdd9
TBR=marpan@google.com,builds@webmproject.org,jianj@google.com
Change-Id: Ibcb600438098f8dc380fe7e1de90cb81fc367468
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
} else {
ref_frame_config->frame_flags[sl] =
VP8_EFLAG_NO_REF_ARF | VP8_EFLAG_NO_UPD_LAST | VP8_EFLAG_NO_UPD_GF;
- if (sl == num_spatial_layers - 1)
- ref_frame_config->frame_flags[sl] =
- VP8_EFLAG_NO_UPD_ARF | VP8_EFLAG_NO_REF_ARF |
- VP8_EFLAG_NO_UPD_LAST | VP8_EFLAG_NO_UPD_GF;
}
}
if (tl == 0) {
ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
CheckLayerRateTargeting(&cfg_, number_spatial_layers_,
number_temporal_layers_, file_datarate_, 0.78, 1.15);
-#if CONFIG_VP9_DECODER
- // Number of temporal layers > 1, so half of the frames in this SVC pattern
- // will be non-reference frame and hence encoder will avoid loopfilter.
- // Since frame dropper is off, we can expect 200 (half of the sequence)
- // mismatched frames.
- EXPECT_EQ(static_cast<unsigned int>(200), GetMismatchFrames());
-#endif
}
// Check basic rate targeting for 1 pass CBR SVC with 3 spatial layers and on
if (!spatial_id) {
cpi->ref_frame_flags = VP9_LAST_FLAG;
} else {
- if (spatial_id == cpi->svc.number_spatial_layers - 1)
- cpi->ext_refresh_alt_ref_frame = 0;
cpi->ref_frame_flags = VP9_LAST_FLAG | VP9_GOLD_FLAG;
}
}