diff options
| author | James Zern <jzern@google.com> | 2017-11-30 10:52:25 -0800 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2017-11-30 10:52:25 -0800 |
| commit | 5044779e77517851d91b65d1eec4199919901ecf (patch) | |
| tree | b18abc89d63045925a4ccbb238a1b6f067910286 /examples | |
| parent | 392e0188f68b024c6e7f99f1fdc54aa70f755aaa (diff) | |
| download | libvpx-5044779e77517851d91b65d1eec4199919901ecf.tar libvpx-5044779e77517851d91b65d1eec4199919901ecf.tar.gz libvpx-5044779e77517851d91b65d1eec4199919901ecf.tar.bz2 libvpx-5044779e77517851d91b65d1eec4199919901ecf.zip | |
decouple spatial-svc from encoder abi
this is only meant for testing. along with --enable-experimental
--enable-spatial-svc require VPX_TEST_SPATIAL_SVC to be defined rather
than bumping the encoder ABI.
Change-Id: I7f34d9f60300fa31ccf22e1a4aa619392c391b2e
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/vpx_temporal_svc_encoder.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/examples/vpx_temporal_svc_encoder.c b/examples/vpx_temporal_svc_encoder.c index bff6e1722..e7b31f5eb 100644 --- a/examples/vpx_temporal_svc_encoder.c +++ b/examples/vpx_temporal_svc_encoder.c @@ -558,11 +558,7 @@ int main(int argc, char **argv) { #if VP8_ROI_MAP vpx_roi_map_t roi; #endif -#if VPX_ENCODER_ABI_VERSION > (4 + VPX_CODEC_ABI_VERSION) vpx_svc_layer_id_t layer_id = { 0, 0 }; -#else - vpx_svc_layer_id_t layer_id = { 0 }; -#endif const VpxInterface *encoder = NULL; FILE *infile = NULL; struct RateControlMetrics rc; @@ -814,10 +810,8 @@ int main(int argc, char **argv) { struct vpx_usec_timer timer; vpx_codec_iter_t iter = NULL; const vpx_codec_cx_pkt_t *pkt; -#if VPX_ENCODER_ABI_VERSION > (4 + VPX_CODEC_ABI_VERSION) // Update the temporal layer_id. No spatial layers in this test. layer_id.spatial_layer_id = 0; -#endif layer_id.temporal_layer_id = cfg.ts_layer_id[frame_cnt % cfg.ts_periodicity]; if (strncmp(encoder->name, "vp9", 3) == 0) { |