From 2396497b08b264e80a4f18f54eba4b4ffe849d60 Mon Sep 17 00:00:00 2001
From: Wu-Cheng Li <wuchengli@chromium.org>
Date: Thu, 26 Mar 2015 17:51:14 +0800
Subject: [PATCH] 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 | 1 -
libv4l-rockchip/libvpu/vp8_enc/vp8init.c | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
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 @@ int32_t VP8_EncAsicMemAlloc_V2(asicData_s* asic, uint32_t width, uint32_t height
ASSERT(asic != NULL);
ASSERT(width != 0);
ASSERT(height != 0);
- ASSERT((height % 2) == 0);
ASSERT((width % 4) == 0);
regs = &asic->regs;
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 @@ bool_e VP8CheckCfg(const VP8EncConfig* pEncCfg) {
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 */
--
GitLab