ref: 9df11a7c523bc4031572ef460e815487f4e74354
parent: a73cee2870d96f45960b546da931fe78e45a5407
parent: 0d2555bd2e1d44fd0f8e6406a7e0cca2cc47a575
author: Jerome Jiang <jianj@google.com>
date: Mon Nov 13 16:04:41 EST 2017
Merge "vp9 svc: Change conditions on VPX_ENCODER_ABI_VERSION."
--- a/vp9/vp9_cx_iface.c
+++ b/vp9/vp9_cx_iface.c
@@ -1288,7 +1288,7 @@
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;
--- a/vpx/src/svc_encodeframe.c
+++ b/vpx/src/svc_encodeframe.c
@@ -559,7 +559,7 @@
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 @@
#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): "
--- a/vpx/vpx_encoder.h
+++ b/vpx/vpx_encoder.h
@@ -156,7 +156,7 @@
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 @@
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