summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDeb Mukherjee <debargha@google.com>2014-08-08 16:11:02 -0700
committerDeb Mukherjee <debargha@google.com>2014-08-08 16:11:02 -0700
commit80656a1f19d086da1e34ef2481e9d6af87fa0e34 (patch)
treef2a578b7d455e773bd904059a8cd69851bcc7804
parent6e5149b68d97ea0bd1f149645da83169bc447e39 (diff)
downloadlibvpx-80656a1f19d086da1e34ef2481e9d6af87fa0e34.tar
libvpx-80656a1f19d086da1e34ef2481e9d6af87fa0e34.tar.gz
libvpx-80656a1f19d086da1e34ef2481e9d6af87fa0e34.tar.bz2
libvpx-80656a1f19d086da1e34ef2481e9d6af87fa0e34.zip
Adds spatial-svc macros to code to allow disabling
Adds a couple of CONFIG_SPATIAL_SVC macros to allow compilation when spatial-svc is disabled. Change-Id: I67f84406d1d3fa26f225d9c6518161a0841f2d29
-rw-r--r--vpx/src/svc_encodeframe.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/vpx/src/svc_encodeframe.c b/vpx/src/svc_encodeframe.c
index 93e86e319..7828615b2 100644
--- a/vpx/src/svc_encodeframe.c
+++ b/vpx/src/svc_encodeframe.c
@@ -510,8 +510,10 @@ vpx_codec_err_t vpx_svc_init(SvcContext *svc_ctx, vpx_codec_ctx_t *codec_ctx,
}
}
+#if CONFIG_SPATIAL_SVC
for (i = 0; i < si->layers; ++i)
enc_cfg->ss_enable_auto_alt_ref[i] = si->enable_auto_alt_ref[i];
+#endif
// modify encoder configuration
enc_cfg->ss_number_layers = si->layers;
@@ -709,12 +711,14 @@ vpx_codec_err_t vpx_svc_encode(SvcContext *svc_ctx, vpx_codec_ctx_t *codec_ctx,
si->rc_stats_buf_used += cx_pkt->data.twopass_stats.sz;
break;
}
+#if CONFIG_SPATIAL_SVC
case VPX_CODEC_SPATIAL_SVC_LAYER_SIZES: {
int i;
for (i = 0; i < si->layers; ++i)
si->bytes_sum[i] += cx_pkt->data.layer_sizes[i];
break;
}
+#endif
default: {
break;
}