summaryrefslogtreecommitdiff
path: root/vp9/vp9_cx_iface.c
diff options
context:
space:
mode:
authorMinghai Shang <minghai@google.com>2014-10-14 16:25:03 -0700
committerPaul Wilkins <paulwilkins@google.com>2014-10-16 16:09:40 +0100
commit68b550f5510a567583d9cdd9f60f44a280e611a7 (patch)
treec82616b6ca5892b221aa1b9f3150c19046fca260 /vp9/vp9_cx_iface.c
parentd5130af5687a2401a45190b5bd68638995e74dde (diff)
downloadlibvpx-68b550f5510a567583d9cdd9f60f44a280e611a7.tar
libvpx-68b550f5510a567583d9cdd9f60f44a280e611a7.tar.gz
libvpx-68b550f5510a567583d9cdd9f60f44a280e611a7.tar.bz2
libvpx-68b550f5510a567583d9cdd9f60f44a280e611a7.zip
[spatial svc]Another workaround to avoid using prev_mi
We encode a empty invisible frame in front of the base layer frame to avoid using prev_mi. Since there's a restriction for reference frame scaling factor, we have to make it smaller and smaller gradually until its size is 16x16. Change remerged. Change-Id: I9efab38bba7da86e056fbe8f663e711c5df38449
Diffstat (limited to 'vp9/vp9_cx_iface.c')
-rw-r--r--vp9/vp9_cx_iface.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/vp9/vp9_cx_iface.c b/vp9/vp9_cx_iface.c
index 041ba27da..d0ca5242c 100644
--- a/vp9/vp9_cx_iface.c
+++ b/vp9/vp9_cx_iface.c
@@ -188,11 +188,9 @@ static vpx_codec_err_t validate_config(vpx_codec_alg_priv_t *ctx,
}
if (alt_ref_sum > REF_FRAMES - cfg->ss_number_layers)
ERROR("Not enough ref buffers for svc alt ref frames");
- if ((cfg->ss_number_layers > 3 ||
- cfg->ss_number_layers * cfg->ts_number_layers > 4) &&
+ if (cfg->ss_number_layers * cfg->ts_number_layers > 3 &&
cfg->g_error_resilient == 0)
- ERROR("Multiple frame context are not supported for more than 3 spatial "
- "layers or more than 4 spatial x temporal layers");
+ ERROR("Multiple frame context are not supported for more than 3 layers");
}
#endif