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

video: driver: redefine private v4l2 macros in common file

Browse Source 
Define vidc macros corresponding to private v4l2 macros
defined in v4l2_vidc_extensions.h file in msm_vidc_internal.h
and use the same wherever applicable for successful
compilation of upstream driver.

Change-Id: I2c7b3741d29996beb35b08b9c6dbd88876bb6ca6
Signed-off-by: Dikshita Agarwal <quic_dikshita@quicinc.com>
This commit is contained in:
Dikshita Agarwal
2022-08-01 17:02:09 +05:30
parent 704a316370
commit 7d1fbd07cf
9 changed files with 165 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
driver/platform/kalama/src/kalama.c
View File

@@ -572,9 +572,9 @@ static struct msm_platform_inst_capability instance_cap_data_kalama[] = {
CAP_FLAG_OUTPUT_PORT}, CAP_FLAG_OUTPUT_PORT},
{BLUR_TYPES, ENC, H264|HEVC, {BLUR_TYPES, ENC, H264|HEVC,
VIDC_BLUR_NONE, VIDC_BLUR_EXTERNAL, MSM_VIDC_BLUR_NONE, MSM_VIDC_BLUR_EXTERNAL,
BIT(VIDC_BLUR_NONE) | BIT(VIDC_BLUR_EXTERNAL), BIT(MSM_VIDC_BLUR_NONE) | BIT(MSM_VIDC_BLUR_EXTERNAL),
VIDC_BLUR_NONE, MSM_VIDC_BLUR_NONE,
0, 0,
HFI_PROP_BLUR_TYPES, HFI_PROP_BLUR_TYPES,
CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU}, CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU},

220
driver/platform/kalama/src/msm_vidc_kalama.c
View File

@@ -542,9 +542,9 @@ static struct msm_platform_inst_capability instance_cap_data_kalama[] = {
* to get fence_id in input metadata buffer done. * to get fence_id in input metadata buffer done.
*/ */
{META_OUTBUF_FENCE, DEC, H264|HEVC|VP9|AV1, {META_OUTBUF_FENCE, DEC, H264|HEVC|VP9|AV1,
V4L2_MPEG_VIDC_META_DISABLE, MSM_VIDC_META_DISABLE,
V4L2_MPEG_VIDC_META_ENABLE | V4L2_MPEG_VIDC_META_RX_INPUT, MSM_VIDC_META_ENABLE | MSM_VIDC_META_RX_INPUT,
0, V4L2_MPEG_VIDC_META_DISABLE, 0, MSM_VIDC_META_DISABLE,
V4L2_CID_MPEG_VIDC_METADATA_OUTBUF_FENCE, V4L2_CID_MPEG_VIDC_METADATA_OUTBUF_FENCE,
HFI_PROP_FENCE, HFI_PROP_FENCE,
CAP_FLAG_BITMASK}, CAP_FLAG_BITMASK},
@@ -760,9 +760,9 @@ static struct msm_platform_inst_capability instance_cap_data_kalama[] = {
CAP_FLAG_OUTPUT_PORT}, CAP_FLAG_OUTPUT_PORT},
{BLUR_TYPES, ENC, H264|HEVC, {BLUR_TYPES, ENC, H264|HEVC,
VIDC_BLUR_NONE, VIDC_BLUR_EXTERNAL, MSM_VIDC_BLUR_NONE, MSM_VIDC_BLUR_EXTERNAL,
BIT(VIDC_BLUR_NONE) | BIT(VIDC_BLUR_EXTERNAL), BIT(MSM_VIDC_BLUR_NONE) | BIT(MSM_VIDC_BLUR_EXTERNAL),
VIDC_BLUR_NONE, MSM_VIDC_BLUR_NONE,
V4L2_CID_MPEG_VIDC_VIDEO_BLUR_TYPES, V4L2_CID_MPEG_VIDC_VIDEO_BLUR_TYPES,
HFI_PROP_BLUR_TYPES, HFI_PROP_BLUR_TYPES,
CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU}, CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU},
@@ -1630,19 +1630,19 @@ static struct msm_platform_inst_capability instance_cap_data_kalama[] = {
V4L2_CID_MPEG_VIDC_LAST_FLAG_EVENT_ENABLE}, V4L2_CID_MPEG_VIDC_LAST_FLAG_EVENT_ENABLE},
{META_BITSTREAM_RESOLUTION, DEC, AV1, {META_BITSTREAM_RESOLUTION, DEC, AV1,
V4L2_MPEG_VIDC_META_DISABLE, MSM_VIDC_META_DISABLE,
V4L2_MPEG_VIDC_META_ENABLE | V4L2_MPEG_VIDC_META_RX_INPUT | MSM_VIDC_META_ENABLE | MSM_VIDC_META_RX_INPUT |
V4L2_MPEG_VIDC_META_RX_OUTPUT, MSM_VIDC_META_RX_OUTPUT,
0, V4L2_MPEG_VIDC_META_DISABLE, 0, MSM_VIDC_META_DISABLE,
V4L2_CID_MPEG_VIDC_METADATA_BITSTREAM_RESOLUTION, V4L2_CID_MPEG_VIDC_METADATA_BITSTREAM_RESOLUTION,
HFI_PROP_BITSTREAM_RESOLUTION, HFI_PROP_BITSTREAM_RESOLUTION,
CAP_FLAG_BITMASK}, CAP_FLAG_BITMASK},
{META_CROP_OFFSETS, DEC, AV1, {META_CROP_OFFSETS, DEC, AV1,
V4L2_MPEG_VIDC_META_DISABLE, MSM_VIDC_META_DISABLE,
V4L2_MPEG_VIDC_META_ENABLE | V4L2_MPEG_VIDC_META_RX_INPUT | MSM_VIDC_META_ENABLE | MSM_VIDC_META_RX_INPUT |
V4L2_MPEG_VIDC_META_RX_OUTPUT, MSM_VIDC_META_RX_OUTPUT,
0, V4L2_MPEG_VIDC_META_DISABLE, 0, MSM_VIDC_META_DISABLE,
V4L2_CID_MPEG_VIDC_METADATA_CROP_OFFSETS, V4L2_CID_MPEG_VIDC_METADATA_CROP_OFFSETS,
HFI_PROP_CROP_OFFSETS, HFI_PROP_CROP_OFFSETS,
CAP_FLAG_BITMASK}, CAP_FLAG_BITMASK},
@@ -1666,173 +1666,173 @@ static struct msm_platform_inst_capability instance_cap_data_kalama[] = {
CAP_FLAG_INPUT_PORT}, CAP_FLAG_INPUT_PORT},
{META_LTR_MARK_USE, ENC, H264|HEVC, {META_LTR_MARK_USE, ENC, H264|HEVC,
V4L2_MPEG_VIDC_META_DISABLE, MSM_VIDC_META_DISABLE,
V4L2_MPEG_VIDC_META_ENABLE | V4L2_MPEG_VIDC_META_RX_OUTPUT, MSM_VIDC_META_ENABLE | MSM_VIDC_META_RX_OUTPUT,
0, V4L2_MPEG_VIDC_META_DISABLE, 0, MSM_VIDC_META_DISABLE,
V4L2_CID_MPEG_VIDC_METADATA_LTR_MARK_USE_DETAILS, V4L2_CID_MPEG_VIDC_METADATA_LTR_MARK_USE_DETAILS,
HFI_PROP_LTR_MARK_USE_DETAILS, HFI_PROP_LTR_MARK_USE_DETAILS,
CAP_FLAG_BITMASK}, CAP_FLAG_BITMASK},
{META_SEQ_HDR_NAL, ENC, CODECS_ALL, {META_SEQ_HDR_NAL, ENC, CODECS_ALL,
V4L2_MPEG_VIDC_META_DISABLE, MSM_VIDC_META_DISABLE,
V4L2_MPEG_VIDC_META_ENABLE | V4L2_MPEG_VIDC_META_RX_OUTPUT, MSM_VIDC_META_ENABLE | MSM_VIDC_META_RX_OUTPUT,
0, V4L2_MPEG_VIDC_META_DISABLE, 0, MSM_VIDC_META_DISABLE,
V4L2_CID_MPEG_VIDC_METADATA_SEQ_HEADER_NAL, V4L2_CID_MPEG_VIDC_METADATA_SEQ_HEADER_NAL,
HFI_PROP_METADATA_SEQ_HEADER_NAL, HFI_PROP_METADATA_SEQ_HEADER_NAL,
CAP_FLAG_BITMASK}, CAP_FLAG_BITMASK},
{META_DPB_MISR, DEC, CODECS_ALL, {META_DPB_MISR, DEC, CODECS_ALL,
V4L2_MPEG_VIDC_META_DISABLE, MSM_VIDC_META_DISABLE,
V4L2_MPEG_VIDC_META_ENABLE | V4L2_MPEG_VIDC_META_RX_OUTPUT, MSM_VIDC_META_ENABLE | MSM_VIDC_META_RX_OUTPUT,
0, V4L2_MPEG_VIDC_META_DISABLE, 0, MSM_VIDC_META_DISABLE,
V4L2_CID_MPEG_VIDC_METADATA_DPB_LUMA_CHROMA_MISR, V4L2_CID_MPEG_VIDC_METADATA_DPB_LUMA_CHROMA_MISR,
HFI_PROP_DPB_LUMA_CHROMA_MISR, HFI_PROP_DPB_LUMA_CHROMA_MISR,
CAP_FLAG_BITMASK}, CAP_FLAG_BITMASK},
{META_OPB_MISR, DEC, CODECS_ALL, {META_OPB_MISR, DEC, CODECS_ALL,
V4L2_MPEG_VIDC_META_DISABLE, MSM_VIDC_META_DISABLE,
V4L2_MPEG_VIDC_META_ENABLE | V4L2_MPEG_VIDC_META_RX_OUTPUT, MSM_VIDC_META_ENABLE | MSM_VIDC_META_RX_OUTPUT,
0, V4L2_MPEG_VIDC_META_DISABLE, 0, MSM_VIDC_META_DISABLE,
V4L2_CID_MPEG_VIDC_METADATA_OPB_LUMA_CHROMA_MISR, V4L2_CID_MPEG_VIDC_METADATA_OPB_LUMA_CHROMA_MISR,
HFI_PROP_OPB_LUMA_CHROMA_MISR, HFI_PROP_OPB_LUMA_CHROMA_MISR,
CAP_FLAG_BITMASK}, CAP_FLAG_BITMASK},
{META_INTERLACE, DEC, H264, {META_INTERLACE, DEC, H264,
V4L2_MPEG_VIDC_META_DISABLE, MSM_VIDC_META_DISABLE,
V4L2_MPEG_VIDC_META_ENABLE | V4L2_MPEG_VIDC_META_RX_OUTPUT, MSM_VIDC_META_ENABLE | MSM_VIDC_META_RX_OUTPUT,
0, V4L2_MPEG_VIDC_META_DISABLE, 0, MSM_VIDC_META_DISABLE,
V4L2_CID_MPEG_VIDC_METADATA_INTERLACE, V4L2_CID_MPEG_VIDC_METADATA_INTERLACE,
HFI_PROP_INTERLACE_INFO, HFI_PROP_INTERLACE_INFO,
CAP_FLAG_BITMASK}, CAP_FLAG_BITMASK},
{META_TIMESTAMP, DEC | ENC, CODECS_ALL, {META_TIMESTAMP, DEC | ENC, CODECS_ALL,
V4L2_MPEG_VIDC_META_DISABLE, MSM_VIDC_META_DISABLE,
V4L2_MPEG_VIDC_META_ENABLE | V4L2_MPEG_VIDC_META_RX_OUTPUT, MSM_VIDC_META_ENABLE | MSM_VIDC_META_RX_OUTPUT,
0, V4L2_MPEG_VIDC_META_DISABLE, 0, MSM_VIDC_META_DISABLE,
V4L2_CID_MPEG_VIDC_METADATA_TIMESTAMP, V4L2_CID_MPEG_VIDC_METADATA_TIMESTAMP,
HFI_PROP_TIMESTAMP, HFI_PROP_TIMESTAMP,
CAP_FLAG_BITMASK}, CAP_FLAG_BITMASK},
{META_CONCEALED_MB_CNT, DEC, CODECS_ALL, {META_CONCEALED_MB_CNT, DEC, CODECS_ALL,
V4L2_MPEG_VIDC_META_DISABLE, MSM_VIDC_META_DISABLE,
V4L2_MPEG_VIDC_META_ENABLE | V4L2_MPEG_VIDC_META_RX_OUTPUT, MSM_VIDC_META_ENABLE | MSM_VIDC_META_RX_OUTPUT,
0, V4L2_MPEG_VIDC_META_DISABLE, 0, MSM_VIDC_META_DISABLE,
V4L2_CID_MPEG_VIDC_METADATA_CONCEALED_MB_COUNT, V4L2_CID_MPEG_VIDC_METADATA_CONCEALED_MB_COUNT,
HFI_PROP_CONEALED_MB_COUNT, HFI_PROP_CONEALED_MB_COUNT,
CAP_FLAG_BITMASK}, CAP_FLAG_BITMASK},
{META_HIST_INFO, DEC, HEVC|AV1|VP9, {META_HIST_INFO, DEC, HEVC|AV1|VP9,
V4L2_MPEG_VIDC_META_DISABLE, MSM_VIDC_META_DISABLE,
V4L2_MPEG_VIDC_META_ENABLE | V4L2_MPEG_VIDC_META_RX_OUTPUT, MSM_VIDC_META_ENABLE | MSM_VIDC_META_RX_OUTPUT,
0, V4L2_MPEG_VIDC_META_DISABLE, 0, MSM_VIDC_META_DISABLE,
V4L2_CID_MPEG_VIDC_METADATA_HISTOGRAM_INFO, V4L2_CID_MPEG_VIDC_METADATA_HISTOGRAM_INFO,
HFI_PROP_HISTOGRAM_INFO, HFI_PROP_HISTOGRAM_INFO,
CAP_FLAG_BITMASK}, CAP_FLAG_BITMASK},
{META_TRANSCODING_STAT_INFO, DEC, HEVC|H264, {META_TRANSCODING_STAT_INFO, DEC, HEVC|H264,
V4L2_MPEG_VIDC_META_DISABLE, MSM_VIDC_META_DISABLE,
V4L2_MPEG_VIDC_META_ENABLE | V4L2_MPEG_VIDC_META_RX_OUTPUT, MSM_VIDC_META_ENABLE | MSM_VIDC_META_RX_OUTPUT,
0, V4L2_MPEG_VIDC_META_DISABLE, 0, MSM_VIDC_META_DISABLE,
V4L2_CID_MPEG_VIDC_METADATA_TRANSCODE_STAT_INFO, V4L2_CID_MPEG_VIDC_METADATA_TRANSCODE_STAT_INFO,
HFI_PROP_TRANSCODING_STAT_INFO, HFI_PROP_TRANSCODING_STAT_INFO,
CAP_FLAG_BITMASK}, CAP_FLAG_BITMASK},
{META_TRANSCODING_STAT_INFO, ENC, HEVC|H264, {META_TRANSCODING_STAT_INFO, ENC, HEVC|H264,
V4L2_MPEG_VIDC_META_DISABLE, MSM_VIDC_META_DISABLE,
V4L2_MPEG_VIDC_META_ENABLE | V4L2_MPEG_VIDC_META_TX_INPUT, MSM_VIDC_META_ENABLE | MSM_VIDC_META_TX_INPUT,
0, V4L2_MPEG_VIDC_META_DISABLE, 0, MSM_VIDC_META_DISABLE,
V4L2_CID_MPEG_VIDC_METADATA_TRANSCODE_STAT_INFO, V4L2_CID_MPEG_VIDC_METADATA_TRANSCODE_STAT_INFO,
HFI_PROP_TRANSCODING_STAT_INFO, HFI_PROP_TRANSCODING_STAT_INFO,
CAP_FLAG_BITMASK}, CAP_FLAG_BITMASK},
{META_PICTURE_TYPE, DEC, CODECS_ALL, {META_PICTURE_TYPE, DEC, CODECS_ALL,
V4L2_MPEG_VIDC_META_DISABLE, MSM_VIDC_META_DISABLE,
V4L2_MPEG_VIDC_META_ENABLE | V4L2_MPEG_VIDC_META_RX_INPUT, MSM_VIDC_META_ENABLE | MSM_VIDC_META_RX_INPUT,
0, V4L2_MPEG_VIDC_META_DISABLE, 0, MSM_VIDC_META_DISABLE,
V4L2_CID_MPEG_VIDC_METADATA_PICTURE_TYPE, V4L2_CID_MPEG_VIDC_METADATA_PICTURE_TYPE,
HFI_PROP_PICTURE_TYPE, HFI_PROP_PICTURE_TYPE,
CAP_FLAG_BITMASK}, CAP_FLAG_BITMASK},
{META_SEI_MASTERING_DISP, ENC, HEVC|HEIC, {META_SEI_MASTERING_DISP, ENC, HEVC|HEIC,
V4L2_MPEG_VIDC_META_DISABLE, MSM_VIDC_META_DISABLE,
V4L2_MPEG_VIDC_META_ENABLE | V4L2_MPEG_VIDC_META_TX_INPUT, MSM_VIDC_META_ENABLE | MSM_VIDC_META_TX_INPUT,
0, V4L2_MPEG_VIDC_META_DISABLE, 0, MSM_VIDC_META_DISABLE,
V4L2_CID_MPEG_VIDC_METADATA_SEI_MASTERING_DISPLAY_COLOUR, V4L2_CID_MPEG_VIDC_METADATA_SEI_MASTERING_DISPLAY_COLOUR,
HFI_PROP_SEI_MASTERING_DISPLAY_COLOUR, HFI_PROP_SEI_MASTERING_DISPLAY_COLOUR,
CAP_FLAG_BITMASK}, CAP_FLAG_BITMASK},
{META_SEI_MASTERING_DISP, DEC, HEVC|HEIC|AV1, {META_SEI_MASTERING_DISP, DEC, HEVC|HEIC|AV1,
V4L2_MPEG_VIDC_META_DISABLE, MSM_VIDC_META_DISABLE,
V4L2_MPEG_VIDC_META_ENABLE | V4L2_MPEG_VIDC_META_RX_INPUT | MSM_VIDC_META_ENABLE | MSM_VIDC_META_RX_INPUT |
V4L2_MPEG_VIDC_META_RX_OUTPUT, MSM_VIDC_META_RX_OUTPUT,
0, V4L2_MPEG_VIDC_META_DISABLE, 0, MSM_VIDC_META_DISABLE,
V4L2_CID_MPEG_VIDC_METADATA_SEI_MASTERING_DISPLAY_COLOUR, V4L2_CID_MPEG_VIDC_METADATA_SEI_MASTERING_DISPLAY_COLOUR,
HFI_PROP_SEI_MASTERING_DISPLAY_COLOUR, HFI_PROP_SEI_MASTERING_DISPLAY_COLOUR,
CAP_FLAG_BITMASK}, CAP_FLAG_BITMASK},
{META_SEI_CLL, ENC, HEVC|HEIC, {META_SEI_CLL, ENC, HEVC|HEIC,
V4L2_MPEG_VIDC_META_DISABLE, MSM_VIDC_META_DISABLE,
V4L2_MPEG_VIDC_META_ENABLE | V4L2_MPEG_VIDC_META_TX_INPUT, MSM_VIDC_META_ENABLE | MSM_VIDC_META_TX_INPUT,
0, V4L2_MPEG_VIDC_META_DISABLE, 0, MSM_VIDC_META_DISABLE,
V4L2_CID_MPEG_VIDC_METADATA_SEI_CONTENT_LIGHT_LEVEL, V4L2_CID_MPEG_VIDC_METADATA_SEI_CONTENT_LIGHT_LEVEL,
HFI_PROP_SEI_CONTENT_LIGHT_LEVEL, HFI_PROP_SEI_CONTENT_LIGHT_LEVEL,
CAP_FLAG_BITMASK}, CAP_FLAG_BITMASK},
{META_SEI_CLL, DEC, HEVC|HEIC|AV1, {META_SEI_CLL, DEC, HEVC|HEIC|AV1,
V4L2_MPEG_VIDC_META_DISABLE, MSM_VIDC_META_DISABLE,
V4L2_MPEG_VIDC_META_ENABLE | V4L2_MPEG_VIDC_META_RX_INPUT | MSM_VIDC_META_ENABLE | MSM_VIDC_META_RX_INPUT |
V4L2_MPEG_VIDC_META_RX_OUTPUT, MSM_VIDC_META_RX_OUTPUT,
0, V4L2_MPEG_VIDC_META_DISABLE, 0, MSM_VIDC_META_DISABLE,
V4L2_CID_MPEG_VIDC_METADATA_SEI_CONTENT_LIGHT_LEVEL, V4L2_CID_MPEG_VIDC_METADATA_SEI_CONTENT_LIGHT_LEVEL,
HFI_PROP_SEI_CONTENT_LIGHT_LEVEL, HFI_PROP_SEI_CONTENT_LIGHT_LEVEL,
CAP_FLAG_BITMASK}, CAP_FLAG_BITMASK},
{META_HDR10PLUS, ENC, HEVC|HEIC, {META_HDR10PLUS, ENC, HEVC|HEIC,
V4L2_MPEG_VIDC_META_DISABLE, MSM_VIDC_META_DISABLE,
V4L2_MPEG_VIDC_META_ENABLE | V4L2_MPEG_VIDC_META_TX_INPUT, MSM_VIDC_META_ENABLE | MSM_VIDC_META_TX_INPUT,
0, V4L2_MPEG_VIDC_META_DISABLE, 0, MSM_VIDC_META_DISABLE,
V4L2_CID_MPEG_VIDC_METADATA_HDR10PLUS, V4L2_CID_MPEG_VIDC_METADATA_HDR10PLUS,
HFI_PROP_SEI_HDR10PLUS_USERDATA, HFI_PROP_SEI_HDR10PLUS_USERDATA,
CAP_FLAG_BITMASK}, CAP_FLAG_BITMASK},
{META_HDR10PLUS, DEC, HEVC|HEIC|AV1, {META_HDR10PLUS, DEC, HEVC|HEIC|AV1,
V4L2_MPEG_VIDC_META_DISABLE, MSM_VIDC_META_DISABLE,
V4L2_MPEG_VIDC_META_ENABLE | V4L2_MPEG_VIDC_META_RX_INPUT | MSM_VIDC_META_ENABLE | MSM_VIDC_META_RX_INPUT |
V4L2_MPEG_VIDC_META_RX_OUTPUT, MSM_VIDC_META_RX_OUTPUT,
0, V4L2_MPEG_VIDC_META_DISABLE, 0, MSM_VIDC_META_DISABLE,
V4L2_CID_MPEG_VIDC_METADATA_HDR10PLUS, V4L2_CID_MPEG_VIDC_METADATA_HDR10PLUS,
HFI_PROP_SEI_HDR10PLUS_USERDATA, HFI_PROP_SEI_HDR10PLUS_USERDATA,
CAP_FLAG_BITMASK}, CAP_FLAG_BITMASK},
{META_DOLBY_RPU, ENC, HEVC, {META_DOLBY_RPU, ENC, HEVC,
V4L2_MPEG_VIDC_META_DISABLE, MSM_VIDC_META_DISABLE,
V4L2_MPEG_VIDC_META_ENABLE | V4L2_MPEG_VIDC_META_TX_INPUT, MSM_VIDC_META_ENABLE | MSM_VIDC_META_TX_INPUT,
0, V4L2_MPEG_VIDC_META_DISABLE, 0, MSM_VIDC_META_DISABLE,
V4L2_CID_MPEG_VIDC_METADATA_DOLBY_RPU, V4L2_CID_MPEG_VIDC_METADATA_DOLBY_RPU,
HFI_PROP_DOLBY_RPU_METADATA, HFI_PROP_DOLBY_RPU_METADATA,
CAP_FLAG_BITMASK}, CAP_FLAG_BITMASK},
{META_DOLBY_RPU, DEC, H264|HEVC, {META_DOLBY_RPU, DEC, H264|HEVC,
V4L2_MPEG_VIDC_META_DISABLE, MSM_VIDC_META_DISABLE,
V4L2_MPEG_VIDC_META_ENABLE | V4L2_MPEG_VIDC_META_RX_OUTPUT, MSM_VIDC_META_ENABLE | MSM_VIDC_META_RX_OUTPUT,
0, V4L2_MPEG_VIDC_META_DISABLE, 0, MSM_VIDC_META_DISABLE,
V4L2_CID_MPEG_VIDC_METADATA_DOLBY_RPU, V4L2_CID_MPEG_VIDC_METADATA_DOLBY_RPU,
HFI_PROP_DOLBY_RPU_METADATA, HFI_PROP_DOLBY_RPU_METADATA,
CAP_FLAG_BITMASK}, CAP_FLAG_BITMASK},
{META_EVA_STATS, ENC, CODECS_ALL, {META_EVA_STATS, ENC, CODECS_ALL,
V4L2_MPEG_VIDC_META_DISABLE, MSM_VIDC_META_DISABLE,
V4L2_MPEG_VIDC_META_ENABLE | V4L2_MPEG_VIDC_META_TX_INPUT, MSM_VIDC_META_ENABLE | MSM_VIDC_META_TX_INPUT,
0, V4L2_MPEG_VIDC_META_DISABLE, 0, MSM_VIDC_META_DISABLE,
V4L2_CID_MPEG_VIDC_METADATA_EVA_STATS, V4L2_CID_MPEG_VIDC_METADATA_EVA_STATS,
HFI_PROP_EVA_STAT_INFO, HFI_PROP_EVA_STAT_INFO,
CAP_FLAG_BITMASK}, CAP_FLAG_BITMASK},
{META_BUF_TAG, ENC, CODECS_ALL, {META_BUF_TAG, ENC, CODECS_ALL,
V4L2_MPEG_VIDC_META_DISABLE, MSM_VIDC_META_DISABLE,
V4L2_MPEG_VIDC_META_ENABLE | V4L2_MPEG_VIDC_META_TX_INPUT | MSM_VIDC_META_ENABLE | MSM_VIDC_META_TX_INPUT |
V4L2_MPEG_VIDC_META_RX_OUTPUT, MSM_VIDC_META_RX_OUTPUT,
0, V4L2_MPEG_VIDC_META_DISABLE, 0, MSM_VIDC_META_DISABLE,
V4L2_CID_MPEG_VIDC_METADATA_BUFFER_TAG, V4L2_CID_MPEG_VIDC_METADATA_BUFFER_TAG,
HFI_PROP_BUFFER_TAG, HFI_PROP_BUFFER_TAG,
CAP_FLAG_BITMASK}, CAP_FLAG_BITMASK},
@@ -1842,67 +1842,67 @@ static struct msm_platform_inst_capability instance_cap_data_kalama[] = {
* in input metadata buffer done. * in input metadata buffer done.
*/ */
{META_BUF_TAG, DEC, CODECS_ALL, {META_BUF_TAG, DEC, CODECS_ALL,
V4L2_MPEG_VIDC_META_DISABLE, MSM_VIDC_META_DISABLE,
V4L2_MPEG_VIDC_META_ENABLE | V4L2_MPEG_VIDC_META_TX_INPUT | MSM_VIDC_META_ENABLE | MSM_VIDC_META_TX_INPUT |
V4L2_MPEG_VIDC_META_TX_OUTPUT | V4L2_MPEG_VIDC_META_RX_INPUT | MSM_VIDC_META_TX_OUTPUT | MSM_VIDC_META_RX_INPUT |
V4L2_MPEG_VIDC_META_RX_OUTPUT, MSM_VIDC_META_RX_OUTPUT,
0, V4L2_MPEG_VIDC_META_DISABLE, 0, MSM_VIDC_META_DISABLE,
V4L2_CID_MPEG_VIDC_METADATA_BUFFER_TAG, V4L2_CID_MPEG_VIDC_METADATA_BUFFER_TAG,
HFI_PROP_BUFFER_TAG, HFI_PROP_BUFFER_TAG,
CAP_FLAG_BITMASK}, CAP_FLAG_BITMASK},
{META_DPB_TAG_LIST, DEC, CODECS_ALL, {META_DPB_TAG_LIST, DEC, CODECS_ALL,
V4L2_MPEG_VIDC_META_DISABLE, MSM_VIDC_META_DISABLE,
V4L2_MPEG_VIDC_META_ENABLE | V4L2_MPEG_VIDC_META_RX_OUTPUT, MSM_VIDC_META_ENABLE | MSM_VIDC_META_RX_OUTPUT,
0, V4L2_MPEG_VIDC_META_DISABLE, 0, MSM_VIDC_META_DISABLE,
V4L2_CID_MPEG_VIDC_METADATA_DPB_TAG_LIST, V4L2_CID_MPEG_VIDC_METADATA_DPB_TAG_LIST,
HFI_PROP_DPB_TAG_LIST, HFI_PROP_DPB_TAG_LIST,
CAP_FLAG_BITMASK}, CAP_FLAG_BITMASK},
{META_SUBFRAME_OUTPUT, ENC, HEIC | H264 | HEVC, {META_SUBFRAME_OUTPUT, ENC, HEIC | H264 | HEVC,
V4L2_MPEG_VIDC_META_DISABLE, MSM_VIDC_META_DISABLE,
V4L2_MPEG_VIDC_META_ENABLE | V4L2_MPEG_VIDC_META_RX_OUTPUT, MSM_VIDC_META_ENABLE | MSM_VIDC_META_RX_OUTPUT,
0, V4L2_MPEG_VIDC_META_DISABLE, 0, MSM_VIDC_META_DISABLE,
V4L2_CID_MPEG_VIDC_METADATA_SUBFRAME_OUTPUT, V4L2_CID_MPEG_VIDC_METADATA_SUBFRAME_OUTPUT,
HFI_PROP_SUBFRAME_OUTPUT, HFI_PROP_SUBFRAME_OUTPUT,
CAP_FLAG_BITMASK}, CAP_FLAG_BITMASK},
{META_SUBFRAME_OUTPUT, DEC, CODECS_ALL, {META_SUBFRAME_OUTPUT, DEC, CODECS_ALL,
V4L2_MPEG_VIDC_META_DISABLE, MSM_VIDC_META_DISABLE,
V4L2_MPEG_VIDC_META_ENABLE | V4L2_MPEG_VIDC_META_RX_OUTPUT, MSM_VIDC_META_ENABLE | MSM_VIDC_META_RX_OUTPUT,
0, V4L2_MPEG_VIDC_META_DISABLE, 0, MSM_VIDC_META_DISABLE,
V4L2_CID_MPEG_VIDC_METADATA_SUBFRAME_OUTPUT, V4L2_CID_MPEG_VIDC_METADATA_SUBFRAME_OUTPUT,
HFI_PROP_SUBFRAME_OUTPUT, HFI_PROP_SUBFRAME_OUTPUT,
CAP_FLAG_BITMASK}, CAP_FLAG_BITMASK},
{META_ENC_QP_METADATA, ENC, CODECS_ALL, {META_ENC_QP_METADATA, ENC, CODECS_ALL,
V4L2_MPEG_VIDC_META_DISABLE, MSM_VIDC_META_DISABLE,
V4L2_MPEG_VIDC_META_ENABLE | V4L2_MPEG_VIDC_META_RX_OUTPUT, MSM_VIDC_META_ENABLE | MSM_VIDC_META_RX_OUTPUT,
0, V4L2_MPEG_VIDC_META_DISABLE, 0, MSM_VIDC_META_DISABLE,
V4L2_CID_MPEG_VIDC_METADATA_ENC_QP_METADATA, V4L2_CID_MPEG_VIDC_METADATA_ENC_QP_METADATA,
HFI_PROP_ENC_QP_METADATA, HFI_PROP_ENC_QP_METADATA,
CAP_FLAG_BITMASK}, CAP_FLAG_BITMASK},
{META_ROI_INFO, ENC, H264|HEVC, {META_ROI_INFO, ENC, H264|HEVC,
V4L2_MPEG_VIDC_META_DISABLE, MSM_VIDC_META_DISABLE,
V4L2_MPEG_VIDC_META_ENABLE | V4L2_MPEG_VIDC_META_TX_INPUT, MSM_VIDC_META_ENABLE | MSM_VIDC_META_TX_INPUT,
0, V4L2_MPEG_VIDC_META_DISABLE, 0, MSM_VIDC_META_DISABLE,
V4L2_CID_MPEG_VIDC_METADATA_ROI_INFO, V4L2_CID_MPEG_VIDC_METADATA_ROI_INFO,
HFI_PROP_ROI_INFO, HFI_PROP_ROI_INFO,
CAP_FLAG_INPUT_PORT | CAP_FLAG_BITMASK}, CAP_FLAG_INPUT_PORT | CAP_FLAG_BITMASK},
{META_SALIENCY_INFO, ENC, H264|HEVC, {META_SALIENCY_INFO, ENC, H264|HEVC,
V4L2_MPEG_VIDC_META_DISABLE, MSM_VIDC_META_DISABLE,
V4L2_MPEG_VIDC_META_ENABLE | V4L2_MPEG_VIDC_META_TX_INPUT, MSM_VIDC_META_ENABLE | MSM_VIDC_META_TX_INPUT,
0, V4L2_MPEG_VIDC_META_DISABLE, 0, MSM_VIDC_META_DISABLE,
V4L2_CID_MPEG_VIDC_METADATA_SALIENCY_INFO, V4L2_CID_MPEG_VIDC_METADATA_SALIENCY_INFO,
HFI_PROP_ROI_AS_SALIENCY_INFO, HFI_PROP_ROI_AS_SALIENCY_INFO,
CAP_FLAG_INPUT_PORT | CAP_FLAG_BITMASK}, CAP_FLAG_INPUT_PORT | CAP_FLAG_BITMASK},
{META_DEC_QP_METADATA, DEC, CODECS_ALL, {META_DEC_QP_METADATA, DEC, CODECS_ALL,
V4L2_MPEG_VIDC_META_DISABLE, MSM_VIDC_META_DISABLE,
V4L2_MPEG_VIDC_META_ENABLE | V4L2_MPEG_VIDC_META_RX_OUTPUT, MSM_VIDC_META_ENABLE | MSM_VIDC_META_RX_OUTPUT,
0, V4L2_MPEG_VIDC_META_DISABLE, 0, MSM_VIDC_META_DISABLE,
V4L2_CID_MPEG_VIDC_METADATA_DEC_QP_METADATA, V4L2_CID_MPEG_VIDC_METADATA_DEC_QP_METADATA,
HFI_PROP_DEC_QP_METADATA, HFI_PROP_DEC_QP_METADATA,
CAP_FLAG_BITMASK}, CAP_FLAG_BITMASK},
@@ -1919,9 +1919,9 @@ static struct msm_platform_inst_capability instance_cap_data_kalama[] = {
V4L2_CID_MPEG_VIDC_VENC_COMPLEXITY}, V4L2_CID_MPEG_VIDC_VENC_COMPLEXITY},
{META_MAX_NUM_REORDER_FRAMES, DEC, HEVC | H264, {META_MAX_NUM_REORDER_FRAMES, DEC, HEVC | H264,
V4L2_MPEG_VIDC_META_DISABLE, MSM_VIDC_META_DISABLE,
V4L2_MPEG_VIDC_META_ENABLE | V4L2_MPEG_VIDC_META_RX_OUTPUT, MSM_VIDC_META_ENABLE | MSM_VIDC_META_RX_OUTPUT,
0, V4L2_MPEG_VIDC_META_DISABLE, 0, MSM_VIDC_META_DISABLE,
V4L2_CID_MPEG_VIDC_METADATA_MAX_NUM_REORDER_FRAMES, V4L2_CID_MPEG_VIDC_METADATA_MAX_NUM_REORDER_FRAMES,
HFI_PROP_MAX_NUM_REORDER_FRAMES, HFI_PROP_MAX_NUM_REORDER_FRAMES,
CAP_FLAG_BITMASK}, CAP_FLAG_BITMASK},

2
driver/variant/iris2/src/msm_vidc_buffer_iris2.c
View File

@@ -476,7 +476,7 @@ static u32 msm_vidc_encoder_vpss_size_iris2(struct msm_vidc_inst* inst)
driver_colorfmt = v4l2_colorformat_to_driver(inst, driver_colorfmt = v4l2_colorformat_to_driver(inst,
f->fmt.pix_mp.pixelformat, __func__); f->fmt.pix_mp.pixelformat, __func__);
is_tenbit = is_10bit_colorformat(driver_colorfmt); is_tenbit = is_10bit_colorformat(driver_colorfmt);
if (inst->capabilities->cap[BLUR_TYPES].value != VIDC_BLUR_NONE) if (inst->capabilities->cap[BLUR_TYPES].value != MSM_VIDC_BLUR_NONE)
blur = true; blur = true;
HFI_BUFFER_VPSS_ENC(size, width, height, ds_enable, blur, is_tenbit); HFI_BUFFER_VPSS_ENC(size, width, height, ds_enable, blur, is_tenbit);

10
driver/variant/iris2/src/msm_vidc_iris2.c
View File

@@ -1097,7 +1097,7 @@ int msm_vidc_adjust_blur_type_iris2(void *instance, struct v4l2_ctrl *ctrl)
adjusted_value = ctrl ? ctrl->val : adjusted_value = ctrl ? ctrl->val :
capability->cap[BLUR_TYPES].value; capability->cap[BLUR_TYPES].value;
if (adjusted_value == VIDC_BLUR_NONE) if (adjusted_value == MSM_VIDC_BLUR_NONE)
return 0; return 0;
if (msm_vidc_get_parent_value(inst, BLUR_TYPES, BITRATE_MODE, if (msm_vidc_get_parent_value(inst, BLUR_TYPES, BITRATE_MODE,
@@ -1110,16 +1110,16 @@ int msm_vidc_adjust_blur_type_iris2(void *instance, struct v4l2_ctrl *ctrl)
&min_quality, __func__)) &min_quality, __func__))
return -EINVAL; return -EINVAL;
if (adjusted_value == VIDC_BLUR_EXTERNAL) { if (adjusted_value == MSM_VIDC_BLUR_EXTERNAL) {
if (is_scaling_enabled(inst) || min_quality) { if (is_scaling_enabled(inst) || min_quality) {
adjusted_value = VIDC_BLUR_NONE; adjusted_value = MSM_VIDC_BLUR_NONE;
} }
} else if (adjusted_value == VIDC_BLUR_ADAPTIVE) { } else if (adjusted_value == MSM_VIDC_BLUR_ADAPTIVE) {
if (is_scaling_enabled(inst) || min_quality || if (is_scaling_enabled(inst) || min_quality ||
(rc_type != HFI_RC_VBR_CFR) || (rc_type != HFI_RC_VBR_CFR) ||
!cac || !cac ||
is_10bit_colorformat(pix_fmts)) { is_10bit_colorformat(pix_fmts)) {
adjusted_value = VIDC_BLUR_NONE; adjusted_value = MSM_VIDC_BLUR_NONE;
} }
} }

2
driver/variant/iris3/src/msm_vidc_buffer_iris3.c
View File

@@ -542,7 +542,7 @@ static u32 msm_vidc_encoder_vpss_size_iris3(struct msm_vidc_inst* inst)
driver_colorfmt = v4l2_colorformat_to_driver(inst, driver_colorfmt = v4l2_colorformat_to_driver(inst,
f->fmt.pix_mp.pixelformat, __func__); f->fmt.pix_mp.pixelformat, __func__);
is_tenbit = is_10bit_colorformat(driver_colorfmt); is_tenbit = is_10bit_colorformat(driver_colorfmt);
if (inst->capabilities->cap[BLUR_TYPES].value != VIDC_BLUR_NONE) if (inst->capabilities->cap[BLUR_TYPES].value != MSM_VIDC_BLUR_NONE)
blur = true; blur = true;
HFI_BUFFER_VPSS_ENC(size, width, height, ds_enable, blur, is_tenbit); HFI_BUFFER_VPSS_ENC(size, width, height, ds_enable, blur, is_tenbit);

16
driver/vidc/inc/msm_vidc_driver.h
View File

@@ -113,8 +113,8 @@ static inline bool is_meta_rx_inp_enabled(struct msm_vidc_inst *inst, u32 cap)
{ {
bool enabled = false; bool enabled = false;
if (inst->capabilities->cap[cap].value & V4L2_MPEG_VIDC_META_ENABLE && if (inst->capabilities->cap[cap].value & MSM_VIDC_META_ENABLE &&
inst->capabilities->cap[cap].value & V4L2_MPEG_VIDC_META_RX_INPUT) inst->capabilities->cap[cap].value & MSM_VIDC_META_RX_INPUT)
enabled = true; enabled = true;
return enabled; return enabled;
@@ -124,8 +124,8 @@ static inline bool is_meta_rx_out_enabled(struct msm_vidc_inst *inst, u32 cap)
{ {
bool enabled = false; bool enabled = false;
if (inst->capabilities->cap[cap].value & V4L2_MPEG_VIDC_META_ENABLE && if (inst->capabilities->cap[cap].value & MSM_VIDC_META_ENABLE &&
inst->capabilities->cap[cap].value & V4L2_MPEG_VIDC_META_RX_OUTPUT) inst->capabilities->cap[cap].value & MSM_VIDC_META_RX_OUTPUT)
enabled = true; enabled = true;
return enabled; return enabled;
@@ -135,8 +135,8 @@ static inline bool is_meta_tx_inp_enabled(struct msm_vidc_inst *inst, u32 cap)
{ {
bool enabled = false; bool enabled = false;
if (inst->capabilities->cap[cap].value & V4L2_MPEG_VIDC_META_ENABLE && if (inst->capabilities->cap[cap].value & MSM_VIDC_META_ENABLE &&
inst->capabilities->cap[cap].value & V4L2_MPEG_VIDC_META_TX_INPUT) inst->capabilities->cap[cap].value & MSM_VIDC_META_TX_INPUT)
enabled = true; enabled = true;
return enabled; return enabled;
@@ -146,8 +146,8 @@ static inline bool is_meta_tx_out_enabled(struct msm_vidc_inst *inst, u32 cap)
{ {
bool enabled = false; bool enabled = false;
if (inst->capabilities->cap[cap].value & V4L2_MPEG_VIDC_META_ENABLE && if (inst->capabilities->cap[cap].value & MSM_VIDC_META_ENABLE &&
inst->capabilities->cap[cap].value & V4L2_MPEG_VIDC_META_TX_OUTPUT) inst->capabilities->cap[cap].value & MSM_VIDC_META_TX_OUTPUT)
enabled = true; enabled = true;
return enabled; return enabled;

22
driver/vidc/inc/msm_vidc_internal.h
View File

@@ -26,6 +26,28 @@
#define V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN_10_STILL_PICTURE (3) #define V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN_10_STILL_PICTURE (3)
#endif #endif
enum msm_vidc_blur_types {
MSM_VIDC_BLUR_NONE = 0x0,
MSM_VIDC_BLUR_EXTERNAL = 0x1,
MSM_VIDC_BLUR_ADAPTIVE = 0x2,
};
/* various Metadata - encoder & decoder */
enum msm_vidc_metadata_bits {
MSM_VIDC_META_DISABLE = 0x0,
MSM_VIDC_META_ENABLE = 0x1,
MSM_VIDC_META_TX_INPUT = 0x2,
MSM_VIDC_META_TX_OUTPUT = 0x4,
MSM_VIDC_META_RX_INPUT = 0x8,
MSM_VIDC_META_RX_OUTPUT = 0x10,
MSM_VIDC_META_MAX = 0x20,
};
#define MSM_VIDC_METADATA_SIZE (4 * 4096) /* 16 KB */
#define ENCODE_INPUT_METADATA_SIZE (512 * 4096) /* 2 MB */
#define DECODE_INPUT_METADATA_SIZE MSM_VIDC_METADATA_SIZE
#define MSM_VIDC_METADATA_DOLBY_RPU_SIZE (41 * 1024) /* 41 KB */
#define MAX_NAME_LENGTH 128 #define MAX_NAME_LENGTH 128
#define VENUS_VERSION_LENGTH 128 #define VENUS_VERSION_LENGTH 128
#define MAX_MATRIX_COEFFS 9 #define MAX_MATRIX_COEFFS 9

4
driver/vidc/src/msm_vdec.c
View File

@@ -1349,8 +1349,8 @@ static int msm_vdec_read_input_subcr_params(struct msm_vidc_inst *inst)
if (inst->capabilities->cap[CODED_FRAMES].value == if (inst->capabilities->cap[CODED_FRAMES].value ==
CODED_FRAMES_INTERLACE) { CODED_FRAMES_INTERLACE) {
msm_vidc_update_cap_value(inst, META_OUTBUF_FENCE, msm_vidc_update_cap_value(inst, META_OUTBUF_FENCE,
V4L2_MPEG_VIDC_META_RX_INPUT | MSM_VIDC_META_RX_INPUT |
V4L2_MPEG_VIDC_META_DISABLE, __func__); MSM_VIDC_META_DISABLE, __func__);
} }
return 0; return 0;

26
driver/vidc/src/msm_vidc_control.c
View File

@@ -468,7 +468,7 @@ int msm_vidc_update_cap_value(struct msm_vidc_inst *inst, u32 cap_id,
* cumulative control value if client set same metadata * cumulative control value if client set same metadata
* control multiple times. * control multiple times.
*/ */
if (adjusted_val & V4L2_MPEG_VIDC_META_ENABLE) { if (adjusted_val & MSM_VIDC_META_ENABLE) {
/* enable metadata */ /* enable metadata */
inst->capabilities->cap[cap_id].value |= adjusted_val; inst->capabilities->cap[cap_id].value |= adjusted_val;
} else { } else {
@@ -2350,7 +2350,7 @@ int msm_vidc_adjust_blur_type(void *instance, struct v4l2_ctrl *ctrl)
adjusted_value = ctrl ? ctrl->val : adjusted_value = ctrl ? ctrl->val :
capability->cap[BLUR_TYPES].value; capability->cap[BLUR_TYPES].value;
if (adjusted_value == VIDC_BLUR_NONE) if (adjusted_value == MSM_VIDC_BLUR_NONE)
return 0; return 0;
if (msm_vidc_get_parent_value(inst, BLUR_TYPES, BITRATE_MODE, if (msm_vidc_get_parent_value(inst, BLUR_TYPES, BITRATE_MODE,
@@ -2363,17 +2363,17 @@ int msm_vidc_adjust_blur_type(void *instance, struct v4l2_ctrl *ctrl)
&roi_enable, __func__)) &roi_enable, __func__))
return -EINVAL; return -EINVAL;
if (adjusted_value == VIDC_BLUR_EXTERNAL) { if (adjusted_value == MSM_VIDC_BLUR_EXTERNAL) {
if (is_scaling_enabled(inst) || min_quality) { if (is_scaling_enabled(inst) || min_quality) {
adjusted_value = VIDC_BLUR_NONE; adjusted_value = MSM_VIDC_BLUR_NONE;
} }
} else if (adjusted_value == VIDC_BLUR_ADAPTIVE) { } else if (adjusted_value == MSM_VIDC_BLUR_ADAPTIVE) {
if (is_scaling_enabled(inst) || min_quality || if (is_scaling_enabled(inst) || min_quality ||
(rc_type != HFI_RC_VBR_CFR && (rc_type != HFI_RC_VBR_CFR &&
rc_type != HFI_RC_CBR_CFR && rc_type != HFI_RC_CBR_CFR &&
rc_type != HFI_RC_CBR_VFR) || rc_type != HFI_RC_CBR_VFR) ||
is_10bit_colorformat(pix_fmts) || roi_enable) { is_10bit_colorformat(pix_fmts) || roi_enable) {
adjusted_value = VIDC_BLUR_NONE; adjusted_value = MSM_VIDC_BLUR_NONE;
} }
} }
@@ -2450,7 +2450,7 @@ int msm_vidc_adjust_blur_resolution(void *instance, struct v4l2_ctrl *ctrl)
&blur_type, __func__)) &blur_type, __func__))
return -EINVAL; return -EINVAL;
if (blur_type != VIDC_BLUR_EXTERNAL) if (blur_type != MSM_VIDC_BLUR_EXTERNAL)
return 0; return 0;
msm_vidc_update_cap_value(inst, BLUR_RESOLUTION, msm_vidc_update_cap_value(inst, BLUR_RESOLUTION,
@@ -2774,7 +2774,7 @@ int msm_vidc_adjust_dec_lowlatency_mode(void *instance, struct v4l2_ctrl *ctrl)
struct msm_vidc_inst_capability *capability; struct msm_vidc_inst_capability *capability;
s32 adjusted_value; s32 adjusted_value;
struct msm_vidc_inst *inst = (struct msm_vidc_inst *) instance; struct msm_vidc_inst *inst = (struct msm_vidc_inst *) instance;
s32 outbuf_fence = V4L2_MPEG_VIDC_META_DISABLE; s32 outbuf_fence = MSM_VIDC_META_DISABLE;
if (!inst || !inst->capabilities) { if (!inst || !inst->capabilities) {
d_vpr_e("%s: invalid params\n", __func__); d_vpr_e("%s: invalid params\n", __func__);
@@ -2790,8 +2790,8 @@ int msm_vidc_adjust_dec_lowlatency_mode(void *instance, struct v4l2_ctrl *ctrl)
return -EINVAL; return -EINVAL;
/* enable lowlatency if outbuf fence is enabled */ /* enable lowlatency if outbuf fence is enabled */
if (outbuf_fence & V4L2_MPEG_VIDC_META_ENABLE && if (outbuf_fence & MSM_VIDC_META_ENABLE &&
outbuf_fence & V4L2_MPEG_VIDC_META_RX_INPUT) outbuf_fence & MSM_VIDC_META_RX_INPUT)
adjusted_value = 1; adjusted_value = 1;
msm_vidc_update_cap_value(inst, LOWLATENCY_MODE, msm_vidc_update_cap_value(inst, LOWLATENCY_MODE,
@@ -2895,8 +2895,8 @@ int msm_vidc_adjust_dec_outbuf_fence(void *instance, struct v4l2_ctrl *ctrl)
if (picture_order == 0) { if (picture_order == 0) {
/* disable outbuf fence */ /* disable outbuf fence */
adjusted_value = V4L2_MPEG_VIDC_META_DISABLE | adjusted_value = MSM_VIDC_META_DISABLE |
V4L2_MPEG_VIDC_META_RX_INPUT; MSM_VIDC_META_RX_INPUT;
} }
msm_vidc_update_cap_value(inst, META_OUTBUF_FENCE, msm_vidc_update_cap_value(inst, META_OUTBUF_FENCE,
@@ -3947,7 +3947,7 @@ int msm_vidc_set_blur_resolution(void *instance,
BLUR_TYPES, &blur_type, __func__)) BLUR_TYPES, &blur_type, __func__))
return -EINVAL; return -EINVAL;
if (blur_type != VIDC_BLUR_EXTERNAL) if (blur_type != MSM_VIDC_BLUR_EXTERNAL)
return 0; return 0;
hfi_value = inst->capabilities->cap[cap_id].value; hfi_value = inst->capabilities->cap[cap_id].value;