From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 15BAE4859E for ; Mon, 5 Feb 2024 23:35:03 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1C70A68D178; Tue, 6 Feb 2024 01:34:56 +0200 (EET) Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02olkn2104.outbound.protection.outlook.com [40.92.49.104]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0293C68D164 for ; Tue, 6 Feb 2024 01:34:49 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XjU7cdcYTl3WjyhCVv5c9sXEPUBrh0IdrDmsN1XM7qX4RCQ+rR7sSht4Qsv5a9ksJwkbSBbMgsYWMh2xCZuD/+i00tm07HupJVECY+AohNYJ5VSBekiwnm93J0fUMj/HU03w82aqg4dubgG2yCegG9cNN2QFMSS7xuMWSmBSP83z1gJyMvGgwvhSr9AB3CAcwo4GPEpFEej4mLxLzdTGqXZpktEZdg4OvUlQmewZCTRuawc0H6xl8PrIXMh+kh8LsCvrDEYLc9EZTWvG8BCcGexLa/MbdLQrtH9X/+1zit5kLUj7pSYExETFrzYv6Rk/lRqtVYNq4vN+f1xBdWiq0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Qp+jOwP11VC5Q/s4yE5KpgfJaQiU8jzruPmopzzgxnI=; b=SCwT9n+uv5FOueqWr3AaQOj0Au/6GglptOREPvQqhuAKZq2WyRceR0UE3PmUVhaKZSOUKwjMrNJ6S57LTUup7DtX7SgsIoJ99Pw49ZTRTcBfOht7dUFZIU3QEYFGNP/aiU1/Ly2BY+WFk5Hfk/2nUVJ7XFGPkYpnGX90j2pHsAUUguKRAexowT60+FgO/o656kE502/yCc7sNiDyy2QToV0px6SV12gH3sKAgNiUZWTy0X3oeVOy0+pgyhBq5UfnkElxRXfBg1LEakciccZnhnhH36eK3tXRpkyeBp4KXq+sx5o1DFf5+KrZQDM8pBx84nnspxREmCGLM2dWc+3+kg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Qp+jOwP11VC5Q/s4yE5KpgfJaQiU8jzruPmopzzgxnI=; b=d9bJCjWmiz8lzmwEgn35q+UIMeXqo5wKWkHPND5dkKxROVVmRUqKrXUFB3yZSOV0n/MPPq2pa3gXV2DE7rQkCOWk+h+j4KrhNBsJWRoKutHtn4Ho+1qY59PmLUiqoALuBXjfapRn00267nI53ABs9CDV8tmxVZ5xK7XhpFa4CYmMHgS3oX8G6ef2pQjwdTdVxzqyts18Q/Il4IQJ2ZKs48ap+/1suqiLTBnynThJirENcEAhqlI+Rzlp+YdHAC6t8PezNBkfih9YpiTxphby7FTtp0Q/F65b4caHsyRfr0j6CAUmHypZ1pANPcAiACq0ZczmovNx7Yeh9keNxMGn1w== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0213.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:324::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.36; Mon, 5 Feb 2024 23:34:38 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7249.032; Mon, 5 Feb 2024 23:34:38 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 6 Feb 2024 00:36:14 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [Ts/eZIs7l/MmJP8ExlYwdNks0ztD/RW4] X-ClientProxiedBy: ZR0P278CA0160.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240205233614.3950767-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0213:EE_ X-MS-Office365-Filtering-Correlation-Id: 1924dcf1-a41d-4210-8500-08dc26a304d7 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: i2c0OFsJMfEehVU62899wDXM7azUeCX/GWWAh/StUgKTiGSW8Ee6fvTh1ITmyWdSpgI/G7Q6gITkeZL6dISiN47awMxn6VFsA5NjXh0GS4haWE+bsxFsZrP+NGcFtaoBdLl69sYokom6PSeI6WMRNnfKIxIhkRdl0HoEGJuzHu1ovQvNoNcXzdd1PCpUA0gzLopvuRsfb2Xp+g0wvUiatODjWXyaPYcE045dq5Gq9/pe1gBGctfuIXRodFiKnYd69cZA3ywOQ8A1XxWF9lazUJ51xheoxpfff6f66XEK98w2HyMbg9dAmD/Nwo9DTUBrto89z6Khx+pYCI5Y3bivGiWbqS9GrRWL/UNUGP42NjfWmz1o4jql62Sd8KodwLlHn5Dt5OedACko1vvsIlpwolZ0akAsw32gF6xejUV8ay0cQyAPauLzugn0t2rEmobvnD1G0Aq9mYjtbxy4sd+eoukGxIevgBbF91Q2SKPnrNUDzQVA0AcOPrTyfm/J0ZuZA5YE6OKN+XYrT3h4xIk84qlel3h6nM5x+Dyswx+lWd4hNL+ZOXRYIsH7MkV/igmOfcaNxKPVCKJVsYO8XyO7bZLNXPfmJv8oxFZJP+HtF9FznR7leU36EReJgzUKwOmK X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?d08k7Dky8Rmk+fzbW9SKVwc6gdS2B5u+mNC+M5lnWKeM6KodA2KExjtC2DP2?= =?us-ascii?Q?jz+hnPT+qzlgBl5579P3PQ8RdxVV9yYrnXWQR8n8aNcbdRPlonrf8jpaHAsN?= =?us-ascii?Q?TCw4P/KK1w6LsgL4EvMHZsn0N493JfekxtKJjMkeBEVjGXsaBQvmzBB03trX?= =?us-ascii?Q?taCaDPRDxO8jcD2iFoW/cZyrVUGYiYWCMg3h+KN35+XXlkGCRF2LIx8v18eL?= =?us-ascii?Q?tjPucx0myLJs8tMyDeO/hpwi6yezURE6srTbcFQ/lHMu0j1CB5V9xkaR2hzW?= =?us-ascii?Q?iIVp9UrqZoXEMZcl5yB61U/VcMzULGhDy9ONwzyvvdogEJmifvwAa3pWfwaO?= =?us-ascii?Q?/2r/VyJpu2O9ii3InD1U58c3MfgmI8qbMrE0Rk0nmze5BdqySBNqVey/YMxc?= =?us-ascii?Q?yXJCh/y8KVyzE/EW1wHOkyTZUDg/LfDEGAU4xKRdNOlTGXKgqslcgBVDv0gW?= =?us-ascii?Q?elzYFlp1t/fObyK0aybpHoMcXcAPbSwNsGseQDXvO4xY6bUXM5DZUQ1fASkt?= =?us-ascii?Q?A9liu885vs4LyvjjXZt4vt1p9J9vOBHMWRYm5nNkY2iVesvpbvJwdQO3unmt?= =?us-ascii?Q?BNFZm6Ov1t3wRX8V67aRjQf4tvK+qLB0idGV3q77OaezR0PxrRf5gwMyrtzl?= =?us-ascii?Q?Qzl+tWDGWJajAVfuqDCfOCd1m6kWzaOse6q6hAFcXmOm2W1CmF00IAPsVajI?= =?us-ascii?Q?zrHyI0cT4mQA++YC1H5EYXjGMYdthH6+rlYS84j6c3ukeXbsccOj8fzcYaEt?= =?us-ascii?Q?5rn/MkrfiBGKDEaWMGVm6u++usMxZNdVHM4QnORDNLUChDjgDuGwa49O2zYy?= =?us-ascii?Q?wrF2zP67nBLxzyJ1ORYMKEy3Nk1KdfMqG2QpXWC0wrf4P0NZ41aoq4sikDkt?= =?us-ascii?Q?R4yTGkks/ACe/cN3QQGgEGDFrtXwlp+1Eob3VkJCkSGZoPxJa1F4cU7qWakb?= =?us-ascii?Q?wMywMTs97Y0hygQjKTTwPud6PKu3Ol/j7INSmb/4+uVMCHgrDa5lGQi2cHKW?= =?us-ascii?Q?mUBbAE2ygn5U68wW9JlN4ITIv+bMw93Yi7TW3ZYuHK76R5BgNyGpFxz+xf5i?= =?us-ascii?Q?oF+/DqoVcRWMyuZ8FbZdcRbCfKlyQnemJdRm5ZQtVLRC8T/EjnavG1fz2jWV?= =?us-ascii?Q?Q+EY99h36BiA8gOGKjW1DS9DqfZLzB9FspBwVMESVlZw0lgDbBgXZBB9aFuV?= =?us-ascii?Q?/OH4i0buJbxAnwmC3iwgzB7NK03I3TYwkM0vxxz9RroB3L7lgHQuGcQivgke?= =?us-ascii?Q?bYCQtSMW1kZTTsgmRJyG?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1924dcf1-a41d-4210-8500-08dc26a304d7 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2024 23:34:38.4450 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8P250MB0213 Subject: [FFmpeg-devel] [PATCH 6/6] avcodec/h263dec: Remove AVCodec.pix_fmts arrays X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: They are not intended for decoders (for which there is the get_format callback in case the user has a choice). Also note that the list was wrong for MPEG4, because it did not contain the high bit depth pixel formats used for studio profiles. Signed-off-by: Andreas Rheinhardt --- libavcodec/flvdec.c | 2 -- libavcodec/h263dec.c | 43 ++++++++++++++++++++------------------ libavcodec/h263dec.h | 2 -- libavcodec/intelh263dec.c | 4 ---- libavcodec/mpeg4videodec.c | 1 - libavcodec/msmpeg4dec.c | 16 -------------- libavcodec/wmv2dec.c | 2 -- 7 files changed, 23 insertions(+), 47 deletions(-) diff --git a/libavcodec/flvdec.c b/libavcodec/flvdec.c index 09fefd3d1c..8baaed06a8 100644 --- a/libavcodec/flvdec.c +++ b/libavcodec/flvdec.c @@ -123,6 +123,4 @@ const FFCodec ff_flv_decoder = { .p.capabilities = AV_CODEC_CAP_DRAW_HORIZ_BAND | AV_CODEC_CAP_DR1, .caps_internal = FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM, .p.max_lowres = 3, - .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, - AV_PIX_FMT_NONE }, }; diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index eb1d87a2fe..910df7585f 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -49,6 +49,23 @@ #include "thread.h" #include "wmv2dec.h" +static const enum AVPixelFormat h263_hwaccel_pixfmt_list_420[] = { +#if CONFIG_H263_VAAPI_HWACCEL || CONFIG_MPEG4_VAAPI_HWACCEL + AV_PIX_FMT_VAAPI, +#endif +#if CONFIG_MPEG4_NVDEC_HWACCEL + AV_PIX_FMT_CUDA, +#endif +#if CONFIG_MPEG4_VDPAU_HWACCEL + AV_PIX_FMT_VDPAU, +#endif +#if CONFIG_H263_VIDEOTOOLBOX_HWACCEL || CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL + AV_PIX_FMT_VIDEOTOOLBOX, +#endif + AV_PIX_FMT_YUV420P, + AV_PIX_FMT_NONE +}; + static enum AVPixelFormat h263_get_format(AVCodecContext *avctx) { /* MPEG-4 Studio Profile only, not supported by hardware */ @@ -63,7 +80,12 @@ static enum AVPixelFormat h263_get_format(AVCodecContext *avctx) return AV_PIX_FMT_GRAY8; } - return avctx->pix_fmt = ff_get_format(avctx, avctx->codec->pix_fmts); + if (avctx->codec_id == AV_CODEC_ID_H263 || + avctx->codec_id == AV_CODEC_ID_H263P || + avctx->codec_id == AV_CODEC_ID_MPEG4) + return avctx->pix_fmt = ff_get_format(avctx, h263_hwaccel_pixfmt_list_420); + + return AV_PIX_FMT_YUV420P; } av_cold int ff_h263_decode_init(AVCodecContext *avctx) @@ -659,23 +681,6 @@ frame_end: return get_consumed_bytes(s, buf_size); } -const enum AVPixelFormat ff_h263_hwaccel_pixfmt_list_420[] = { -#if CONFIG_H263_VAAPI_HWACCEL || CONFIG_MPEG4_VAAPI_HWACCEL - AV_PIX_FMT_VAAPI, -#endif -#if CONFIG_MPEG4_NVDEC_HWACCEL - AV_PIX_FMT_CUDA, -#endif -#if CONFIG_MPEG4_VDPAU_HWACCEL - AV_PIX_FMT_VDPAU, -#endif -#if CONFIG_H263_VIDEOTOOLBOX_HWACCEL || CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL - AV_PIX_FMT_VIDEOTOOLBOX, -#endif - AV_PIX_FMT_YUV420P, - AV_PIX_FMT_NONE -}; - static const AVCodecHWConfigInternal *const h263_hw_config_list[] = { #if CONFIG_H263_VAAPI_HWACCEL HWACCEL_VAAPI(h263), @@ -706,7 +711,6 @@ const FFCodec ff_h263_decoder = { .caps_internal = FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM, .flush = ff_mpeg_flush, .p.max_lowres = 3, - .p.pix_fmts = ff_h263_hwaccel_pixfmt_list_420, .hw_configs = h263_hw_config_list, }; @@ -724,6 +728,5 @@ const FFCodec ff_h263p_decoder = { .caps_internal = FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM, .flush = ff_mpeg_flush, .p.max_lowres = 3, - .p.pix_fmts = ff_h263_hwaccel_pixfmt_list_420, .hw_configs = h263_hw_config_list, }; diff --git a/libavcodec/h263dec.h b/libavcodec/h263dec.h index 06ff7c1c48..89c5fcf58f 100644 --- a/libavcodec/h263dec.h +++ b/libavcodec/h263dec.h @@ -38,8 +38,6 @@ extern VLCElem ff_h263_inter_MCBPC_vlc[]; extern VLCElem ff_h263_cbpy_vlc[]; extern VLCElem ff_h263_mv_vlc[]; -extern const enum AVPixelFormat ff_h263_hwaccel_pixfmt_list_420[]; - int ff_h263_decode_motion(MpegEncContext * s, int pred, int f_code); int ff_h263_decode_init(AVCodecContext *avctx); int ff_h263_decode_frame(AVCodecContext *avctx, AVFrame *frame, diff --git a/libavcodec/intelh263dec.c b/libavcodec/intelh263dec.c index 2c216b00a6..f8eeb6b44e 100644 --- a/libavcodec/intelh263dec.c +++ b/libavcodec/intelh263dec.c @@ -138,8 +138,4 @@ const FFCodec ff_h263i_decoder = { FF_CODEC_DECODE_CB(ff_h263_decode_frame), .p.capabilities = AV_CODEC_CAP_DRAW_HORIZ_BAND | AV_CODEC_CAP_DR1, .caps_internal = FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM, - .p.pix_fmts = (const enum AVPixelFormat[]) { - AV_PIX_FMT_YUV420P, - AV_PIX_FMT_NONE - }, }; diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 65d4bf429b..07de5d6d91 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -3865,7 +3865,6 @@ const FFCodec ff_mpeg4_decoder = { FF_CODEC_CAP_ALLOCATE_PROGRESS, .flush = ff_mpeg_flush, .p.max_lowres = 3, - .p.pix_fmts = ff_h263_hwaccel_pixfmt_list_420, .p.profiles = NULL_IF_CONFIG_SMALL(ff_mpeg4_video_profiles), UPDATE_THREAD_CONTEXT(mpeg4_update_thread_context), UPDATE_THREAD_CONTEXT_FOR_USER(mpeg4_update_thread_context_for_user), diff --git a/libavcodec/msmpeg4dec.c b/libavcodec/msmpeg4dec.c index 5b10d8f225..bf1e4877bd 100644 --- a/libavcodec/msmpeg4dec.c +++ b/libavcodec/msmpeg4dec.c @@ -853,10 +853,6 @@ const FFCodec ff_msmpeg4v1_decoder = { .p.capabilities = AV_CODEC_CAP_DRAW_HORIZ_BAND | AV_CODEC_CAP_DR1, .caps_internal = FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM, .p.max_lowres = 3, - .p.pix_fmts = (const enum AVPixelFormat[]) { - AV_PIX_FMT_YUV420P, - AV_PIX_FMT_NONE - }, }; const FFCodec ff_msmpeg4v2_decoder = { @@ -871,10 +867,6 @@ const FFCodec ff_msmpeg4v2_decoder = { .p.capabilities = AV_CODEC_CAP_DRAW_HORIZ_BAND | AV_CODEC_CAP_DR1, .caps_internal = FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM, .p.max_lowres = 3, - .p.pix_fmts = (const enum AVPixelFormat[]) { - AV_PIX_FMT_YUV420P, - AV_PIX_FMT_NONE - }, }; const FFCodec ff_msmpeg4v3_decoder = { @@ -889,10 +881,6 @@ const FFCodec ff_msmpeg4v3_decoder = { .p.capabilities = AV_CODEC_CAP_DRAW_HORIZ_BAND | AV_CODEC_CAP_DR1, .caps_internal = FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM, .p.max_lowres = 3, - .p.pix_fmts = (const enum AVPixelFormat[]) { - AV_PIX_FMT_YUV420P, - AV_PIX_FMT_NONE - }, }; const FFCodec ff_wmv1_decoder = { @@ -907,8 +895,4 @@ const FFCodec ff_wmv1_decoder = { .p.capabilities = AV_CODEC_CAP_DRAW_HORIZ_BAND | AV_CODEC_CAP_DR1, .caps_internal = FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM, .p.max_lowres = 3, - .p.pix_fmts = (const enum AVPixelFormat[]) { - AV_PIX_FMT_YUV420P, - AV_PIX_FMT_NONE - }, }; diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c index ab72590a8e..ff27d1b4d0 100644 --- a/libavcodec/wmv2dec.c +++ b/libavcodec/wmv2dec.c @@ -599,6 +599,4 @@ const FFCodec ff_wmv2_decoder = { FF_CODEC_DECODE_CB(ff_h263_decode_frame), .p.capabilities = AV_CODEC_CAP_DRAW_HORIZ_BAND | AV_CODEC_CAP_DR1, .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, - .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, - AV_PIX_FMT_NONE }, }; -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".