vp9 svc: Change conditions on VPX_ENCODER_ABI_VERSION.

VPX_ENCODER_ABI_VERSION was bumped up in 93e83f.

Change-Id: Id5707f9f9db56fa96549bc8f54e1cfa04e7fa4cd

diff --git a/vp9/vp9_cx_iface.c b/vp9/vp9_cx_iface.c
index fe17901be85939a1ed52f33a28e07faa1111aee1..00e69c04dc1416930e6b638639bebb8a96a2a971 100644 (file)
--- 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 c774abb34f22726c628e9b84a68dea85d78f3bcf..f6455c4036fda036b4c24a2e40ab11ff1c1ffd6d 100644 (file)
--- 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 53bb75dffae6f69b6123a142e3a06bbaea0db533..063d02e67b88a0b707d15565ea499f34c47587df 100644 (file)
--- 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