From 2d817d30340f736c8be2838cd3723acf84fa2b74 Mon Sep 17 00:00:00 2001 From: Jeffy Chen <jeffy.chen@rock-chips.com> Date: Thu, 18 Jun 2015 03:55:48 +0800 Subject: [PATCH] Rockchip: remove frame hdr align Seems frame hdr buf doesn't need to be 8 bytes aligned, so remove the align. BUG=None TEST=screen share through Hangouts Change-Id: Ie765026274e4fcf6bd41d50ab654d71190e48dbf Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> Reviewed-on: https://chromium-review.googlesource.com/280314 Reviewed-by: Tomasz Figa <tfiga@chromium.org> --- libv4l-rockchip/libvpu/vp8_enc/encasiccontroller.h | 3 +-- libv4l-rockchip/libvpu/vp8_enc/encasiccontroller_v2.c | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/libv4l-rockchip/libvpu/vp8_enc/encasiccontroller.h b/libv4l-rockchip/libvpu/vp8_enc/encasiccontroller.h index 4bb7d3b..af2020a 100644 --- a/libv4l-rockchip/libvpu/vp8_enc/encasiccontroller.h +++ b/libv4l-rockchip/libvpu/vp8_enc/encasiccontroller.h @@ -249,9 +249,8 @@ typedef struct VPUMemLinear_t segmentMap; uint32_t sizeTblSize; uint32_t traceRecon; - uint8_t hdr[FRAME_HEADER_SIZE + 8]; + uint8_t frmhdr[FRAME_HEADER_SIZE]; uint32_t frmHdrBufLen; - uint8_t *frmhdr; } asicData_s; int32_t VP8_EncAsicControllerInit(asicData_s* asic); diff --git a/libv4l-rockchip/libvpu/vp8_enc/encasiccontroller_v2.c b/libv4l-rockchip/libvpu/vp8_enc/encasiccontroller_v2.c index 74468ee..c4b002d 100644 --- a/libv4l-rockchip/libvpu/vp8_enc/encasiccontroller_v2.c +++ b/libv4l-rockchip/libvpu/vp8_enc/encasiccontroller_v2.c @@ -65,9 +65,6 @@ int32_t VP8_EncAsicMemAlloc_V2(asicData_s* asic, uint32_t width, uint32_t height memset(asic->segmentMap.vir_addr, 0, asic->segmentMap.size); - /* aligned to 8 bytes. we use unsigned long here for ILP32 and LP64 */ - asic->frmhdr = (uint8_t*)ALIGN((unsigned long)asic->hdr, 8); - asic->frmHdrBufLen = FRAME_HEADER_SIZE; return ENCHW_OK; -- GitLab