Merge "video: driver: add heic 10bit image encoding support"

This commit is contained in:
qctecmdr
2021-03-23 16:37:34 -07:00
committad av Gerrit - the friendly Code Review server
förälder c07fa5dd60 c148cf0bb5
incheckning a1c98e0e2f
2 ändrade filer med 25 tillägg och 36 borttagningar

Visa fil

@@ -114,7 +114,7 @@ static struct msm_platform_inst_capability instance_data_waipio[] = {
MSM_VIDC_FMT_NV12 | MSM_VIDC_FMT_NV21 | MSM_VIDC_FMT_NV12C |
MSM_VIDC_FMT_RGBA8888 | MSM_VIDC_FMT_RGBA8888C,
MSM_VIDC_FMT_NV12C},
{PIX_FMTS, ENC, HEVC|HEIC,
{PIX_FMTS, ENC, HEVC,
MSM_VIDC_FMT_NV12,
MSM_VIDC_FMT_TP10C,
MSM_VIDC_FMT_NV12 | MSM_VIDC_FMT_NV21 | MSM_VIDC_FMT_NV12C |
@@ -1205,15 +1205,6 @@ static struct msm_platform_inst_capability instance_data_waipio[] = {
V4L2_CID_MIN_BUFFERS_FOR_CAPTURE,
HFI_PROP_BUFFER_FW_MIN_OUTPUT_COUNT,
CAP_FLAG_ROOT | CAP_FLAG_OUTPUT_PORT},
{PIX_FMTS, ENC, HEIC,
MSM_VIDC_FMT_NV12,
MSM_VIDC_FMT_P010,
MSM_VIDC_FMT_NV12 | MSM_VIDC_FMT_NV21 | MSM_VIDC_FMT_P010,
MSM_VIDC_FMT_NV12,
0, 0,
CAP_FLAG_ROOT,
{0},
{PROFILE}},
{MBPF, ENC, HEIC, 64, 262144, 262144}, /* ((8192x8192)/256) */
{MBPF, DEC, HEIC, 36, 1048576, 1, 1048576}, /* ((16384x16384)/256) */
{MBPS, ENC, HEIC, 64, 262144, 262144}, /* ((8192x8192)/256)@1fps */
@@ -1267,6 +1258,15 @@ static struct msm_platform_inst_capability instance_data_waipio[] = {
CAP_FLAG_ROOT | CAP_FLAG_OUTPUT_PORT,
{0}, {0},
NULL, msm_vidc_set_u32},
{PIX_FMTS, ENC, HEIC,
MSM_VIDC_FMT_NV12,
MSM_VIDC_FMT_P010,
MSM_VIDC_FMT_NV12 | MSM_VIDC_FMT_P010,
MSM_VIDC_FMT_NV12,
0, 0,
CAP_FLAG_ROOT,
{0},
{PROFILE}},
{PROFILE, ENC|DEC, HEIC,
V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN_STILL_PICTURE,
V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN_10,