A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-11 07:03:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "msm: vidc: Update enc scratch2 buffer size calc"

Browse source
This commit is contained in:
qctecmdr 2020-10-16 21:16:50 -07:00 • committed by Gerrit - the friendly Code Review server
commit 3e834c7a00
5 changed files with 64 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

20
msm/vidc/msm_venc.c
View file

@ -1139,26 +1139,6 @@ u32 v4l2_to_hfi_flip(struct msm_vidc_inst *inst)
return flip;
}
inline bool vidc_scalar_enabled(struct msm_vidc_inst *inst)
{
struct v4l2_format *f;
u32 output_height, output_width, input_height, input_width;
bool scalar_enable = false;
f = &inst->fmts[OUTPUT_PORT].v4l2_fmt;
output_height = f->fmt.pix_mp.height;
output_width = f->fmt.pix_mp.width;
f = &inst->fmts[INPUT_PORT].v4l2_fmt;
input_height = f->fmt.pix_mp.height;
input_width = f->fmt.pix_mp.width;
if (output_height != input_height || output_width != input_width)
scalar_enable = true;
return scalar_enable;
}
static int msm_venc_set_csc(struct msm_vidc_inst *inst,
u32 color_primaries, u32 custom_matrix);

53
msm/vidc/msm_vidc_buffer_calculations.c
View file

@ -319,7 +319,8 @@ static inline u32 calculate_vp8e_scratch1_size(struct msm_vidc_inst *inst,
u32 width, u32 height, u32 num_ref, bool ten_bit, u32 num_vpp_pipes);
static inline u32 calculate_enc_scratch2_size(struct msm_vidc_inst *inst,
u32 width, u32 height, u32 num_ref, bool ten_bit);
u32 width, u32 height, u32 num_ref, bool ten_bit, bool downscale,
u32 rotation_val, u32 flip);
static inline u32 calculate_enc_persist_size(void);
@ -516,9 +517,10 @@ int msm_vidc_get_encoder_internal_buffer_sizes(struct msm_vidc_inst *inst)
{
struct msm_vidc_enc_buff_size_calculators *enc_calculators;
u32 width, height, i, num_ref, num_vpp_pipes;
bool is_tenbit = false;
u32 rotation_val = 0, flip = 0;
bool is_tenbit = false, is_downscale = false;
int num_bframes;
struct v4l2_ctrl *bframe;
struct v4l2_ctrl *bframe, *rotation, *hflip, *vflip;
struct v4l2_format *f;
if (!inst || !inst->core || !inst->core->platform_data) {
@ -545,18 +547,30 @@ int msm_vidc_get_encoder_internal_buffer_sizes(struct msm_vidc_inst *inst)
return -EINVAL;
}
f = &inst->fmts[OUTPUT_PORT].v4l2_fmt;
width = f->fmt.pix_mp.width;
height = f->fmt.pix_mp.height;
bframe = get_ctrl(inst, V4L2_CID_MPEG_VIDEO_B_FRAMES);
num_bframes = bframe->val;
if (num_bframes < 0) {
s_vpr_e(inst->sid, "%s: get num bframe failed\n", __func__);
return -EINVAL;
}
f = &inst->fmts[OUTPUT_PORT].v4l2_fmt;
rotation = get_ctrl(inst, V4L2_CID_ROTATE);
rotation_val = rotation->val;
if (rotation_val == 90 || rotation_val == 270) {
/* Internal buffer size calculators are based on rotated w x h */
width = f->fmt.pix_mp.height;
height = f->fmt.pix_mp.width;
} else {
width = f->fmt.pix_mp.width;
height = f->fmt.pix_mp.height;
}
hflip = get_ctrl(inst, V4L2_CID_HFLIP);
vflip = get_ctrl(inst, V4L2_CID_VFLIP);
flip = hflip->val | vflip->val;
num_ref = msm_vidc_get_num_ref_frames(inst);
is_tenbit = (inst->bit_depth == MSM_VIDC_BIT_DEPTH_10);
is_downscale = vidc_scalar_enabled(inst);
for (i = 0; i < HAL_BUFFER_MAX; i++) {
struct hal_buffer_requirements *curr_req;
@ -582,7 +596,7 @@ int msm_vidc_get_encoder_internal_buffer_sizes(struct msm_vidc_inst *inst)
curr_req->buffer_size =
enc_calculators->calculate_scratch2_size(
inst, width, height, num_ref,
is_tenbit);
is_tenbit, is_downscale, rotation_val, flip);
valid_buffer_type = true;
} else if (curr_req->buffer_type ==
HAL_BUFFER_INTERNAL_PERSIST) {
@ -1792,8 +1806,8 @@ static inline u32 hfi_ubwc_uv_metadata_plane_bufheight(u32 height,
tile_height_pels), metadata_height_multi);
}
static inline u32 calculate_enc_scratch2_size(struct msm_vidc_inst *inst,
u32 width, u32 height, u32 num_ref, bool ten_bit)
static inline u32 hfi_iris2_enc_dpb_buffer_size(u32 width, u32 height,
bool ten_bit)
{
u32 aligned_width, aligned_height, chroma_height, ref_buf_height;
u32 luma_size, chroma_size;
@ -1818,7 +1832,6 @@ static inline u32 calculate_enc_scratch2_size(struct msm_vidc_inst *inst,
metadata_stride, meta_buf_height);
size = (aligned_height + chroma_height) * aligned_width +
meta_size_y + meta_size_c;
size = (size * (num_ref + 2)) + 4096;
} else {
ref_buf_height = (height + (HFI_VENUS_HEIGHT_ALIGNMENT - 1))
& (~(HFI_VENUS_HEIGHT_ALIGNMENT - 1));
@ -1851,7 +1864,25 @@ static inline u32 calculate_enc_scratch2_size(struct msm_vidc_inst *inst,
meta_size_c = hfi_ubwc_metadata_plane_buffer_size(
metadata_stride, meta_buf_height);
size = ref_buf_size + meta_size_y + meta_size_c;
size = (size * (num_ref + 2)) + 4096;
}
return size;
}
static inline u32 calculate_enc_scratch2_size(struct msm_vidc_inst *inst,
u32 width, u32 height, u32 num_ref, bool ten_bit, bool downscale,
u32 rotation_val, u32 flip)
{
u32 size;
size = hfi_iris2_enc_dpb_buffer_size(width, height, ten_bit);
size = size * (num_ref + 1) + 4096;
if (downscale && (rotation_val || flip)) {
/* VPSS output is always 128 x 32 (8-bit) or 192 x 16 (10-bit) aligned */
if (rotation_val == 90 || rotation_val == 270)
size += hfi_iris2_enc_dpb_buffer_size(height, width, ten_bit);
else
size += hfi_iris2_enc_dpb_buffer_size(width, height, ten_bit);
size += 4096;
}
return size;
}

