samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "video: driver: add frame_skip mode control setting for heic"

Browse Source
This commit is contained in:
qctecmdr
2021-05-10 18:11:09 -07:00
committed by Gerrit - the friendly Code Review server
parent 2e2fbdb7e5 0995dfc215
commit 4837c16676
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
driver/platform/waipio/src/msm_vidc_waipio.c
View File

@@ -377,7 +377,7 @@ static struct msm_platform_inst_capability instance_data_waipio[] = {
1, V4L2_MPEG_MSM_VIDC_DISABLE, 1, V4L2_MPEG_MSM_VIDC_DISABLE,
V4L2_CID_MPEG_VIDEO_HEVC_LOSSLESS_CU}, V4L2_CID_MPEG_VIDEO_HEVC_LOSSLESS_CU},
{FRAME_SKIP_MODE, ENC, H264|HEVC, {FRAME_SKIP_MODE, ENC, H264|HEVC|HEIC,
V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_DISABLED, V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_DISABLED,
V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_BUF_LIMIT, V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_BUF_LIMIT,
BIT(V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_DISABLED) | BIT(V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_DISABLED) |

8
driver/vidc/src/msm_vidc_driver.c
View File

@@ -4756,6 +4756,14 @@ static bool msm_vidc_allow_image_encode_session(struct msm_vidc_inst *inst)
goto exit; goto exit;
} }
/* is frame skip mode disabled */
allow = !capability->cap[FRAME_SKIP_MODE].value;
if (!allow) {
i_vpr_e(inst, "%s: frame skip mode not disabled: %#x\n", __func__,
capability->cap[FRAME_SKIP_MODE].value);
goto exit;
}
/* is profile type Still Pic */ /* is profile type Still Pic */
if (is_10bit_colorformat(pix_fmt)) if (is_10bit_colorformat(pix_fmt))
allow = profile == V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN_10_STILL_PICTURE; allow = profile == V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN_10_STILL_PICTURE;