Skip to content

qcom: vidc: default decoder output to linear NV12 #600

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nascs wants to merge 1 commit into
base: Ubuntu-qcom-6.8.0-1066.67
Choose a base branch
from
Open

qcom: vidc: default decoder output to linear NV12 #600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions ubuntu/qcom/video/platform/sa8775p/src/msm_vidc_sa8775p.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,19 +313,32 @@ static struct msm_platform_inst_capability instance_cap_data_sa8775p[] = {

{SECURE_FRAME_HEIGHT, ENC, HEVC, 96, 4096, 1, 1080},

{PIX_FMTS, ENC | DEC, H264,
{PIX_FMTS, ENC, H264,
MSM_VIDC_FMT_NV12,
MSM_VIDC_FMT_NV12C,
MSM_VIDC_FMT_NV12 | MSM_VIDC_FMT_NV21 | MSM_VIDC_FMT_NV12C,
MSM_VIDC_FMT_NV12C},

{PIX_FMTS, ENC | DEC, HEVC | AV1,
{PIX_FMTS, DEC, H264,
MSM_VIDC_FMT_NV12,
MSM_VIDC_FMT_NV12C,
MSM_VIDC_FMT_NV12 | MSM_VIDC_FMT_NV21 | MSM_VIDC_FMT_NV12C,
MSM_VIDC_FMT_NV12},

{PIX_FMTS, ENC, HEVC | AV1,
MSM_VIDC_FMT_NV12,
MSM_VIDC_FMT_TP10C,
MSM_VIDC_FMT_NV12 | MSM_VIDC_FMT_NV21 | MSM_VIDC_FMT_NV12C |
MSM_VIDC_FMT_P010 | MSM_VIDC_FMT_TP10C,
MSM_VIDC_FMT_NV12C},

{PIX_FMTS, DEC, HEVC | AV1,
MSM_VIDC_FMT_NV12,
MSM_VIDC_FMT_TP10C,
MSM_VIDC_FMT_NV12 | MSM_VIDC_FMT_NV21 | MSM_VIDC_FMT_NV12C |
MSM_VIDC_FMT_P010 | MSM_VIDC_FMT_TP10C,
MSM_VIDC_FMT_NV12},

{PIX_FMTS, ENC, HEIC,
MSM_VIDC_FMT_NV12,
MSM_VIDC_FMT_P010,
Expand All @@ -337,14 +350,14 @@ static struct msm_platform_inst_capability instance_cap_data_sa8775p[] = {
MSM_VIDC_FMT_TP10C,
MSM_VIDC_FMT_NV12 | MSM_VIDC_FMT_NV21 | MSM_VIDC_FMT_NV12C |
MSM_VIDC_FMT_P010 | MSM_VIDC_FMT_TP10C,
MSM_VIDC_FMT_NV12C},
MSM_VIDC_FMT_NV12},

{PIX_FMTS, DEC, VP9,
MSM_VIDC_FMT_NV12,
MSM_VIDC_FMT_TP10C,
MSM_VIDC_FMT_NV12 | MSM_VIDC_FMT_NV21 | MSM_VIDC_FMT_NV12C |
MSM_VIDC_FMT_P010 | MSM_VIDC_FMT_TP10C,
MSM_VIDC_FMT_NV12C},
MSM_VIDC_FMT_NV12},

{MIN_BUFFERS_INPUT, ENC | DEC, CODECS_ALL, 0, 64, 1, 4,
V4L2_CID_MIN_BUFFERS_FOR_OUTPUT,
Expand Down
2 changes: 1 addition & 1 deletion ubuntu/qcom/video/vidc/src/msm_vdec.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2622,7 +2622,7 @@ int msm_vdec_inst_init(struct msm_vidc_inst *inst)
f = &inst->fmts[OUTPUT_PORT];
f->type = OUTPUT_MPLANE;
f->fmt.pix_mp.pixelformat =
v4l2_colorformat_from_driver(inst, MSM_VIDC_FMT_NV12C, __func__);
v4l2_colorformat_from_driver(inst, MSM_VIDC_FMT_NV12, __func__);
colorformat = v4l2_colorformat_to_driver(inst,
f->fmt.pix_mp.pixelformat, __func__);
f->fmt.pix_mp.width = video_y_stride_pix(colorformat, DEFAULT_WIDTH);
Expand Down