From 0d2555bd2e1d44fd0f8e6406a7e0cca2cc47a575 Mon Sep 17 00:00:00 2001 From: Jerome Jiang Date: Mon, 13 Nov 2017 11:05:20 -0800 Subject: [PATCH] vp9 svc: Change conditions on VPX_ENCODER_ABI_VERSION. VPX_ENCODER_ABI_VERSION was bumped up in 93e83f. Change-Id: Id5707f9f9db56fa96549bc8f54e1cfa04e7fa4cd --- vp9/vp9_cx_iface.c | 2 +- vpx/src/svc_encodeframe.c | 4 ++-- vpx/vpx_encoder.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/vp9/vp9_cx_iface.c b/vp9/vp9_cx_iface.c index fe17901be..00e69c04d 100644 --- a/vp9/vp9_cx_iface.c +++ b/vp9/vp9_cx_iface.c @@ -1288,7 +1288,7 @@ static vpx_codec_err_t encoder_encode(vpx_codec_alg_priv_t *ctx, cx_data += size; cx_data_sz -= size; -#if VPX_ENCODER_ABI_VERSION > (5 + VPX_CODEC_ABI_VERSION) +#if VPX_ENCODER_ABI_VERSION > (6 + VPX_CODEC_ABI_VERSION) #if CONFIG_SPATIAL_SVC if (cpi->use_svc && !ctx->output_cx_pkt_cb.output_cx_pkt) { vpx_codec_cx_pkt_t pkt_sizes, pkt_psnr; diff --git a/vpx/src/svc_encodeframe.c b/vpx/src/svc_encodeframe.c index c774abb34..f6455c403 100644 --- a/vpx/src/svc_encodeframe.c +++ b/vpx/src/svc_encodeframe.c @@ -559,7 +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 > (5 + VPX_CODEC_ABI_VERSION) +#if VPX_ENCODER_ABI_VERSION > (6 + VPX_CODEC_ABI_VERSION) #if CONFIG_SPATIAL_SVC case VPX_CODEC_SPATIAL_SVC_LAYER_PSNR: { int i; @@ -597,7 +597,7 @@ vpx_codec_err_t vpx_svc_encode(SvcContext *svc_ctx, vpx_codec_ctx_t *codec_ctx, #endif #endif case VPX_CODEC_PSNR_PKT: { -#if VPX_ENCODER_ABI_VERSION > (5 + VPX_CODEC_ABI_VERSION) +#if VPX_ENCODER_ABI_VERSION > (6 + VPX_CODEC_ABI_VERSION) int j; svc_log(svc_ctx, SVC_LOG_DEBUG, "frame: %d, layer: %d, PSNR(Total/Y/U/V): " diff --git a/vpx/vpx_encoder.h b/vpx/vpx_encoder.h index 53bb75dff..063d02e67 100644 --- a/vpx/vpx_encoder.h +++ b/vpx/vpx_encoder.h @@ -156,7 +156,7 @@ enum vpx_codec_cx_pkt_kind { VPX_CODEC_PSNR_PKT, /**< PSNR statistics for this frame */ // Spatial SVC is still experimental and may be removed before the next ABI // bump. -#if VPX_ENCODER_ABI_VERSION > (5 + VPX_CODEC_ABI_VERSION) +#if VPX_ENCODER_ABI_VERSION > (6 + VPX_CODEC_ABI_VERSION) VPX_CODEC_SPATIAL_SVC_LAYER_SIZES, /**< Sizes for each layer in this frame*/ VPX_CODEC_SPATIAL_SVC_LAYER_PSNR, /**< PSNR for each layer in this frame*/ #endif @@ -194,7 +194,7 @@ typedef struct vpx_codec_cx_pkt { vpx_fixed_buf_t raw; /**< data for arbitrary packets */ // Spatial SVC is still experimental and may be removed before the next // ABI bump. -#if VPX_ENCODER_ABI_VERSION > (5 + VPX_CODEC_ABI_VERSION) +#if VPX_ENCODER_ABI_VERSION > (6 + VPX_CODEC_ABI_VERSION) size_t layer_sizes[VPX_SS_MAX_LAYERS]; struct vpx_psnr_pkt layer_psnr[VPX_SS_MAX_LAYERS]; #endif -- 2.49.0