commit 2396497b08b264e80a4f18f54eba4b4ffe849d60
author Wu-Cheng Li <wuchengli@chromium.org> Thu Mar 26 09:51:14 2015
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Fri Mar 27 10:28:13 2015
tree 5f94291fadd9f2045514a62f5ac0e7da90229817
parent f6e383a6523772e70ee3e6f615872940652fc882

Rockchip: accept odd height of visible size.

WebRTC sends resolution like 240x135 when the network is bad.
The hardware can accept odd height, so remove the alignment check.

BUG=chrome-os-partner:38368
TEST=Run VEA test with 240x135 video. Run apprtc loopback.
http://apprtc.appspot.com/?debug=loopback&video=minWidth=240,
maxWidth=240,minHeight=135,maxHeight=135

Change-Id: I771961f8c405ce919d17fdd111bbcd632e51e6bc
Reviewed-on: https://chromium-review.googlesource.com/262543
Reviewed-by: Pawel Osciak <posciak@chromium.org>
Tested-by: Wu-cheng Li <wuchengli@chromium.org>
Commit-Queue: Wu-cheng Li <wuchengli@chromium.org>
Trybot-Ready: Wu-cheng Li <wuchengli@chromium.org>

libv4l-rockchip/libvpu/vp8_enc/encasiccontroller_v2.c

diff --git a/libv4l-rockchip/libvpu/vp8_enc/encasiccontroller_v2.c b/libv4l-rockchip/libvpu/vp8_enc/encasiccontroller_v2.c
index ebd1802..a5a090a 100644
--- a/libv4l-rockchip/libvpu/vp8_enc/encasiccontroller_v2.c
+++ b/libv4l-rockchip/libvpu/vp8_enc/encasiccontroller_v2.c
@@ -28,7 +28,6 @@
   ASSERT(asic != NULL);
   ASSERT(width != 0);
   ASSERT(height != 0);
-  ASSERT((height % 2) == 0);
   ASSERT((width % 4) == 0);
 
   regs = &asic->regs;

libv4l-rockchip/libvpu/vp8_enc/vp8init.c

diff --git a/libv4l-rockchip/libvpu/vp8_enc/vp8init.c b/libv4l-rockchip/libvpu/vp8_enc/vp8init.c
index f96a34e..a86a646 100644
--- a/libv4l-rockchip/libvpu/vp8_enc/vp8init.c
+++ b/libv4l-rockchip/libvpu/vp8_enc/vp8init.c
@@ -51,9 +51,9 @@
       pEncCfg->width > VP8ENC_MAX_ENC_WIDTH || (pEncCfg->width & 0x3) != 0)
     return ENCHW_NOK;
 
-  /* Encoded image height limits, multiple of 2 */
+  /* Encoded image height limits */
   if (pEncCfg->height < VP8ENC_MIN_ENC_HEIGHT ||
-      pEncCfg->height > VP8ENC_MAX_ENC_HEIGHT || (pEncCfg->height & 0x1) != 0)
+      pEncCfg->height > VP8ENC_MAX_ENC_HEIGHT)
     return ENCHW_NOK;
 
   /* total macroblocks per picture limit */