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 /vpx/src | |
| 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 'vpx/src')
| -rw-r--r-- | vpx/src/svc_encodeframe.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/vpx/src/svc_encodeframe.c b/vpx/src/svc_encodeframe.c index 8d9a5c3f5..f633600c7 100644 --- a/vpx/src/svc_encodeframe.c +++ b/vpx/src/svc_encodeframe.c @@ -559,8 +559,7 @@ vpx_codec_err_t vpx_svc_encode(SvcContext *svc_ctx, vpx_codec_ctx_t *codec_ctx, iter = NULL; while ((cx_pkt = vpx_codec_get_cx_data(codec_ctx, &iter))) { switch (cx_pkt->kind) { -#if VPX_ENCODER_ABI_VERSION > (6 + VPX_CODEC_ABI_VERSION) -#if CONFIG_SPATIAL_SVC +#if CONFIG_SPATIAL_SVC && defined(VPX_TEST_SPATIAL_SVC) case VPX_CODEC_SPATIAL_SVC_LAYER_PSNR: { int i; for (i = 0; i < svc_ctx->spatial_layers; ++i) { @@ -595,9 +594,8 @@ vpx_codec_err_t vpx_svc_encode(SvcContext *svc_ctx, vpx_codec_ctx_t *codec_ctx, break; } #endif -#endif case VPX_CODEC_PSNR_PKT: { -#if VPX_ENCODER_ABI_VERSION > (6 + VPX_CODEC_ABI_VERSION) +#if CONFIG_SPATIAL_SVC && defined(VPX_TEST_SPATIAL_SVC) int j; svc_log(svc_ctx, SVC_LOG_DEBUG, "frame: %d, layer: %d, PSNR(Total/Y/U/V): " |