samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

video: driver: add decoder bitstream size overwrite support

Browse Source 
add decoder bitsream size overwrite support

Change-Id: Id2968c3ac7d485109a47ff7a570a1c18d74dfe43
Signed-off-by: Darshana Patil <darshana@codeaurora.org>
This commit is contained in:
Darshana Patil
2021-01-14 14:34:22 -08:00
committed by Gerrit - the friendly Code Review server
parent 0910978cb0
commit 45d8a8c80e
5 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
driver/platform/waipio/src/msm_vidc_waipio.c
View File

@@ -945,6 +945,9 @@ static struct msm_platform_inst_capability instance_data_waipio[] = {
{CODEC_CONFIG, DEC, H264|HEVC, 0, 1, 1, 0, {CODEC_CONFIG, DEC, H264|HEVC, 0, 1, 1, 0,
V4L2_CID_MPEG_VIDC_CODEC_CONFIG}, V4L2_CID_MPEG_VIDC_CODEC_CONFIG},
{BITSTREAM_SIZE_OVERWRITE, DEC, CODECS_ALL, 0, INT_MAX, 1, 0,
V4L2_CID_MPEG_VIDC_MIN_BITSTREAM_SIZE_OVERWRITE},
{META_LTR_MARK_USE, ENC, CODECS_ALL, {META_LTR_MARK_USE, ENC, CODECS_ALL,
V4L2_MPEG_MSM_VIDC_DISABLE, V4L2_MPEG_MSM_VIDC_ENABLE, V4L2_MPEG_MSM_VIDC_DISABLE, V4L2_MPEG_MSM_VIDC_ENABLE,
1, V4L2_MPEG_MSM_VIDC_DISABLE, 1, V4L2_MPEG_MSM_VIDC_DISABLE,

1
driver/vidc/inc/msm_vidc_internal.h
View File

@@ -340,6 +340,7 @@ enum msm_vidc_inst_capability_type {
CODED_FRAMES, CODED_FRAMES,
BIT_DEPTH, BIT_DEPTH,
CODEC_CONFIG, CODEC_CONFIG,
BITSTREAM_SIZE_OVERWRITE,
META_LTR_MARK_USE, META_LTR_MARK_USE,
META_DPB_MISR, META_DPB_MISR,
META_OPB_MISR, META_OPB_MISR,

20
driver/vidc/src/msm_vidc_buffer.c
View File

@@ -169,13 +169,22 @@ u32 msm_vidc_decoder_input_size(struct msm_vidc_inst *inst)
u32 div_factor = 1; u32 div_factor = 1;
u32 base_res_mbs = NUM_MBS_4k; u32 base_res_mbs = NUM_MBS_4k;
struct v4l2_format *f; struct v4l2_format *f;
u32 buffer_size_limit = 0; // TODO: fix me u32 bitstream_size_overwrite = 0;
if (!inst || !inst->capabilities) { if (!inst || !inst->capabilities) {
d_vpr_e("%s: invalid params\n"); d_vpr_e("%s: invalid params\n");
return 0; return 0;
} }
bitstream_size_overwrite =
inst->capabilities->cap[BITSTREAM_SIZE_OVERWRITE].value;
if (bitstream_size_overwrite) {
frame_size = bitstream_size_overwrite;
s_vpr_h(inst->sid, "client configured bitstream buffer size %d\n",
frame_size);
return frame_size;
}
/* /*
* Decoder input size calculation: * Decoder input size calculation:
* For 8k resolution, buffer size is calculated as 8k mbs / 4 and * For 8k resolution, buffer size is calculated as 8k mbs / 4 and
@@ -214,14 +223,7 @@ u32 msm_vidc_decoder_input_size(struct msm_vidc_inst *inst)
f->fmt.pix_mp.pixelformat == V4L2_PIX_FMT_HEVC) f->fmt.pix_mp.pixelformat == V4L2_PIX_FMT_HEVC)
frame_size = frame_size + (frame_size >> 2); frame_size = frame_size + (frame_size >> 2);
if (buffer_size_limit && (buffer_size_limit < frame_size)) { s_vpr_h(inst->sid, "set input buffer size to %d\n", frame_size);
frame_size = buffer_size_limit;
s_vpr_h(inst->sid, "input buffer size limited to %d\n",
frame_size);
} else {
s_vpr_h(inst->sid, "set input buffer size to %d\n",
frame_size);
}
return ALIGN(frame_size, SZ_4K); return ALIGN(frame_size, SZ_4K);
} }

2
driver/vidc/src/msm_vidc_control.c
View File

@@ -169,6 +169,8 @@ static const char *msm_vidc_get_priv_ctrl_name(u32 sid, u32 control_id)
return "Timestamp Metadata"; return "Timestamp Metadata";
case V4L2_CID_MPEG_VIDC_METADATA_ENC_QP_METADATA: case V4L2_CID_MPEG_VIDC_METADATA_ENC_QP_METADATA:
return "Encoder QP Metadata"; return "Encoder QP Metadata";
case V4L2_CID_MPEG_VIDC_MIN_BITSTREAM_SIZE_OVERWRITE:
return "Bitstream Size Overwrite";
default: default:
s_vpr_e(sid, "%s: ctrl name not available for ctrl id %#x\n", s_vpr_e(sid, "%s: ctrl name not available for ctrl id %#x\n",
__func__, control_id); __func__, control_id);

2
include/uapi/vidc/media/v4l2_vidc_extensions.h
View File

@@ -103,6 +103,8 @@ enum v4l2_mpeg_vidc_blur_types {
(V4L2_CID_MPEG_VIDC_BASE + 0x21) (V4L2_CID_MPEG_VIDC_BASE + 0x21)
#define V4L2_CID_MPEG_VIDC_METADATA_ENC_QP_METADATA \ #define V4L2_CID_MPEG_VIDC_METADATA_ENC_QP_METADATA \
(V4L2_CID_MPEG_VIDC_BASE + 0x22) (V4L2_CID_MPEG_VIDC_BASE + 0x22)
#define V4L2_CID_MPEG_VIDC_MIN_BITSTREAM_SIZE_OVERWRITE \
(V4L2_CID_MPEG_VIDC_BASE + 0x23)
enum v4l2_mpeg_vidc_metapayload_header_flags { enum v4l2_mpeg_vidc_metapayload_header_flags {
METADATA_FLAGS_NONE = 0, METADATA_FLAGS_NONE = 0,