summaryrefslogtreecommitdiff
path: root/vp9/vp9_cx_iface.c
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@google.com>2013-02-06 15:30:21 -0800
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2013-02-12 10:33:34 -0800
commitf496f601fb2e48390c822f89df60c6b2398026ab (patch)
treeb186833c71ad1a6b741a567894ea5be2d5ddb35c /vp9/vp9_cx_iface.c
parentcb00be1fa20c1a3955d62c1939646f4fd5d31224 (diff)
downloadlibvpx-f496f601fb2e48390c822f89df60c6b2398026ab.tar
libvpx-f496f601fb2e48390c822f89df60c6b2398026ab.tar.gz
libvpx-f496f601fb2e48390c822f89df60c6b2398026ab.tar.bz2
libvpx-f496f601fb2e48390c822f89df60c6b2398026ab.zip
Add tile column size limits (256 pixels min, 4096 pixels max).
This is after discussion with the hardware team. Update the unit test to take these sizes into account. Split out some duplicate code into a separate file so it can be shared. Change-Id: I8311d11b0191d8bb37e8eb4ac962beb217e1bff5
Diffstat (limited to 'vp9/vp9_cx_iface.c')
-rw-r--r--vp9/vp9_cx_iface.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/vp9/vp9_cx_iface.c b/vp9/vp9_cx_iface.c
index 0b8677285..80320c44a 100644
--- a/vp9/vp9_cx_iface.c
+++ b/vp9/vp9_cx_iface.c
@@ -54,7 +54,7 @@ static const struct extraconfig_map extracfg_map[] = {
0, /* noise_sensitivity */
0, /* Sharpness */
0, /* static_thresh */
- VP8_ONE_TILE_COLUMN, /* tile_columns */
+ 0, /* tile_columns */
0, /* arnr_max_frames */
3, /* arnr_strength */
3, /* arnr_type*/
@@ -171,8 +171,7 @@ static vpx_codec_err_t validate_config(vpx_codec_alg_priv_t *ctx,
RANGE_CHECK_HI(vp8_cfg, noise_sensitivity, 6);
- RANGE_CHECK(vp8_cfg, tile_columns,
- VP8_ONE_TILE_COLUMN, VP8_FOUR_TILE_COLUMNS);
+ RANGE_CHECK(vp8_cfg, tile_columns, 0, 6);
RANGE_CHECK_HI(vp8_cfg, Sharpness, 7);
RANGE_CHECK(vp8_cfg, arnr_max_frames, 0, 15);
RANGE_CHECK_HI(vp8_cfg, arnr_strength, 6);