samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
포크 0
코드 이슈 풀 리퀘스트 Actions Packages Projects 릴리즈 위키 활동

Merge "video: driver: Use upstream ctrls"

소스 검색
This commit is contained in:
qctecmdr
2021-03-26 19:39:14 -07:00
committed by Gerrit - the friendly Code Review server
부모 c04cf38091 47847faa11
커밋 ac3350d805
2개의 변경된 파일과 17개의 추가작업 그리고 13개의 파일을 삭제
Download Patch File Download Diff File Expand all files Collapse all files

22
driver/platform/waipio/src/msm_vidc_waipio.c
파일 보기

@@ -465,7 +465,7 @@ static struct msm_platform_inst_capability instance_data_waipio[] = {
{BASELAYER_PRIORITY, ENC, H264,
0, MAX_BASE_LAYER_PRIORITY_ID, 1, 0,
V4L2_CID_MPEG_VIDC_BASELAYER_PRIORITY,
V4L2_CID_MPEG_VIDEO_BASELAYER_PRIORITY_ID,
HFI_PROP_BASELAYER_PRIORITYID,
CAP_FLAG_ROOT | CAP_FLAG_OUTPUT_PORT},
@@ -567,7 +567,7 @@ static struct msm_platform_inst_capability instance_data_waipio[] = {
{I_FRAME_MIN_QP, ENC, HEVC|HEIC,
MIN_QP_10BIT, MAX_QP, 1, MIN_QP_10BIT,
V4L2_CID_MPEG_VIDC_HEVC_I_FRAME_MIN_QP},
V4L2_CID_MPEG_VIDEO_HEVC_I_FRAME_MIN_QP},
{P_FRAME_MIN_QP, ENC, H264,
MIN_QP_8BIT, MAX_QP, 1, MIN_QP_8BIT,
@@ -575,15 +575,15 @@ static struct msm_platform_inst_capability instance_data_waipio[] = {
{P_FRAME_MIN_QP, ENC, HEVC|HEIC,
MIN_QP_10BIT, MAX_QP, 1, MIN_QP_10BIT,
V4L2_CID_MPEG_VIDC_HEVC_P_FRAME_MIN_QP},
V4L2_CID_MPEG_VIDEO_HEVC_P_FRAME_MIN_QP},
{B_FRAME_MIN_QP, ENC, H264,
MIN_QP_8BIT, MAX_QP, 1, MIN_QP_8BIT,
V4L2_CID_MPEG_VIDC_B_FRAME_MIN_QP},
V4L2_CID_MPEG_VIDEO_H264_B_FRAME_MIN_QP},
{B_FRAME_MIN_QP, ENC, HEVC|HEIC,
MIN_QP_10BIT, MAX_QP, 1, MIN_QP_10BIT,
V4L2_CID_MPEG_VIDC_B_FRAME_MIN_QP},
V4L2_CID_MPEG_VIDEO_HEVC_B_FRAME_MIN_QP},
{MAX_FRAME_QP, ENC, H264,
MIN_QP_8BIT, MAX_QP, 1, MAX_QP,
@@ -607,7 +607,7 @@ static struct msm_platform_inst_capability instance_data_waipio[] = {
{I_FRAME_MAX_QP, ENC, HEVC|HEIC,
MIN_QP_10BIT, MAX_QP, 1, MAX_QP,
V4L2_CID_MPEG_VIDC_HEVC_I_FRAME_MAX_QP},
V4L2_CID_MPEG_VIDEO_HEVC_I_FRAME_MAX_QP},
{P_FRAME_MAX_QP, ENC, H264,
MIN_QP_8BIT, MAX_QP, 1, MAX_QP,
@@ -615,15 +615,15 @@ static struct msm_platform_inst_capability instance_data_waipio[] = {
{P_FRAME_MAX_QP, ENC, HEVC|HEIC,
MIN_QP_10BIT, MAX_QP, 1, MAX_QP,
V4L2_CID_MPEG_VIDC_HEVC_P_FRAME_MAX_QP},
V4L2_CID_MPEG_VIDEO_HEVC_P_FRAME_MAX_QP},
{B_FRAME_MAX_QP, ENC, H264,
MIN_QP_8BIT, MAX_QP, 1, MAX_QP,
V4L2_CID_MPEG_VIDC_B_FRAME_MAX_QP},
V4L2_CID_MPEG_VIDEO_H264_B_FRAME_MAX_QP},
{B_FRAME_MAX_QP, ENC, HEVC|HEIC,
MIN_QP_10BIT, MAX_QP, 1, MAX_QP,
V4L2_CID_MPEG_VIDC_B_FRAME_MAX_QP},
V4L2_CID_MPEG_VIDEO_HEVC_B_FRAME_MAX_QP},
{HEVC_HIER_QP, ENC, HEVC|HEIC,
V4L2_MPEG_MSM_VIDC_DISABLE, V4L2_MPEG_MSM_VIDC_ENABLE,
@@ -636,7 +636,7 @@ static struct msm_platform_inst_capability instance_data_waipio[] = {
MIN_QP_10BIT, MAX_QP, 1, DEFAULT_QP,
V4L2_CID_MPEG_VIDEO_HEVC_I_FRAME_QP,
HFI_PROP_QP_PACKED,
CAP_FLAG_OUTPUT_PORT,
CAP_FLAG_OUTPUT_PORT | CAP_FLAG_DYNAMIC_ALLOWED,
{PIX_FMTS, BITRATE_MODE}, {0},
msm_vidc_adjust_hevc_frame_qp, msm_vidc_set_frame_qp},
@@ -644,7 +644,7 @@ static struct msm_platform_inst_capability instance_data_waipio[] = {
MIN_QP_8BIT, MAX_QP, 1, DEFAULT_QP,
V4L2_CID_MPEG_VIDEO_H264_I_FRAME_QP,
HFI_PROP_QP_PACKED,
CAP_FLAG_OUTPUT_PORT,
CAP_FLAG_OUTPUT_PORT | CAP_FLAG_DYNAMIC_ALLOWED,
{BITRATE_MODE}, {0},
NULL, msm_vidc_set_frame_qp},

8
driver/vidc/src/msm_vidc_driver.c
파일 보기

@@ -1078,8 +1078,12 @@ bool msm_vidc_allow_s_ctrl(struct msm_vidc_inst *inst, u32 id)
case V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L3_BR:
case V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L4_BR:
case V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L5_BR:
case V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L6_BR:
case V4L2_CID_MPEG_VIDC_BASELAYER_PRIORITY:
case V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L0_BR:
case V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L1_BR:
case V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L2_BR:
case V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L3_BR:
case V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L4_BR:
case V4L2_CID_MPEG_VIDEO_H264_HIER_CODING_L5_BR:
case V4L2_CID_MPEG_VIDC_USELTRFRAME:
case V4L2_CID_MPEG_VIDC_MARKLTRFRAME:
case V4L2_CID_MPEG_VIDC_VIDEO_BLUR_TYPES: