samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Rozštěpit 0
Zdrojový kód Úkoly Pull requesty Akce Balíčky Projekty Vydání Wiki Aktivita

Merge "video: driver: Remove slice interface capability"

Procházet zdrojové kódy
Tento commit je obsažen v:
qctecmdr
2022-11-17 23:45:10 -08:00
odevzdal Gerrit - the friendly Code Review server
rodič 2d17637ec0 a51bbd6445
revize b8fd5b594f
2 změnil soubory, kde provedl 6 přidání a 34 odebrání
Stáhněte soubor záplaty Stáhněte rozdílový soubor Rozbalit všechny soubory Sbalit všechny soubory

20
driver/platform/kalama/src/msm_vidc_kalama.c
Zobrazit soubor

@@ -593,14 +593,6 @@ static struct msm_platform_inst_capability instance_cap_data_kalama[] = {
V4L2_CID_MPEG_VIDC_SUPERFRAME, 0,
CAP_FLAG_NONE},
{SLICE_DECODE, DEC, H264|HEVC|AV1,
V4L2_MPEG_MSM_VIDC_DISABLE,
V4L2_MPEG_MSM_VIDC_DISABLE,
0,
V4L2_MPEG_MSM_VIDC_DISABLE,
V4L2_CID_MPEG_VIDEO_DECODER_SLICE_INTERFACE,
0},
{HEADER_MODE, ENC, CODECS_ALL,
V4L2_MPEG_VIDEO_HEADER_MODE_SEPARATE,
V4L2_MPEG_VIDEO_HEADER_MODE_JOINED_WITH_1ST_FRAME,
@@ -1992,7 +1984,7 @@ static struct msm_platform_inst_cap_dependency instance_cap_dependency_data_kala
{META_OUTBUF_FENCE, DEC, H264|HEVC|VP9|AV1,
{OUTPUT_ORDER},
{LOWLATENCY_MODE, SLICE_DECODE},
{LOWLATENCY_MODE},
msm_vidc_adjust_dec_outbuf_fence,
NULL},
@@ -2020,12 +2012,6 @@ static struct msm_platform_inst_cap_dependency instance_cap_dependency_data_kala
NULL,
NULL},
{SLICE_DECODE, DEC, H264|HEVC|AV1,
{LOWLATENCY_MODE, META_OUTBUF_FENCE, OUTPUT_ORDER},
{0},
NULL,
NULL},
{HEADER_MODE, ENC, CODECS_ALL,
{0},
{0},
@@ -2145,7 +2131,7 @@ static struct msm_platform_inst_cap_dependency instance_cap_dependency_data_kala
{LOWLATENCY_MODE, DEC, H264|HEVC|VP9|AV1,
{META_OUTBUF_FENCE},
{STAGE, SLICE_DECODE},
{STAGE},
msm_vidc_adjust_dec_lowlatency_mode,
NULL},
@@ -2442,7 +2428,7 @@ static struct msm_platform_inst_cap_dependency instance_cap_dependency_data_kala
{OUTPUT_ORDER, DEC, H264|HEVC|VP9|AV1,
{THUMBNAIL_MODE, DISPLAY_DELAY, DISPLAY_DELAY_ENABLE},
{META_OUTBUF_FENCE, SLICE_DECODE},
{META_OUTBUF_FENCE},
msm_vidc_adjust_output_order,
msm_vidc_set_u32},

20
driver/platform/waipio/src/msm_vidc_waipio.c
Zobrazit soubor

@@ -331,14 +331,6 @@ static struct msm_platform_inst_capability instance_cap_data_waipio[] = {
V4L2_CID_MPEG_VIDC_SUPERFRAME, 0,
CAP_FLAG_NONE},
{SLICE_DECODE, DEC, H264|HEVC,
V4L2_MPEG_MSM_VIDC_DISABLE,
V4L2_MPEG_MSM_VIDC_DISABLE,
0,
V4L2_MPEG_MSM_VIDC_DISABLE,
V4L2_CID_MPEG_VIDEO_DECODER_SLICE_INTERFACE,
0},
{HEADER_MODE, ENC, CODECS_ALL,
V4L2_MPEG_VIDEO_HEADER_MODE_SEPARATE,
V4L2_MPEG_VIDEO_HEADER_MODE_JOINED_WITH_1ST_FRAME,
@@ -1581,7 +1573,7 @@ static struct msm_platform_inst_cap_dependency instance_cap_dependency_data_waip
{META_OUTBUF_FENCE, DEC, H264|HEVC|VP9,
{OUTPUT_ORDER},
{LOWLATENCY_MODE, SLICE_DECODE},
{LOWLATENCY_MODE},
NULL,
NULL},
@@ -1609,12 +1601,6 @@ static struct msm_platform_inst_cap_dependency instance_cap_dependency_data_waip
NULL,
NULL},
{SLICE_DECODE, DEC, H264|HEVC,
{LOWLATENCY_MODE, META_OUTBUF_FENCE, OUTPUT_ORDER},
{0},
NULL,
NULL},
{HEADER_MODE, ENC, CODECS_ALL,
{0},
{0},
@@ -1722,7 +1708,7 @@ static struct msm_platform_inst_cap_dependency instance_cap_dependency_data_waip
{LOWLATENCY_MODE, DEC, H264|HEVC|VP9,
{META_OUTBUF_FENCE},
{STAGE, SLICE_DECODE},
{STAGE},
msm_vidc_adjust_dec_lowlatency_mode,
NULL},
@@ -2007,7 +1993,7 @@ static struct msm_platform_inst_cap_dependency instance_cap_dependency_data_waip
{OUTPUT_ORDER, DEC, H264|HEVC|VP9,
{THUMBNAIL_MODE, DISPLAY_DELAY, DISPLAY_DELAY_ENABLE},
{META_OUTBUF_FENCE, SLICE_DECODE},
{META_OUTBUF_FENCE},
msm_vidc_adjust_output_order,
msm_vidc_set_u32},