Merge "video: driver: encoder delay start: CSC"
This commit is contained in:

committed by
Gerrit - the friendly Code Review server

commit
c0d457f55a
@@ -852,7 +852,7 @@ static struct msm_platform_inst_capability instance_cap_data_pineapple[] = {
|
||||
|
||||
{CSC, ENC, CODECS_ALL,
|
||||
0, 1, 1, 0,
|
||||
0,
|
||||
V4L2_CID_MPEG_VIDC_CSC,
|
||||
HFI_PROP_CSC},
|
||||
|
||||
{CSC_CUSTOM_MATRIX, ENC, CODECS_ALL,
|
||||
@@ -2024,15 +2024,15 @@ static struct msm_platform_inst_cap_dependency instance_cap_dependency_data_pine
|
||||
*/
|
||||
|
||||
{PIX_FMTS, ENC, H264,
|
||||
{META_ROI_INFO, IR_PERIOD}},
|
||||
{META_ROI_INFO, IR_PERIOD, CSC}},
|
||||
|
||||
{PIX_FMTS, ENC, HEVC,
|
||||
{PROFILE, MIN_FRAME_QP, MAX_FRAME_QP, I_FRAME_QP, P_FRAME_QP,
|
||||
B_FRAME_QP, META_ROI_INFO, MIN_QUALITY, BLUR_TYPES, IR_PERIOD,
|
||||
LTR_COUNT}},
|
||||
LTR_COUNT, CSC}},
|
||||
|
||||
{PIX_FMTS, ENC, HEIC,
|
||||
{PROFILE}},
|
||||
{PROFILE, CSC}},
|
||||
|
||||
{PIX_FMTS, DEC, HEVC|HEIC,
|
||||
{PROFILE}},
|
||||
@@ -2183,6 +2183,11 @@ static struct msm_platform_inst_cap_dependency instance_cap_dependency_data_pine
|
||||
msm_vidc_adjust_blur_resolution,
|
||||
msm_vidc_set_blur_resolution},
|
||||
|
||||
{CSC, ENC, CODECS_ALL,
|
||||
{0},
|
||||
msm_vidc_adjust_csc,
|
||||
msm_vidc_set_u32},
|
||||
|
||||
{CSC_CUSTOM_MATRIX, ENC, CODECS_ALL,
|
||||
{0},
|
||||
NULL,
|
||||
|
Reference in New Issue
Block a user