shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 21:07:02 +09:00
Code Issues Packages Projects Releases Wiki Activity

H264_encoder: add case of ge2d for bgr [2/2]

Browse Source 
PD#SWPL-1977

Problem:
Hardware coding does not support bgr

Solution:
Convert bgr to rgb using ge2d

Verify:
local

Change-Id: I9e246a0ae99a35c36fb92bb9c17ea63726bb5d28
Signed-off-by: Renjiang Han <renjiang.han@amlogic.com>
This commit is contained in:
Renjiang Han
2018-10-19 18:50:44 +08:00
committed by Dongjin Kim
parent f5ac21ece5
commit 0ceb223ea4
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/amlogic/media_modules/frame_sink/encoder/h264/encoder.c
View File

@@ -1059,6 +1059,9 @@ static int scale_frame(struct encode_wq_s *wq,
|| (request->fmt == FMT_NV12)) {
src_canvas = src_addr & 0xffff;
input_format = GE2D_FORMAT_M24_NV21;
} else if (request->fmt == FMT_BGR888) {
src_canvas = src_addr & 0xffffff;
input_format = GE2D_FORMAT_S24_RGB; //Opposite color after ge2d
} else {
src_canvas = src_addr & 0xffffff;
input_format = GE2D_FORMAT_M24_YUV420;
@@ -1082,6 +1085,16 @@ static int scale_frame(struct encode_wq_s *wq,
((ENC_CANVAS_OFFSET + 10) << 8)
| (ENC_CANVAS_OFFSET + 9);
input_format = GE2D_FORMAT_M24_NV21;
} else if (request->fmt == FMT_BGR888) {
src_canvas_w =
((request->src_w + 31) >> 5) << 5;
canvas_config(ENC_CANVAS_OFFSET + 9,
src_addr,
src_canvas_w * 3, src_h,
CANVAS_ADDR_NOWRAP,
CANVAS_BLKMODE_LINEAR);
src_canvas = ENC_CANVAS_OFFSET + 9;
input_format = GE2D_FORMAT_S24_RGB; //Opposite color after ge2d
} else {
src_canvas_w =
((request->src_w + 63) >> 6) << 6;
@@ -1169,6 +1182,7 @@ static int scale_frame(struct encode_wq_s *wq,
ge2d_config->dst_para.height = dst_h;
ge2d_config->dst_para.x_rev = 0;
ge2d_config->dst_para.y_rev = 0;
if (ge2d_context_config_ex(context, ge2d_config) < 0) {
pr_err("++ge2d configing error.\n");
return -1;

1
drivers/amlogic/media_modules/frame_sink/encoder/h264/encoder.h
View File

@@ -149,6 +149,7 @@ enum amvenc_frame_fmt_e {
FMT_YUV422_12BIT,
FMT_YUV444_10BIT,
FMT_YUV422_10BIT,
FMT_BGR888,
MAX_FRAME_FMT
};