3
msm/vidc/msm_vidc_buffer_calculations.h
View file

@ -26,7 +26,8 @@ struct msm_vidc_enc_buff_size_calculators {
u32 width, u32 height, u32 num_ref, bool ten_bit,
u32 num_vpp_pipes);
u32 (*calculate_scratch2_size)(struct msm_vidc_inst *inst,
u32 width, u32 height, u32 num_ref, bool ten_bit);
u32 width, u32 height, u32 num_ref, bool ten_bit, bool downscale,
u32 rotation_val, u32 flip);
u32 (*calculate_persist_size)(void);
};

19
msm/vidc/msm_vidc_common.c
View file

@ -662,6 +662,25 @@ enum multi_stream msm_comm_get_stream_output_mode(struct msm_vidc_inst *inst)
return HAL_VIDEO_DECODER_PRIMARY;
}
bool vidc_scalar_enabled(struct msm_vidc_inst *inst)
{
struct v4l2_format *f;
u32 output_height, output_width, input_height, input_width;
bool scalar_enable = false;
f = &inst->fmts[OUTPUT_PORT].v4l2_fmt;
output_height = f->fmt.pix_mp.height;
output_width = f->fmt.pix_mp.width;
f = &inst->fmts[INPUT_PORT].v4l2_fmt;
input_height = f->fmt.pix_mp.height;
input_width = f->fmt.pix_mp.width;
if (output_height != input_height || output_width != input_width)
scalar_enable = true;
return scalar_enable;
}
bool is_single_session(struct msm_vidc_inst *inst, u32 ignore_flags)
{
bool single = true;

1
msm/vidc/msm_vidc_common.h
View file

@ -266,6 +266,7 @@ static inline int msm_comm_s_ctrl(struct msm_vidc_inst *inst,
return v4l2_s_ctrl(NULL, &inst->ctrl_handler, ctrl);
}
bool vidc_scalar_enabled(struct msm_vidc_inst *inst);
bool is_single_session(struct msm_vidc_inst *inst, u32 ignore_flags);
bool is_batching_allowed(struct msm_vidc_inst *inst);
enum hal_buffer get_hal_buffer_type(unsigned int type,