samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

video: driver: Deprecate private ctrls and use upstream ctrls

Просмотр исходного кода 
Remove private ctrl definitions, and use upstream ctrls
in source code.

Change-Id: Ib12cae5b78be69936bf0f97ca09483f5baa60350
Signed-off-by: Akshata Sahukar <asahukar@codeaurora.org>
Этот коммит содержится в:
Akshata Sahukar
2021-04-05 19:44:06 -07:00
родитель d77900d9ab
Коммит 7c612dd033
5 изменённых файлов: 19 добавлений и 14 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

12
driver/platform/waipio/src/msm_vidc_waipio.c
Просмотреть файл

@@ -444,7 +444,7 @@ static struct msm_platform_inst_capability instance_data_waipio[] = {
{LTR_COUNT, ENC, H264|HEVC,
0, 2, 1, 0,
V4L2_CID_MPEG_VIDC_LTRCOUNT,
V4L2_CID_MPEG_VIDEO_LTR_COUNT,
HFI_PROP_LTR_COUNT,
CAP_FLAG_OUTPUT_PORT,
{BITRATE_MODE}, {USE_LTR, MARK_LTR},
@@ -452,7 +452,7 @@ static struct msm_platform_inst_capability instance_data_waipio[] = {
{USE_LTR, ENC, H264|HEVC,
0, ((1 << MAX_LTR_FRAME_COUNT) - 1), 1, 0,
V4L2_CID_MPEG_VIDC_USELTRFRAME,
V4L2_CID_MPEG_VIDEO_USE_LTR_FRAMES,
HFI_PROP_LTR_USE,
CAP_FLAG_INPUT_PORT | CAP_FLAG_DYNAMIC_ALLOWED,
{LTR_COUNT}, {0},
@@ -460,7 +460,7 @@ static struct msm_platform_inst_capability instance_data_waipio[] = {
{MARK_LTR, ENC, H264|HEVC,
0, (MAX_LTR_FRAME_COUNT - 1), 1, 0,
V4L2_CID_MPEG_VIDC_MARKLTRFRAME,
V4L2_CID_MPEG_VIDEO_FRAME_LTR_INDEX,
HFI_PROP_LTR_MARK,
CAP_FLAG_INPUT_PORT | CAP_FLAG_DYNAMIC_ALLOWED,
{LTR_COUNT}, {0},
@@ -484,7 +484,7 @@ static struct msm_platform_inst_capability instance_data_waipio[] = {
V4L2_MPEG_MSM_VIDC_DISABLE,
V4L2_MPEG_MSM_VIDC_ENABLE,
1, V4L2_MPEG_MSM_VIDC_DISABLE,
V4L2_CID_MPEG_VIDC_AU_DELIMITER,
V4L2_CID_MPEG_VIDEO_AU_DELIMITER,
HFI_PROP_AUD,
CAP_FLAG_ROOT | CAP_FLAG_OUTPUT_PORT,
{0}, {0},
@@ -1068,13 +1068,13 @@ static struct msm_platform_inst_capability instance_data_waipio[] = {
{DISPLAY_DELAY_ENABLE, DEC, H264|HEVC|VP9,
V4L2_MPEG_MSM_VIDC_DISABLE, V4L2_MPEG_MSM_VIDC_ENABLE,
1, V4L2_MPEG_MSM_VIDC_DISABLE,
V4L2_CID_MPEG_MFC51_VIDEO_DECODER_H264_DISPLAY_DELAY_ENABLE,
V4L2_CID_MPEG_VIDEO_DEC_DISPLAY_DELAY_ENABLE,
HFI_PROP_DECODE_ORDER_OUTPUT,
CAP_FLAG_ROOT | CAP_FLAG_INPUT_PORT},
{DISPLAY_DELAY, DEC, H264|HEVC|VP9,
0, 1, 1, 0,
V4L2_CID_MPEG_MFC51_VIDEO_DECODER_H264_DISPLAY_DELAY,
V4L2_CID_MPEG_VIDEO_DEC_DISPLAY_DELAY,
HFI_PROP_DECODE_ORDER_OUTPUT,
CAP_FLAG_ROOT | CAP_FLAG_INPUT_PORT},

2
driver/vidc/src/msm_venc.c
Просмотреть файл

@@ -139,7 +139,7 @@ static int msm_venc_set_stride_scanline(struct msm_vidc_inst *inst,
color_format = inst->capabilities->cap[PIX_FMTS].value;
if (!is_linear_colorformat(color_format)) {
i_vpr_e(inst,
i_vpr_h(inst,
"%s: not a linear color fmt, property is not set\n",
__func__);
return 0;

10
driver/vidc/src/msm_vidc_control.c
Просмотреть файл

@@ -34,6 +34,16 @@ static bool is_priv_ctrl(u32 id)
* make this as private ctrl for time being
*/
case V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_TYPE:
/*
* TODO: treat below std ctrls as private ctrls until
* all below ctrls are available in upstream
*/
case V4L2_CID_MPEG_VIDEO_AU_DELIMITER:
case V4L2_CID_MPEG_VIDEO_LTR_COUNT:
case V4L2_CID_MPEG_VIDEO_FRAME_LTR_INDEX:
case V4L2_CID_MPEG_VIDEO_USE_LTR_FRAMES:
case V4L2_CID_MPEG_VIDEO_DEC_DISPLAY_DELAY:
case V4L2_CID_MPEG_VIDEO_DEC_DISPLAY_DELAY_ENABLE:
private = true;
break;
default:

4
driver/vidc/src/msm_vidc_driver.c
Просмотреть файл

@@ -1117,8 +1117,8 @@ bool msm_vidc_allow_s_ctrl(struct msm_vidc_inst *inst, u32 id)
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_VIDEO_USE_LTR_FRAMES:
case V4L2_CID_MPEG_VIDEO_FRAME_LTR_INDEX:
case V4L2_CID_MPEG_VIDC_VIDEO_BLUR_TYPES:
case V4L2_CID_MPEG_VIDC_VIDEO_BLUR_RESOLUTION:
case V4L2_CID_MPEG_VIDEO_CONSTANT_QUALITY:

5
include/uapi/vidc/media/v4l2_vidc_extensions.h
Просмотреть файл

@@ -57,13 +57,8 @@
#define V4L2_CID_MPEG_VIDC_LOWLATENCY_REQUEST (V4L2_CID_MPEG_VIDC_BASE + 0x3)
/* FIXme: */
#define V4L2_CID_MPEG_VIDC_CODEC_CONFIG (V4L2_CID_MPEG_VIDC_BASE + 0x4)
/* LTR controls */
#define V4L2_CID_MPEG_VIDC_LTRCOUNT (V4L2_CID_MPEG_VIDC_BASE + 0x7)
#define V4L2_CID_MPEG_VIDC_USELTRFRAME (V4L2_CID_MPEG_VIDC_BASE + 0x8)
#define V4L2_CID_MPEG_VIDC_MARKLTRFRAME (V4L2_CID_MPEG_VIDC_BASE + 0x9)
/* Encoder Intra refresh period */
#define V4L2_CID_MPEG_VIDC_INTRA_REFRESH_PERIOD (V4L2_CID_MPEG_VIDC_BASE + 0xB)
#define V4L2_CID_MPEG_VIDC_AU_DELIMITER (V4L2_CID_MPEG_VIDC_BASE + 0xC)
#define V4L2_CID_MPEG_VIDC_TIME_DELTA_BASED_RC (V4L2_CID_MPEG_VIDC_BASE + 0xD)
/* Encoder quality controls */
#define V4L2_CID_MPEG_VIDC_CONTENT_ADAPTIVE_CODING \