On 2/16/22 18:20, Nicolas Dufresne wrote:
> Le lundi 17 janvier 2022 à 17:55 +0200, Stanimir Varbanov a écrit :
>> This adds QC10C compressed pixel format in the Venus driver, and
>> make it possible to discover from v4l2 clients.
>>
>> Note: The QC10C format shouldn't be possible to discpver by the
>
> discpver -> discover
>
> It is not super clear though, did you mean to say that it won't be enumerated
> after the header have been parsed ?
The opposite. It will be enumerable by the client only after parsing the
header.
>
>> client if the decoded bitstream is not 10-bits.
>>
>> Signed-off-by: Stanimir Varbanov <stanimir.varbanov@xxxxxxxxxx>
>> ---
>> drivers/media/platform/qcom/venus/helpers.c | 26 ++++-----------------
>> drivers/media/platform/qcom/venus/vdec.c | 19 ++++++++++++---
>> 2 files changed, 20 insertions(+), 25 deletions(-)
>>
>> diff --git a/drivers/media/platform/qcom/venus/helpers.c b/drivers/media/platform/qcom/venus/helpers.c
>> index adbfa4fbe139..69a9a9471a27 100644
>> --- a/drivers/media/platform/qcom/venus/helpers.c
>> +++ b/drivers/media/platform/qcom/venus/helpers.c
>> @@ -594,6 +594,8 @@ static u32 to_hfi_raw_fmt(u32 v4l2_fmt)
>> return HFI_COLOR_FORMAT_NV21;
>> case V4L2_PIX_FMT_QC08C:
>> return HFI_COLOR_FORMAT_NV12_UBWC;
>> + case V4L2_PIX_FMT_QC10C:
>> + return HFI_COLOR_FORMAT_YUV420_TP10_UBWC;
>> default:
>> break;
>> }
>> @@ -1176,7 +1178,8 @@ int venus_helper_set_format_constraints(struct venus_inst *inst)
>> if (!IS_V6(inst->core))
>> return 0;
>>
>> - if (inst->opb_fmt == HFI_COLOR_FORMAT_NV12_UBWC)
>> + if (inst->opb_fmt == HFI_COLOR_FORMAT_NV12_UBWC ||
>> + inst->opb_fmt == HFI_COLOR_FORMAT_YUV420_TP10_UBWC)
>> return 0;
>>
>> pconstraint.buffer_type = HFI_BUFFER_OUTPUT2;
>> @@ -1747,27 +1750,6 @@ int venus_helper_get_out_fmts(struct venus_inst *inst, u32 v4l2_fmt,
>> if (!caps)
>> return -EINVAL;
>>
>> - if (inst->bit_depth == VIDC_BITDEPTH_10 &&
>> - inst->session_type == VIDC_SESSION_TYPE_DEC) {
>> - found_ubwc =
>> - find_fmt_from_caps(caps, HFI_BUFFER_OUTPUT,
>> - HFI_COLOR_FORMAT_YUV420_TP10_UBWC);
>> - found = find_fmt_from_caps(caps, HFI_BUFFER_OUTPUT2,
>> - HFI_COLOR_FORMAT_NV12);
>> - if (found_ubwc && found) {
>> - /*
>> - * Hard-code DPB buffers to be 10bit UBWC and decoder
>> - * output buffers in 8bit NV12 until V4L2 is able to
>> - * expose compressed/tiled formats to applications.
>> - */
>> - *out_fmt = HFI_COLOR_FORMAT_YUV420_TP10_UBWC;
>> - *out2_fmt = HFI_COLOR_FORMAT_NV12;
>> - return 0;
>> - }
>> -
>> - return -EINVAL;
>> - }
>> -
>> if (ubwc) {
>> ubwc_fmt = fmt | HFI_COLOR_FORMAT_UBWC_BASE;
>> found_ubwc = find_fmt_from_caps(caps, HFI_BUFFER_OUTPUT,
>> diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c
>> index eb02e45a512b..c8261c6cb0fb 100644
>> --- a/drivers/media/platform/qcom/venus/vdec.c
>> +++ b/drivers/media/platform/qcom/venus/vdec.c
>> @@ -35,6 +35,10 @@ static const struct venus_format vdec_formats[] = {
>> .num_planes = 1,
>> .type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE,
>> }, {
>> + .pixfmt = V4L2_PIX_FMT_QC10C,
>> + .num_planes = 1,
>> + .type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE,
>> + },{
>> .pixfmt = V4L2_PIX_FMT_NV12,
>> .num_planes = 1,
>> .type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE,
>> @@ -114,6 +118,10 @@ find_format(struct venus_inst *inst, u32 pixfmt, u32 type)
>> !venus_helper_check_format(inst, fmt[i].pixfmt))
>> return NULL;
>>
>> + if (V4L2_TYPE_IS_CAPTURE(type) && fmt[i].pixfmt == V4L2_PIX_FMT_QC10C &&
>> + !(inst->bit_depth == VIDC_BITDEPTH_10))
>> + return NULL;
>> +
>> return &fmt[i];
>> }
>>
>> @@ -133,11 +141,16 @@ find_format_by_index(struct venus_inst *inst, unsigned int index, u32 type)
>> if (fmt[i].type != type)
>> continue;
>>
>> - if (V4L2_TYPE_IS_OUTPUT(type))
>> + if (V4L2_TYPE_IS_OUTPUT(type)) {
>> valid = venus_helper_check_codec(inst, fmt[i].pixfmt);
>> - else if (V4L2_TYPE_IS_CAPTURE(type))
>> + } else if (V4L2_TYPE_IS_CAPTURE(type)) {
>> valid = venus_helper_check_format(inst, fmt[i].pixfmt);
>>
>> + if (fmt[i].pixfmt == V4L2_PIX_FMT_QC10C &&
>> + !(inst->bit_depth == VIDC_BITDEPTH_10))
>> + valid = false;
>> + }
>> +
>> if (k == index && valid)
>> break;
>> if (valid)
>> @@ -1537,7 +1550,7 @@ static const struct hfi_inst_ops vdec_hfi_ops = {
>> static void vdec_inst_init(struct venus_inst *inst)
>> {
>> inst->hfi_codec = HFI_VIDEO_CODEC_H264;
>> - inst->fmt_out = &vdec_formats[7];
>> + inst->fmt_out = &vdec_formats[8];
>> inst->fmt_cap = &vdec_formats[0];
>> inst->width = frame_width_min(inst);
>> inst->height = ALIGN(frame_height_min(inst), 32);
>
--
regards,
Stan
