From patchwork Mon Feb 5 23:33:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46061 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7b08:b0:19e:8a94:b663 with SMTP id s8csp1073679pzh; Mon, 5 Feb 2024 15:32:10 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVMkn6NScEnaRPTuONMatbgzXB5afsPnl51XdN7Dtzi1OJHIVWqF9RIakPvjqQ/JezSH0g6c0/2Cr6EJwBqIvAeOhaLH3iUbRMMtw== X-Google-Smtp-Source: AGHT+IEx+Us8fP0HBIVNUz1utbwN0eG1fBZ78rGlTfoT6sl3zA8xKUFKXtvFdvxVhb15N3bUdhma X-Received: by 2002:a17:906:dfef:b0:a37:b45f:f4eb with SMTP id lc15-20020a170906dfef00b00a37b45ff4ebmr560599ejc.4.1707175930657; Mon, 05 Feb 2024 15:32:10 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCVqAN7zEGQtWn6G3UJlXBY+VqfGWdl7cm3t9B+5P+0tNLaEYeOfwXj8r8DOIr2Ht9pSZ38husH8h4KFoqOd2a8h+JVQZh3OV+b9P09iY9+y2HKXFrn82KgYt6dvaCctLhjrJEgBX4uLd+s0lCqZX7o0svLKjfY7un8yNQFuuZsY9KPdBdTyBD1w9yWB11tBhjV6C9M1stqQDJ9UxhIykaP5Wtnc3RKN5PvyeQmqUIMq4Yu+DtpTpLvcV+euMdXRD2qfgsQygH+OCRqCNx0AN5eNrrGmWG9JMEKP6RjofueqtLdrU+tfGyUKy82ncu9DUOj5GpRfxRzdobPdN8NOeW/QaqDA5neQCiduEAYzFihUaGyI02dJhA1vOpo14kwSLassBtQNtFPdhldPhfUQF9Uc7CDfGmauERjwor/gUiAGCor8TOkYVMCv/7R/ynY442Iq5o2sprWVba+ZKmnnaSyTEq6eOpFEDaI6nAh6Iee1vPHLtShb/lEEUVHrcJJZkOqyszGXo/pgPq6TFWQVpzshxXZMaLQOVNAc+nX10ByfaMcTam0+g3nbJbJ/j+O6+q6rUG0BaqoqycO+F355RUekWjUjn36o7ZSQx63XKU+7XZc+EB2vbe6Q9ZkpG+fYzm1cbbkRpw9ibIkVvYU3b8yFUwym8r/IuxzQS39gIQRVfdEM09Y4H7o1ZoZaZ5r1/J5LxQiVS/hEuktQLBJPqJMF4IeMWT4BrkMuJmYDPweHi+AGrPMZ7aOR5dMiDObZ2pVUDeUyVhR2l1DrmR0Ith6gyl8pcMTQa/W70EdZHp5qn5QPmnVW8g1qJME9v0ypwqs41dabX3L9IvLeMLSiS1T1Ckvkcghf5mZ/HUCP8SFqUsBwE8YUPQQGy0r/pHWcqPJec+zJ7LM7Be6BSQqhSmTWQMmAJFcy+VTSnNocMS3f8hlztMDcPvM1HwhyrZfLLyFCk+ vJn+4mbz3UBr9yilpYP47x6wJgHprW4KninZcBIt9Q9PIksH4CAUNqfTTXzTvfoiyeifwxvQmiJJ5zhjNw+DaL1/j7g/PUpvIGulUh3rEaq3iS+59beUnzYzm67G6YEBOQX0YvJc9jYzhYHAZcpbNWoVVku5GZPITUyF84NtdxgsyoNdsSG13y9d/ckEeonD4IV/7aEBSq0i9rtywax/hdtPBs0yTK6Fie3JfNDN10o+1WtMrsPofQ5CG3GiUdaMYlbFv+S6wc37dONTRjkmDdcsyXiyC+Iu3u/hNSdzB6tyKdbvo3UNLFmPTag0NvPkQKTnhe+xpxRnyNJiwndsJ1fBkw8En92X0BpAu4JYuMgQ7DZ7jaxSTtHwc4qpe3gvQsBSwSOIh3mx9UkaJrJ+Zk6AuyceHQFDF523C8gNgjSehNSfrFrWLdjpo+acq82C4TXLT81d42n8Js6JAQk3UWKGp06Eq8uxvdTAPO5YYguD7Fkm0GdWFJ8YsbSvlXRzzinB7XdNmOSa6DOp39eL4Zw5yjoDitAiUh2eikcX1oaHgzRTwef0T0Y4tAXtD0DjnTGhUTDrF1WycEUXz8fWCJnm/fQQ== Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v9-20020a170906338900b00a37b5c25106si363116eja.534.2024.02.05.15.32.07; Mon, 05 Feb 2024 15:32:10 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=Mp3ErE04; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B53F668CD88; Tue, 6 Feb 2024 01:32:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02olkn2074.outbound.protection.outlook.com [40.92.49.74]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1362C68CD88 for ; Tue, 6 Feb 2024 01:31:57 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cQeoWCEiVAXuqKnuyAFdDUy/ov4/Ke0kNwptC+XcGqOqaAHCiSwOdfP84I1LnAuz1WTuXstvJjDqRNflNaVombyYtBOh9hB48/Y+yoH4vyIl8MDM+qCaOJn3m6H6OAc9pohm7hwzseK3B+qCJ9Z/arKKTwIdi0x7pazqljcSk4tNcCCLbGDqWqx30Lf21q6AW3h62S8uNupouWMLCfVevPOpge8P/Tkx8ScRMwIM/geXG7mhclI34EwDGbWZLqACfG6JNt8lhFoHhX7ijh5uGJlFGNXcs/FYwwkAYFvMyYt6/IBpvFTJ1FAQYzBqbS0svdq+Xk5rBu4NQ1rWn5oKZg== 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=dvrM2YkhCjPkgzb9Sv8jyjdQ5gQGPVSy1mOld1JAiIE=; b=UnEzocO0fspVrsq1ffLqwVET9J3pCbx35fDk+kwgb7vV9YNoyJOZ/GwCxbjluful/7R1w5V/eQYaSM6NAX/mynV1UV/wekF5+fLCuWfvwPEYujE0JR/7QhhQ/8kvCCieixJVB9biiPFOxcbtKMqPX8lNqLX+JkT8NlynFAKDUt0LAbFIYfP3AFMNodW/EtAMxSRWACFrrFOubXAQHos56X5hIvp0cafpsoysNiBvlENldCc51T1UBul4VAywaHqFobNQBOzJi0xhGgGM4f14q6rjmTP2hAJx3opJu5HUVaaDUk2L+SBFJbUdKYedPc8k5KHxc450fofaIohYPD7Zzw== 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=dvrM2YkhCjPkgzb9Sv8jyjdQ5gQGPVSy1mOld1JAiIE=; b=Mp3ErE04JSGtK5M0EGLbJUJ8ZFuLgVHRn4i2cP9O4UIN/npCCQmPY47JEnC0Ej3aRYOaSIud0de2gCF3gGoFiLN6g+qbyqEgNnvLorUfCt6CnjxbMMakXs/zmUbXzbFQRfAYDL86UehnZ/ufHnKQGaLqIiIgIGmnVNYc1c9WsuC7+E9fr7Qlj6O6vLz7Jzu4cnM2D0aUD1F6UZGOXRQttxRHR3iatRO557ugo1LfJmmvg7MVldREc3TH+ieZge+LRNhI1xuk6qVrEQECrP7a1OUASk4/USX+bMae53M9V6BEiIyvhm5LaBRdjb3Gvz8GinZ8e2PRVU5bgeeSaJcpJw== 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:31:55 +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:31:55 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 6 Feb 2024 00:33:35 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [n8u8+l90Tcrvw+PTWFaGJlUXDxq2DmUpP02sE2uytS4=] X-ClientProxiedBy: ZR0P278CA0217.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:6a::15) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240205233340.3950309-1-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: aed1a23f-2c6f-4c34-50e3-08dc26a2a364 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CmFGz0PM2HdnIqBymNMF5lUarGoAbIU/TQnUryel2ukPjKJKnhHOC5jbwVn6bE9FMl4yhFZjq0dZPkTUoINKLpEnrlecfpaiYHTAokfngHTToixVaDi1w+H0teK3Axv5AneVG0gIZju3FeIHXIvymPU72WVmmnMNedli+aT5YUICv2iBPr61q3Cd/+4YuojcsJKN3qLARqjdIBNZsYTtIzd8KerAA31pypcUrepNolxuLXDdQt9vTmPPyGalnouJD7o+bt3pRTqlzHuEpJM5XNtCpQ2QdHN75szmc2IlDiYijVGEIeR4nEah5z8RBbjq23KwQvkitUFizVKH4Wlq0sgx6zsF5dY27tCTfPHYkRhpic3Z4ElLlxYcUsJM6cylH7b4MCy6LUo7FibxbGeO0Sj7eA4FI2z2YFp4TUHRnJjHCu3Ktp9eyxL8JDFiL7bZ6mFZ6wXz60HRFce8nG8LAV0XX1PcMHm0791W1CUfr7zG9RpcZ24iaVJJaMeACs1PZTvvtw7LxYRiiS1wnjl+q+sBK6swY5bVW81r1WXLM+mAy83B6dTH9EL0CIexKzJHCsvNOS8LLln32+0EqcEedfG2SBDiGhO6Bi5PZZKspH1WgKrZm7PrCNjc4/m/C8TW X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NcX7OG+7LdSggCUtsYRfyv8MoP/VvYoPzYWb7oim2eDvWdOHDOzWTctefH95XRHJgTvlOimW29VXoSna1yOTxlnAldSyjilzZXetZxNG7QbgfLIC14Umrl40GVYIn/QL93/8N7q9wnNzSaH3T08lN3uzsavd7qJr9uenmJL+TviDiE5J5v7p1EQrWAglCg4/tDGcRodzl9Pij3r2F9w54Kq76oiFaBwgWgOiCrNrY6UJMvgGXssNDrbWrXo967CmyB83tLI4FC1CTBRNZzDPj5nzNj70Wt14ekWODYIVh6WfqvwmCL6Iu4uO5y3dyPTQyxi6FV+pAZHGsC56/YukO/kZmjViV/Nj+4j+P96FzWrdyMipU74SWvHroeKpq1UxCBQhNLY4PlvFl/fKkIGBf9pYeMy8VgWPt8OrI2YX3YGMXgZ4GGevSWIQVZAcCOT0TWtTfqJKcjBPHaFo59Hy2hQaOHDMrBm5sK9SjBYcvxk00EBvOV0FfO7XggyvEjzoGQ1R5fYP6BJZzsIj+gOmMexIjI34Q5bfrijOs2lnWsdqjktQzqEz+sXeTGiGPzckzp5aQW1kkdu0FjyLxMJAzmTuc3pfRj4chlOcv3UGVneCcGArXpzddIMDBQLHiLyMWBBFNMVB2Ocnq836qY39yMxUhbUOFdctYZzmntgSL4Av+v+XRVXCNIcVlXpIjRES14unWaxW57sTx0GeNP3rfdU7b2LRGORn0uwFDwblV2WWe9dn/2NfSeZzBgWNXutdu+RJs1y/gi/7dTRH/u+gvFpmKJ51LRD+ajT5fJ8Cpt8ZTQW+iW6o4xQj+KDy1/aOzpHXzDyOz1x0enNbHeR05b5cexPhIGZYEv+VfkNMF5+mT4HtjxmYOsVzKO+jLRNZsTLhHRQ6YKUhHxTk8e591ZuX6JatOg3NbuuMKJpEYIVG1X55Cq3lWuhojCJgqKw3r6g1E2hSQWyAaKRKEDRSN5OO+y7DA9sRw0t8IHp0ub0gm80bCNv5frBBDr/AbT4Upf7A4CT+Q3rDlNmrBJOkdqW96KLmzC+5j5gleLyTuP8d3/ZtbHSFfpEKiKoA6ZiSz+hwD5xd+Kc+qG40tOGtwOSJouly0ghX4H5ugbqO54DLkS6uzxs7hKkHM9HAfNNQFDLIv7NUK5vh0xdZpursGSQtcGnaa1kMMskD1+l7m+nq7DCpv86BV7hou19ViLz8TR4Z3SIPN5qFSTw33JQtY+BfdF6xNTZxgWCiY7gXymVO2Egm1FUj5mIlJlH835+F X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: aed1a23f-2c6f-4c34-50e3-08dc26a2a364 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:31:54.9977 (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 1/6] avcodec: Remove redundant pix_fmts from decoders 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: x2CKebK/HvHI AVCodec.pix_fmts is only intended for encoders (decoders use the get_format callback to let the user choose a pix fmt). So remove them for the decoders for which this is possible without further complications; keep them for now in the codecs that actually use them (by passing avctx->codec->pix_fmts to ff_get_formatt()). Also notice that some of these lists were wrong; e.g. 317b7b06fd97cd39feac7df57db22a30550351ff added support for YUV444P16 for cuviddec, but forgot to add it to pix_fmts. Signed-off-by: Andreas Rheinhardt --- libavcodec/crystalhd.c | 1 - libavcodec/cuviddec.c | 5 ----- libavcodec/flashsv.c | 2 -- libavcodec/libdavs2.c | 2 -- libavcodec/libuavs3d.c | 3 --- libavcodec/qsvdec.c | 11 ----------- libavcodec/rkmppdec.c | 2 -- libavcodec/rv10.c | 8 -------- libavcodec/rv30.c | 4 ---- libavcodec/rv40.c | 4 ---- libavcodec/svq1dec.c | 2 -- libavcodec/svq3.c | 2 -- libavcodec/xfacedec.c | 1 - 13 files changed, 47 deletions(-) diff --git a/libavcodec/crystalhd.c b/libavcodec/crystalhd.c index 86f6cfa6c1..fb190436f5 100644 --- a/libavcodec/crystalhd.c +++ b/libavcodec/crystalhd.c @@ -797,7 +797,6 @@ static int crystalhd_receive_frame(AVCodecContext *avctx, AVFrame *frame) .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_AVOID_PROBING | AV_CODEC_CAP_HARDWARE, \ .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | \ FF_CODEC_CAP_SETS_FRAME_PROPS, \ - .p.pix_fmts = (const enum AVPixelFormat[]){AV_PIX_FMT_YUYV422, AV_PIX_FMT_NONE}, \ .p.wrapper_name = "crystalhd", \ }; diff --git a/libavcodec/cuviddec.c b/libavcodec/cuviddec.c index da37207cf2..84edf5c209 100644 --- a/libavcodec/cuviddec.c +++ b/libavcodec/cuviddec.c @@ -1174,11 +1174,6 @@ static const AVCodecHWConfigInternal *const cuvid_hw_configs[] = { .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_AVOID_PROBING | AV_CODEC_CAP_HARDWARE, \ .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | \ FF_CODEC_CAP_SETS_FRAME_PROPS, \ - .p.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_CUDA, \ - AV_PIX_FMT_NV12, \ - AV_PIX_FMT_P010, \ - AV_PIX_FMT_P016, \ - AV_PIX_FMT_NONE }, \ .hw_configs = cuvid_hw_configs, \ .p.wrapper_name = "cuvid", \ }; diff --git a/libavcodec/flashsv.c b/libavcodec/flashsv.c index 8a01e3a4b6..fe00e529a5 100644 --- a/libavcodec/flashsv.c +++ b/libavcodec/flashsv.c @@ -511,7 +511,6 @@ const FFCodec ff_flashsv_decoder = { FF_CODEC_DECODE_CB(flashsv_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, - .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_BGR24, AV_PIX_FMT_NONE }, }; #endif /* CONFIG_FLASHSV_DECODER */ @@ -579,6 +578,5 @@ const FFCodec ff_flashsv2_decoder = { FF_CODEC_DECODE_CB(flashsv_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, - .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_BGR24, AV_PIX_FMT_NONE }, }; #endif /* CONFIG_FLASHSV2_DECODER */ diff --git a/libavcodec/libdavs2.c b/libavcodec/libdavs2.c index 179d2f4e4b..5a605c36f6 100644 --- a/libavcodec/libdavs2.c +++ b/libavcodec/libdavs2.c @@ -234,7 +234,5 @@ const FFCodec ff_libdavs2_decoder = { .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_OTHER_THREADS, .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | FF_CODEC_CAP_AUTO_THREADS, - .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, - AV_PIX_FMT_NONE }, .p.wrapper_name = "libdavs2", }; diff --git a/libavcodec/libuavs3d.c b/libavcodec/libuavs3d.c index 66e8d31001..f5d47f28ed 100644 --- a/libavcodec/libuavs3d.c +++ b/libavcodec/libuavs3d.c @@ -274,8 +274,5 @@ const FFCodec ff_libuavs3d_decoder = { .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE | FF_CODEC_CAP_AUTO_THREADS, .flush = libuavs3d_flush, - .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P, - AV_PIX_FMT_YUV420P10LE, - AV_PIX_FMT_NONE }, .p.wrapper_name = "libuavs3d", }; diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c index 559f63698a..812bfd8830 100644 --- a/libavcodec/qsvdec.c +++ b/libavcodec/qsvdec.c @@ -1127,17 +1127,6 @@ const FFCodec ff_##x##_qsv_decoder = { \ .bsfs = bsf_name, \ .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_DR1 | AV_CODEC_CAP_AVOID_PROBING | AV_CODEC_CAP_HYBRID, \ .p.priv_class = &x##_qsv_class, \ - .p.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_NV12, \ - AV_PIX_FMT_P010, \ - AV_PIX_FMT_P012, \ - AV_PIX_FMT_YUYV422, \ - AV_PIX_FMT_Y210, \ - AV_PIX_FMT_Y212, \ - AV_PIX_FMT_VUYX, \ - AV_PIX_FMT_XV30, \ - AV_PIX_FMT_XV36, \ - AV_PIX_FMT_QSV, \ - AV_PIX_FMT_NONE }, \ .hw_configs = qsv_hw_configs, \ .p.wrapper_name = "qsv", \ .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE, \ diff --git a/libavcodec/rkmppdec.c b/libavcodec/rkmppdec.c index 5768568b00..53b6f6d5e8 100644 --- a/libavcodec/rkmppdec.c +++ b/libavcodec/rkmppdec.c @@ -575,8 +575,6 @@ static const AVCodecHWConfigInternal *const rkmpp_hw_configs[] = { .flush = rkmpp_flush, \ .p.priv_class = &rkmpp_##NAME##_dec_class, \ .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_AVOID_PROBING | AV_CODEC_CAP_HARDWARE, \ - .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_DRM_PRIME, \ - AV_PIX_FMT_NONE}, \ .hw_configs = rkmpp_hw_configs, \ .bsfs = BSFS, \ .p.wrapper_name = "rkmpp", \ diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index 216328ffe7..d32faa628b 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -671,10 +671,6 @@ const FFCodec ff_rv10_decoder = { FF_CODEC_DECODE_CB(rv10_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, .p.max_lowres = 3, - .p.pix_fmts = (const enum AVPixelFormat[]) { - AV_PIX_FMT_YUV420P, - AV_PIX_FMT_NONE - }, }; const FFCodec ff_rv20_decoder = { @@ -689,8 +685,4 @@ const FFCodec ff_rv20_decoder = { .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, .flush = ff_mpeg_flush, .p.max_lowres = 3, - .p.pix_fmts = (const enum AVPixelFormat[]) { - AV_PIX_FMT_YUV420P, - AV_PIX_FMT_NONE - }, }; diff --git a/libavcodec/rv30.c b/libavcodec/rv30.c index be62577f99..9e13e71805 100644 --- a/libavcodec/rv30.c +++ b/libavcodec/rv30.c @@ -303,10 +303,6 @@ const FFCodec ff_rv30_decoder = { .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_FRAME_THREADS, .flush = ff_mpeg_flush, - .p.pix_fmts = (const enum AVPixelFormat[]) { - AV_PIX_FMT_YUV420P, - AV_PIX_FMT_NONE - }, UPDATE_THREAD_CONTEXT(ff_rv34_decode_update_thread_context), .caps_internal = FF_CODEC_CAP_ALLOCATE_PROGRESS, }; diff --git a/libavcodec/rv40.c b/libavcodec/rv40.c index 3ee405f33c..e48aa1f684 100644 --- a/libavcodec/rv40.c +++ b/libavcodec/rv40.c @@ -581,10 +581,6 @@ const FFCodec ff_rv40_decoder = { .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | AV_CODEC_CAP_FRAME_THREADS, .flush = ff_mpeg_flush, - .p.pix_fmts = (const enum AVPixelFormat[]) { - AV_PIX_FMT_YUV420P, - AV_PIX_FMT_NONE - }, UPDATE_THREAD_CONTEXT(ff_rv34_decode_update_thread_context), .caps_internal = FF_CODEC_CAP_ALLOCATE_PROGRESS, }; diff --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c index af02063a45..d2cfe4cf40 100644 --- a/libavcodec/svq1dec.c +++ b/libavcodec/svq1dec.c @@ -863,6 +863,4 @@ const FFCodec ff_svq1_decoder = { FF_CODEC_DECODE_CB(svq1_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, .flush = svq1_flush, - .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV410P, - AV_PIX_FMT_NONE }, }; diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index 2d03dbc457..d2f53742e1 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -1602,7 +1602,5 @@ const FFCodec ff_svq3_decoder = { .p.capabilities = AV_CODEC_CAP_DRAW_HORIZ_BAND | AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, - .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUVJ420P, - AV_PIX_FMT_NONE}, .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/xfacedec.c b/libavcodec/xfacedec.c index 378d6aea0e..78b70cae8c 100644 --- a/libavcodec/xfacedec.c +++ b/libavcodec/xfacedec.c @@ -182,5 +182,4 @@ const FFCodec ff_xface_decoder = { .priv_data_size = sizeof(XFaceContext), .init = xface_decode_init, FF_CODEC_DECODE_CB(xface_decode_frame), - .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_MONOWHITE, AV_PIX_FMT_NONE }, }; From patchwork Mon Feb 5 23:36:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46065 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7b08:b0:19e:8a94:b663 with SMTP id s8csp1079989pzh; Mon, 5 Feb 2024 15:49:24 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCV52sfllCIvMrrHoIEIiq4LRL3l0RMfPbOgoPSoUxAnqTpDgkYM35fc6u4IFWJk99PIzF9DEQ0gC0UlaLT6Gb8ZOVz6RarA3S6PBg== X-Google-Smtp-Source: AGHT+IEPdV4Ds9trQ0KQk+/KtL7NoGOEn738KjE9W9XHcqPLwO0DvSCy0rjpZg0JfXNYt/MQRT+K X-Received: by 2002:a17:906:b78e:b0:a35:147e:a2ef with SMTP id dt14-20020a170906b78e00b00a35147ea2efmr552003ejb.6.1707176963923; Mon, 05 Feb 2024 15:49:23 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCVBj++mODG5x1Lc9SPqWXZ8Z19qLY40SxQ0BxhB7EVzi0pDoMZevtLhhBqUFB/nkD/6WfBQt/5zPWvCWUVyx1kWT3zoKrxP760Sk9cxmqqx6X4wIcqnEiKv+Kt22g4bM6yb7iQWHQHl1PmxHceDUWJ5SnFz3ihwbJ/rDsEL8A7sJtI+Jm5wdsHpkxzZAGx70DBR6KHE+5z/djgtdTWSXY/CSUSHzMd35Bd2Iwro9IxD0cDZI4IR+miRv5z1yjegsGe0g1Hml1N48M5GZ5Fp2tiY2AE1EMGq/w9bjM4hBhw49y6rD41Fuk3Hv16cwVBdHK2fuF0al4X2OJBtW2Cx+iMn7qzFoiFvtkjHZ655eqegv3qCtrQuZ8MwwLufxESdvaKRQUN5N9QlOw5hb8k0mJ3jzi/er/L3zZsEoYKINY+5AiYIXeUKt3yzS6RzABry4f3B0kTxDXNdBB1CSybq0Zff8xIhFtx6HYJt0hhF5Z2n08L62qlHV2av9FVoAXGgS8hnaYI6ZUi29yN1BZCZafuTavVU1ciGRp9+SG9Ge6GD4jgvVXx7MBjMJvt57aqFnDg+tkoKCG/hMzHk2zBjqI/6Izoim4sdXx/+MZlnRQHVR6ow5sXE43pyov6mU9qEQvmw0KHVEoG0HK+SrofwcUmAzgmFwUDZ411LImNJk4OAOwZ8bRFwnae2JnarX2zGVR4OT7QjQWc+qFYFfg0duftMe7s49rC5+lTJI0uYj0DtQXyfZN/QeT7xa0ZNAZETuoGbcafDpmdf43W4DpPswD1uQUw++92use9RRo6a/DkqqI4VENj8awMlGeugTWHyWE4jWdRjpE3f38SyEb4k5vXo8S9mEpURQkl6AS0GDjTaAgNlDGuDEJt4UDEJjAHhH5/9/E0vobdc+GSxVfPK9lTvuW4rkz6VxwZk1WKLgj69nnsEalNg5564oSZSqr3+83zeR2 tRb280QPQ62Yw6amxC5Nqb8zumvuDoYxPjLJWHwkds0djsMXuOing6GO4FM5MXTyBMix3qqr9jhrz4iK0K9Nir8/u9MgaOX0hOFbwTmUzpEgEs+8d5P1FSNYHdpTuqlp/OFjCB76NzaEi/H0hFVLH13DjryMl8BIi2Q6Hh/H3zEjecBLz523OcY8G8jmIS5Ihn8J8IPj2qjzwheosFfkn4LiVL5kL7xmfpRkzJya15mtDNqBx+NUerzcpoLpc1qcUWI/9ioTuSg1m6paky1QRTRPTnqeWAWaIFHHu1Ifz3O1LmLaW537dt6QVr863dqfVoF6lwoZX0i2Qdnc21Kw7EO6QrdAEl4ctXw7+QCHaBPvlKg4kcxGZF2hEot2jOcYJe4eFpSVskuxfzNIkxzTma62BV6ZBJD8NloC2n5LlRgJxHo0g0SPgoFABMWufy5LZnX3HLihaT1IWxMharNXZc2pkq25bqwYo+Y2fJqH7xriEW3gT3h/seW9a75/TyZSpDtasahfr0UGgCb/i4vR38sr4d9emLZf7DBqe/12PkKDIm7voiz6fosZlcBjKYXEzpT1sTHrsCd/86F0UIFWkYnyTsZg== Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h10-20020a17090619ca00b00a35b1e2e0d0si376840ejd.1.2024.02.05.15.49.23; Mon, 05 Feb 2024 15:49:23 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=i2zKv+Y+; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 85DA968D14F; Tue, 6 Feb 2024 01:49:21 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2049.outbound.protection.outlook.com [40.92.91.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9E93868CE0F for ; Tue, 6 Feb 2024 01:49:15 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=O7MBkid7aS5cp0kEyOjzmZrexcpongv0dtz3rH2dDtdleF1IyCEy8ocLCpC7qOXKJEC6y/OOHCMYkTCOUrfpcLWPs7XIkIv3sysiuMGCQ3fGKu9NuJYpg0FfPQXelCjE5bnWKjYmfzZJQ5uag6uMvOelLforPfGhjfNBnk5Gvul6K5dsm9+dDl2XoAC8yWkyurhWbjZQzXw1EXe6rDCUZqwA2HXecUk62LB4JYQWKNLzFnzUnYURCohnnVO0bY1TS8I1/alkqidUPNll1CHgZlW3/nqQU6CixajPqVgxFM4KW1WzHF4ZT0QFF5iG6BE5/UdUqiuxTxwMxa1nAvEd2A== 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=NztNmXF0LjorX6GaCleKkYU2hCC5EZhLHA9Njt8zLTI=; b=KhDFcXE/HoXvcSbkHLSCfCk4V8S1OW6G3Mub8hDuC/n0hbIxypbvRY/SYwgv6nyM3kvGYXL0lys4GPt1UeheP04kxLhITZQ4nBSSyU7WishR1EGpfLRAoWHc4RjCE4zEuoxUN/bbo0BJ3g+v0H5z3+HLaozgSmKB2BPsxMQ+BZmr/KeFGcDHsfzjR3CUpGddGxEeLZmHCVmB7Mzke1HTh2QGhCBQobNaqKSV784XXMLE12eMVtlfIL9OboFBXlfMVAeUJ2KoBQ/cqU1vNHPZKZR/3CEQfi7PD9Qj/bRAlYsGK5WaXmWIt3CCiERWCGham2eSsOJIYvD5BGkfVWrYgQ== 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=NztNmXF0LjorX6GaCleKkYU2hCC5EZhLHA9Njt8zLTI=; b=i2zKv+Y+YKxXxiMzf/TsWMHxKSF4/Dpt+5DxXUH/TWI/NPyuIectY/8sdXoKF3Xet+btkkXa+FARb+P4Wme5aOm40sSCboSGz0VLo8STdH14qfoGWFP79he5ddekQ+MV1nwVBXL7LxbiKRhVJgfIs5IRNh1e/Atb8U0Is2hpM/seElMsMaQGsbXfM/hFugA+MAc7BGmzjUnQRgeAkuCI8EOg3tsAt7SeXnBULDw7WEB5BCEPBKXEButzogi0eWb3093kP2XF3bXMCdLmhkS5SHnRcf26tUQMGXb4bZTT7ejgEAdlnkCwAaNppsDwzDqFzq7DwR16r04kfoaooS+Mzg== 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:28 +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:28 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 6 Feb 2024 00:36:10 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [Ah8hbfyY9bHMe5plEo+J8s++MSiK3H5v] 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-1-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: 7ba65430-b665-4487-d89b-08dc26a2fed1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: g29RH2P7EIdHS0NNC+qOmcaiL7oO8Pc9+pBiY7d4GAOLuS2EACluVLR3hh5tgZDzrVtiwufbWOfhRAR4vlCeMEB+HmU4UAO1FemqwuaUfq2oV8S0Mp4hcyIHqNn31LMoN0nPofjrbU50yIj87/l2KWRc5DVyyRkOJ0BwbGJcK0n4vQYd5QIf+dGK5KHUAKvdB6s6lozUqiNXgBHS/uQK4c/F3TgU2rFKmgb7aw7/7mmGeECcdRqWUVTzOxYQnsP3eE2rCRXuFl7F0n/4h54Qo8FJ352GRAmhBnkqtQs8KU5JvP/yKrk5NJ174+pa4RO/2u0TNAFStutJe4A1j6z5miaWS7x25JHepQRm8mEiyJtUxLVKViAy3FNWJ/csnJ+C+I9C2apccYMGY2IKVYU+CflxpteKqcPT4yXE/O8WLAaI7eUk/s6reNQNQBZ3mt0Sc0OfaRMhXqDdWbzJqRzzubMY6DBOT4EriZW8AHSjnrs/6qsuYQ8lvUHT00UEYIuLRV47ux9Byd7If6KKVkrkemclYdy4AS9JDOyJtPMpxbKYcQQ6QejVMnXfljCQSXh5TInKmpwHeOKJQ6S+tdv6FVvT7/nvrY08vDoY3yJPc7Pe+WUu1PmXS4v0hnC4Xnr/ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pUihXiKS2eMuPvf15Icywm0epBLS3yG27ZW/1RgbyAI3XKVqm5mZloyfRl8mVOuaXngqC87GC8Qcj6DCTrcdJADHZs1S60TLOSdJs2wkQobfARfeNju/IGjRu62Sh8ZNqdI60lbDqzWD9+kDsLfn/s9vFGCV95cVg85vRfNc8xf2IA+H1loi64s0LQPOOXaWJS3jhB1BCV8H8Tj5BNcsyFfdMigcTrTSwvhthebGhuDAlk7XiY4ifmqgZBDy0+jhh+ler5NhCILgC3YMU7mQbv/lwoH3Q99VcVMYzz/TzXjT600xW81ylVz7t6BWD0jWY2ZJkYn+9x2HpmvfPnw3LLjSLWH9jaJKuFVKgRpTYX+FoNynQ792d8Nsfvc/qyx+dxjI5L4bxfq5pMQhoHpIS8RNRgO0ZUL2PPHNI3eVndkjSIorQcY/R1HefBTyr/PmBt85TRl8rFBS6aPtdZV7D/JKen0/kE5QD1/R/F4HEleLpXqoD9gz3WOh0JuJHli1rjpXXdvAHYwrnfLU3ojDhCZ1C6tCDIXjiDYR7laqsVm75L42jqv7tSaclAj/9k4CE/Y5PMIteWLlx/7H+rWs6/GhtyMM6CdR9nrj3DblMccWFdAD/OLlD+iontFOlG6bmBTlGecaDQOqdQjog+6h8I1rDJm1PGREKK+VNf6IaGKZp0YjiMt79Ro1T6049/zzWFINGh2nHUSh6xPnh1PD6Ey0+a3KzxiUJJzEGrBuDSzW+FLlgASrjmjhpWl/v3IG8KMGPbkJLwUZaONrEMjSDiNKQUnb5NNbGnCFT2JmVBM8qDlBHPf5yNixFhf9xy6pEqBtJuwoMYxI3ERe0EQxavMy3uXyroy7Y4q/8MyqFWZEfbGDAVCU0ll7xrNf5K+Zm17yh5U7XEfOOINyrr3ScqJoceieh0zIod3AVxZyFw84XnPhb8OD3X397DelP7V4sq0hNEaAoJemVAMudbLprUGkQwQCcHw6uc519BiLUKCarwh4UMVjSwK7HGiv9QIf07qvz++Yh28yFQOlZl5U0SrXBdhffPZQKeQlkblIuzq5GxoxgWtWH9iiVCH+e4w0g51UIDvNo6bT3Y6+BGpEcg1AhyigQzzmEuaBfOePi59pYT0xE//PwJC3DUTSBVD4VcNnCcs1YTd4zh2RF2NsupKM6ColIgXlJxH2ztWDRPGkgjExVz8XnXGjNNFW193OM5/LAiKlsdg+ZC9Oum/V9WsdSH2nvOJovLUHdRjqHRvP7EkkwCQ1cGnPNwEeOqnY X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7ba65430-b665-4487-d89b-08dc26a2fed1 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:28.3261 (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 2/6] avcodec/mmaldec: Avoid using AVCodec.pix_fmts 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: t53K4gd0Oruh It is entirely unnecessary to use it given that all decoders here share the same set of supported pixel formats. So just hardcode this list. Signed-off-by: Andreas Rheinhardt --- libavcodec/mmaldec.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libavcodec/mmaldec.c b/libavcodec/mmaldec.c index 2dc7bbee04..a8cda27570 100644 --- a/libavcodec/mmaldec.c +++ b/libavcodec/mmaldec.c @@ -101,6 +101,10 @@ typedef struct MMALDecodeContext { // packets (where each packet contains 1 frame). #define MAX_DELAYED_FRAMES 16 +static const enum AVPixelFormat mmal_pixfmts[] = { + AV_PIX_FMT_MMAL, AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE +}; + static void ffmmal_poolref_unref(FFPoolRef *ref) { if (ref && @@ -367,7 +371,7 @@ static av_cold int ffmmal_init_decoder(AVCodecContext *avctx) return AVERROR(ENOSYS); } - if ((ret = ff_get_format(avctx, avctx->codec->pix_fmts)) < 0) + if ((ret = ff_get_format(avctx, mmal_pixfmts)) < 0) return ret; avctx->pix_fmt = ret; @@ -844,9 +848,6 @@ static const AVClass ffmmal_dec_class = { .p.priv_class = &ffmmal_dec_class, \ .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE, \ .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE, \ - .p.pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_MMAL, \ - AV_PIX_FMT_YUV420P, \ - AV_PIX_FMT_NONE}, \ .hw_configs = mmal_hw_configs, \ .p.wrapper_name = "mmal", \ }; From patchwork Mon Feb 5 23:36:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46064 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7b08:b0:19e:8a94:b663 with SMTP id s8csp1079842pzh; Mon, 5 Feb 2024 15:48:57 -0800 (PST) X-Google-Smtp-Source: AGHT+IF5SvIuiEIKJr0T6eAq6amIPsRMyu35P4aLjQJSBgt9s1CvwQJ7tMs6Lk4C52QdnhicXeVR X-Received: by 2002:a50:9b59:0:b0:55f:d736:babb with SMTP id a25-20020a509b59000000b0055fd736babbmr442157edj.4.1707176936841; Mon, 05 Feb 2024 15:48:56 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCUX1p9XUBvQwk6kduq2Vk4YaPyeHPIfHMO+8TdAIaXz1ozGkiQAx02aJBH1/EzNwUxCVV2j+j+UF1rC18+RByuU0Kj/Ow/criU3cUl0l9ZxhsW/fqHxMhIqGS3mPP5CgHqFd3ME3KEHrVdc38I8W8CmFt3cXzpW6Yy616iPhJN9fK377ZdowcYQhXrHl2be/8f04eD5BdU1AgVVjM9hH400mDzKJj1qlnPOK5wa16zDU7ZHLAE5gLdFvpok6YvuJ3DAgZbG4Iup8VLeYRZIsqqjh1YyD4rcubd2ZaSM9Qsw5SEsAWaMi1G9fmlJgFLx0SEj/qTlhl/wFf3lzYn8ZDIue33YyCHAIVg3GsRr7yr2560gjb8wY8ZYbHUuwmP3nHHMJ0CFrPW/eqRvQtTQq14RCovlW72mu4jE0d5u6/dwclJX/MpDIT8DNg8SuXQJKYEI5xndmb86cEcRLkG53WkcbOXS5EYK98vvxf06GtgmQAiXdX7zJ3xubkaGBdjVZXi+3wXTQI2CK8iUxD14BldQGXEOdioFP74EJ4Dw52rvMXLwlXBNZugQk3r34F1K7YMLfAaosuRHn5fqfQ7cWn1W5VqYUXjc2Nj9BFk8jZ9RhN6En3tO982iz1PwgmjiuJnX9TLBrdzvNUouKsBR6UFuCQ3h1caz1WcgVWlgM9zXkb4VpAGcIElpZ257rMkgspkVS0dowC0qK7Mw/Gho1j1mWcY+NrwMs2TZSsEr+deKCiO3y0sq9bpV6isRPGne70cRNONV8ZpQDlKuUqeT1mJcEQ/m+MCp0SfrUx8Vyjl5E1we6pH9tpShgWFoqzzcNvvbJMI1a+FLVHwLbMlCHv+p36q3q9r6jVXEXTfhHJ0dsMKjshxpjDklrage8P7pajHdeGk1+Sp3h0Ry+gl+4E9GelCDlVAaBk8bioDnnO7EEI6syVYtP+beiJ1BqAFuZOwgVg TYWaJ4Pa4iCrDKZqV4ed0vHI14arGL2n9QIDFB9+qu3gWnIMQOmq863XcjALEeqk6vaOsCArf0uDIYZo+yd+xma4UdaUh/3JMi8FphFVz85bcDlZqWiUZTi730/xkAL+fWeJMT5JB5yL5xGlNkv9ZhSR3Ez6khChM4s4qTckfez1WE2QZEAFWVnlX8a4LompZ+tGEBW+uFxdN7kgKmBiXBo4ewxg8NJMc9/7LtkvAjXRESDMwajEbyqDzmkX84yIcjeJZAYeclKhu008Wf9YfmvApldVUYequV9Bgq2+VB4WfLF+2fVJX9Db5M4SoHYB6rhURZ3ccadQujl1/u6XYPeg1kKV34bshqAJC+hJxYgxZx81cHZ/fiGtTSbTjTbuzGyLq7f43Y13OkTyBqypZ/MvX/EBWjatyZML/10mGr+dDjTsDmJAPZMLlUf5ediKByBv4QxQi6IiD7uZGuKhtq5RLWTuGiUkaTMMyamBBXYP18GYY7PwiCU7UEBbzWMD38hhSQ5tkhM4yeCutJpugj1y4h5ZwVAw72DJIKa+bMKUKdsVyB33pYf6ZqpVT7I99uZyx3+7aEpOFRbeHpPZ0GEvQ4Q2I= Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x17-20020aa7d6d1000000b00560851eb186si409268edr.536.2024.02.05.15.48.56; Mon, 05 Feb 2024 15:48:56 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=YtO01G+v; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6E4B968D0D4; Tue, 6 Feb 2024 01:48:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2087.outbound.protection.outlook.com [40.92.91.87]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 38EF768C7B6 for ; Tue, 6 Feb 2024 01:48:47 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CvHpQBX2OuVfWm/PgvFcO5tfO8LUYjmLKwH7eHCeNxWxbl3sD04OFhskv1qdNyN8um2xD3wMof6Oj0pajEaveaKgvwUV5DqOFooH6uQ+XgyfBL133GLH6E4EIRLymn7Yh3gC1DyHJFP3KrLcWliTjSl77stpb5h5YPXPIUiHhCjsESRIqPOQvR+ldgw501E/xJHnGYD+zZAEVe2MoDYQyJvLbvS/Tv13h1QFA3SgLW8r4ZVU68KHBXT1ssJSiljNpNaJieEs36FcX6oq6SSPQCoE4pVAcO/TgdconWCfAU0OrgY1+BKfZJ2mhnf/bdqDD74k6hcuwdzDZuNQF9bZhQ== 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=mctGtv1N5mB24W3q2M+C5i99OxIq3IjLv9i0IY+jm6A=; b=nouYYSxHJo3H5IfmNGN207kX2jQDyBpGAcH+J/A8oludMj0nMVQw4SwmZPZI8Jkx47M4Y2wCfSbtKMrYNPWsvfXvGnQ3ij0YJxYdrxZdLJTnOnmKFXvAJNO26/l6UJ76H6FQaoRddF3S7Yp1MCxEPQr0kO2NhZsQKO+JKfxgsQBHtMmTc0qIQITF0vNH8WlcDNw5E5eeQcFbO3h09kTQc7KNMi9EFPLBj28U3wIfHKR9nIqWgHvelsp3IrfU97g3GChoB7Puk7dvMab6nG/tmb6sn2J1B3qifNV9157ETiYgQFmPpAae8XKmlW3GMHyWebsOewe9Jud8vjIVs2LcFg== 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=mctGtv1N5mB24W3q2M+C5i99OxIq3IjLv9i0IY+jm6A=; b=YtO01G+va2ytt52EWPAAqdX5EZf2QW+EM5Eo8xrQEQya+kftMTHNtNlZToKpQ7c5jI8u5DUStjVL1rVVh4i1jiHN94IdcglWtKADwSGl0Q/oyopIAp9YjnDplG/4gvhaph0C3fWucYnOzxeJyQwMs0VBR19FVRqV5zuddgwajWkkxktAp+qoHxiHcTKsE7UpdWqvHhxSQaYY9de+kxUuP9cJfUMP7gjCgtSi3LqOvBAE5h7kW5wjzVFGXlZomIiKaqCrgxuHkMjsy+TczYuObZmdt6ndjgmL1W/Ej20/iUVnkaVLiIAsA3eXR3NSULuVCzJT8fO99hAenNAIvSf7Zg== 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:31 +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:31 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 6 Feb 2024 00:36:11 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [h4KOfJMcMsVaicLFIyA6EMvbZX02sfOm] 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-2-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: fc28ac0c-9217-4315-7014-08dc26a3006b X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: f+hehb7nW/FCbCNLojU7F4r4KmxYYViul57H9CjuVLgIcUhZsVekFk2H0yTJpw5hc2WHNJ362pyexKl1Tzs2rqMrCJPN5I/utL+Y+VikvpytCMVAYsmQScsCvtvvp7P9vqV+S6uUKF5zHMHoXaPNyAjSsqUlHQk/Avj2+lYCbKWKQJmSTpVrP4uKX52JV0r5yaNknwvfeJUJvx92N3dUbif5bWUkg8Hag7VXIa3M3jEIt2XtuG9b6kZBS9qv9W+58eakEUel+YdGYK6Upm2XsSbFlXeGhLybxECR26Sm5khy+EA7zxEzorGrO6YUY3HOyAekOzBrNWdbG803ieFxekDUZ2/dRydYngRQnG2icb/8FRdttjz1WaGfREKxkDV71fZ66lvYuuynHZ7dGDeb02SX9vd0v8RGljxKiIGPaHe6D15BWVWzH1Ga6opkmIs+K8BeuF6lSqYK1Mahu9qM+oqZDgX5djqUZjTblDjDhLlDPQqbs9+VyZ18reEU0XryEU2xQDVMDZVo2fEaLJEiI7b9BlrtcnwNiF6SFBPG/1/Zmgxu1hPa0p3zryWeUQ9B424lrw4yCBJF0m+5hgOB/1rUrvaiPniZj9cXr79PeQ+kO+nBMAgr5P/0rLsfl7eF X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 95a5yK5DkfMZYgPjhf+wEgCRqgPsEE+RatIKvCKj2chDSYaxISyA8joKjzJlS7v9kg9Kj4/dnzJSfw+GQJKD+opqZAFMkSfqZgE7a2ldxlen2JZplkWSzbGg+9e/EF+Teq1kMs2oB2F2LciLxwJjCNQnOXYs2mlKPxcVqEpJ0Xyo44A310meuWp1XBfVngVSynS66R8T+WDcDFvZaSTOhpmqJLkprbHYQVHDSkh9W2oMhXONxjkDZfkqIeAXxWsbGsh6E6EYmlhrMzf0yj2wi8oSW6IzxflT7ZcryhZrXsY5rHl2fbZ4Xubtu95+JeDlD/3TkprXtprxd8s7F4hAWFalxKyMCCivqBUfoSFwk5Y0HY0IRJjoqB7CW7M9W4OotwfMizsCFF/elzr7q2xptUVdGG9l9V3g4xqHpsMXOXSKZ6qxV2X5Ul9CshcXz3+IT+t0tlRTnCj9XXPAL8LLxHetXV9c8A8m6wq1wAtLuSVPUJD5+1jE3exN7ZjmESRM3aaai7gtEXp7mm1JnSmb93uIz6OnIziyBFNn3Hj4nEDwp/MafPO7zMSwoMkSbaHUgcfShOP9txqDrWbHbci2b9I9j5OUlVpqOo/BT7NE4cRj4DUVOC21GW9mB+fhl6WTpj8z68xxp8NUVv9LywYKYsj3TXcdN3974em0QQRJif/+nVRve6r1ZFfFNwhisk99BJdA9qcV89p9BENwQuNgGZbHaTLg8xe5WKpnH6kAeKaszcm8l7UpcDyd92EP/qB3mCZ3SFuoS0ScL8iq99XwvjzHnvTknaPqIPMrkk2huZTDFiO1uEtjjXbvijBGRqZnwMMNNu+kdFo1a72InTbD4ZS1oOtV3DilX4tMuz/2DNKZKEcYGNwZGskbcLFmGw+d0gW6R81gkmMu6SsAIHBCkFAgSgW3NEn4kip53ER8wCa1rGUy87RKMOdgSAV2Jxk5BIw7lLaayuSPR6BFos7Ms6La1NU/UUvW09+0PY5nWuBWuNkiGHlK6s1JHd2m6i0L2vVyiHpOjPuJ44hiRnWNC3eiKnc3J56BLftCnH+DejZOzOwYqVuOcyk5TcPF3QWMYYoHiRzrk2UAN+98NjNc/ExBEMxO6IWqgEMpocqdmwmJNYvzivNHFyKShYZtJlTZJhYRZ6nNmd7Q33T/LI6YmW2OXb4o+L+gRE5257Z7FKkwmG+/vK7RCwJ7YsYJuwOEj9cZC9Z+Hs2F8KRU/dhRDOLNgrH6mkv1/Itp8lWnYxDC2C01fLrutD5XTFvtD5WM X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fc28ac0c-9217-4315-7014-08dc26a3006b 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:31.0189 (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 3/6] avcodec/vc1dec: Set pointers for hwaccel even without hwaccel 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 5TFhPl0UmMvW VC-1 uses a 0x03 escaping scheme like H.26x and our decoder unescapes data for this purpose, but hardware accelerations just want the data as-is and therefore get fed the original data. The pointers to the actual data are only setcorrectly if avctx->hwaccel is set (after all, they are only used in this case). There are two problems with this: The first is that the branch is pointless; the second is that it is harmful, because a hardware acceleration may be added after the packet has been parsed (in case there is a reconfiguration e.g. due to frame size changes) in which case decoding the first few frames won't work. So delete these branches. Signed-off-by: Andreas Rheinhardt --- libavcodec/vc1dec.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 6eff2ec04c..6462a40fd3 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -846,14 +846,12 @@ static int vc1_decode_frame(AVCodecContext *avctx, AVFrame *pict, if (size <= 0) continue; switch (AV_RB32(start)) { case VC1_CODE_FRAME: - if (avctx->hwaccel) - buf_start = start; + buf_start = start; buf_size2 = v->vc1dsp.vc1_unescape_buffer(start + 4, size, buf2); break; case VC1_CODE_FIELD: { int buf_size3; - if (avctx->hwaccel) - buf_start_second_field = start; + buf_start_second_field = start; av_size_mult(sizeof(*slices), n_slices+1, &next_allocated); tmp = next_allocated ? av_fast_realloc(slices, &slices_allocated, next_allocated) : NULL; if (!tmp) { @@ -918,8 +916,7 @@ static int vc1_decode_frame(AVCodecContext *avctx, AVFrame *pict, ret = AVERROR_INVALIDDATA; goto err; } else { // found field marker, unescape second field - if (avctx->hwaccel) - buf_start_second_field = divider; + buf_start_second_field = divider; av_size_mult(sizeof(*slices), n_slices+1, &next_allocated); tmp = next_allocated ? av_fast_realloc(slices, &slices_allocated, next_allocated) : NULL; if (!tmp) { From patchwork Mon Feb 5 23:36:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46060 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7b08:b0:19e:8a94:b663 with SMTP id s8csp1074828pzh; Mon, 5 Feb 2024 15:34:49 -0800 (PST) X-Google-Smtp-Source: AGHT+IFZJyMUkR2/8ejURegRZkXjYUgZHqLhygPyLZxQqgYfKMeuI7H/hvfSvyzhiUuhA1aTgEFw X-Received: by 2002:a17:906:1e93:b0:a30:4618:80a0 with SMTP id e19-20020a1709061e9300b00a30461880a0mr255443ejj.33.1707176089097; Mon, 05 Feb 2024 15:34:49 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCXlF/DT5Ee33V0/sk77rjEb3NcqebWzugPsXF/iXnU/XPXkKXX4dZb3rK4ekBNQTz5311ApKHLsg3H3hFm8kM20vJFLEueNjDbkfuJb4/pZaihvqpaZ72dfc3L2lVt5XluMWlBtI8v8+8emI9yCdhqYrk4xXTrNrkltsYDXDtLkPJ0dRN8HEcLXdOGMnpKDrcQcShU7FNFZANiq/fnCLKQlDwQZCNaTGxhPgj3+3JViMoMyVe4Jaz6BcGQUIKmAEMkMw5aKtuyX5pIByZRRpUJyNq70e93Q0AKpx7jxoBFvZbcSuS1gy58Ja50BZbVsbVu0zUOBU2ETvUQlgdrsZFBpCH9pgJHpeAfEyXxYTLKZobv9tr683rHpkA4rKnJsfPY6Ny59q5OKiK5XNfkCRD9udAoPQNywwdpXTeQkx4GE/bP3lLA2UKwWIPWpMITaQeTZAhKXgs+0mkM5Xo/bQR19zzszCTS4hLq1h2dp728TCIQZE/vXFmPoEVxTRaKzqUpLy0C8uAHKhBj2Hm4eKlvoFxOknJ3fu3z2nX1BQpsD2oRlHaDN6E7vzWABf4d1iUBC2ixfcAkH7Q4f1txzdR3GjApYOGLlhTbYPdXB+qOldypbrbi6Wvjbwwc4lRy0v7z0oovjIQdpgy8wh4IsX/dFvHpq0RLuaH88LHBNtk6r91umkLxihWAbeGVtpQvfxpiIYlR5dS1gqyxmMBiqk6p0O8C+snEC1DnZXdzvXjmQU3TJE/XaGy0nBTm5yUCB6agPZkgaCJBoeTns1g3YOMQCLnrmbqQmja/SZoNfC8IpFlypIKxgHsTNmg+GY8ITFavnfZOt+UV54qyGhP20EJCIDOjKJlfXz72KeQRpDOkmUcW8QOeHv0Zz0DgyXzxOUk09/utqLzwGZpAGzVguAVpnM5WEaljZYritF+/SQfPetF7U0Q+HYBpampKtJjdSxQAo5c olWZ+P3VeL7zpUegjPTb9Q3X3Oy+VdAx49HnbMGVRzZHAR0WWvwWIXZENFeW21QSRQmE51tua359iOLCEc1S2sPH8v7uEsxoAGMwrN/HtJ1pXdb7kJOD4oDZmYMLJQ1cbALlr4Tt8GnZ32NIHiEECxdpojrfCoM3/ta3uWJbfraqS3d9Q9Tu0yIZtJEMNRBlVs/nTaMIJdpzI6kCUYDt6qQpgtMhggGyaBquWI7Y+q1XEyi473V1O01MZhhJgPYhndTuGvUlycBQ/7vJI0uHiNdiXkSZAyIbpgYeYNfwe3jy4CAfgTuoTpquCkcQ0cMUJRGzf44PhbAgmvlmd993iLoAWoCy8/EXHOzgosLVYQ3RDJwV1mYXc7QOclEfed0kgyEhW5viGA8uyKVhQQtnq1X8iHj8H7uALTGz8sVC3jMuMRyLM/GXZnmuT5VFxdvfSz87teHj2U8GbVuBFHyIsTF42e7s/OxbO8ruMkTz0MRavROO5I02jZLGQHYHDtDJh64tsuxnV0cB/iK9FVXeE1LZCH4OqaRqCLST+toJTRWyJua3d4BpE8f199a2apQm/uo23m2VvfLzkYCNIXp4TeKdGcxKOowDpIXFJMgx/K6zrsvqU/N/EZg9PLveOwXEfw3Llt Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id os6-20020a170906af6600b00a381da7b31fsi74917ejb.226.2024.02.05.15.34.48; Mon, 05 Feb 2024 15:34:49 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=F1vg7u2J; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1E64868D145; Tue, 6 Feb 2024 01:34:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 B158068C9AA for ; Tue, 6 Feb 2024 01:34:39 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PDhc1quA76XOHVGOczaeS0NodOjjz2x9BwCpyJSIDsiSYbTDd16q/TAm+hHC6l73km2vk1x30pJJgktyUQyqWaDuj/moSWZwvyKOAo71kV/WPy/nntq+fkb8BJjXNvTRGjOHDZQvn40LMrZpAbdKep/363CTM76J8Um4BoRputFTFxLD39s9jDCV5ZgNU9eb8dVxRkZFrVGj3xUcARTtjxHomor4Vs/hOv0W+5qsnUqUaYoQtEqntykuSwctQMXfBMIHI51JtY+yPuy2kvhrFQS6W3myuI2Y5rFlCtm5AOhx2UzqqEX3d4uPRMrQYnnZvsPq7UII/MxNRAuc+422Sw== 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=+OAIze2J9v9t0x+lVsxnjNUwz0uPLoLmZtWlay1Q7IM=; b=cIXjMjKR+tXLva6Qis+XFITvbNlKhMkwC5EHer7uEZK/aLbRZk6uqh83dqUC0ncyFbR0Qq5Tv8tQWf7tBt05oZoNEh1bpIrznyOVF2Xu1E3r/1HtjAmbNub7PyiU+ysZAWWdTh+GtXz7zbABjejgcWQwdThXsRp7umnbsTHOP8LEYZzsyFiwMTAPGRKD6x8lwp/DvDLaD5041EIIqsxel5x3dAIfk+j/FWjOIm1h5rc6kEzb/RZe29Md3illgRUy6J9c5Colxz5QbYEAOWLYZQXaaPB5bJKF2BUwUwB6nQhrjzEZBAHIOKKfQGPSWGdEzdIxgxtN6xhFtSy60erKsQ== 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=+OAIze2J9v9t0x+lVsxnjNUwz0uPLoLmZtWlay1Q7IM=; b=F1vg7u2JBNpi7T1n+QWMHwwVdJEyiB+e0kZYSNUneOWfEmRcg+QZ/o4HWMQYb8d0AQ96qAiiJBqJ1Bbnvy5kM7vQP8VWjmltYWS/2TVnU5B4xRWEUV4pCWKKlhkC4WRjSQHS+rVNIlpPmcZHUnkkjNw/PUoA8h3XmP9Ytaz6+kVMdjyA3iG2WRyMgtuF53u8HCEQKbpJtyGedSwXxB4Go8rJR2JH5h3tHApPZPcjZ0XKemAiedchYKyTC9J6+bxV2mmbSHRLZ+v78wEecoFsp8D8rU11iHnPCih6ou6RVm0EGfHTZwk7PB/xkZjARPMK+w9zm43DEFJk2k1prfu+SQ== 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:35 +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:35 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 6 Feb 2024 00:36:12 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [LMU03H+U+4IWRQd0mK5nFvDUWVFZKNcq] 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-3-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: d3ed05e7-8f76-421c-18fb-08dc26a3032b X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KdQ7JGO/xq4NwPOA3wCil4N6qNjoV5ALgD8EQ65IwLoiOj5iXbjA/BTeCgb9nGC7suNDOm8hKlfS1hWQQYuPiTeNSqwrK1ZjGPJiyzMoFGldIDL29yAJRtpN3jCFcBoUQr4fU+IgyygHDmawCeV7sYzSQ0hNEjZCbV9rTJhX3+e99VygWeSxvWUKBPxU9YLONKU3j9g6GN/wQb8Gjgqko1XP/wVVFaS0vKe/F5hgMRl4b9++8QBtjKl+zrk5l0ufwkiA2bEGiehpyXMmiB+nXSB/PEr4oRyacWsJJphj8GIVe0l23WeZhS6Ctzo5Bnd6zaGY1Q8ecFAd8ivzg5QLqT/pi4qnYqj69KUzJnJ3o0s07GVTTyxUBCZP7Lis4Nq3xu1nq7LmINtDuVvW/c1iEDgIiXIzs+f0N+u4bSbw6f9vLhkfhH5BNy3Xm898WDN0uS4qi47inMbCZqx/gJLjknf2FmO4G1BYd+xu1COrEYw6MZpg8Hzs4dIUTFP2lBdcCydaFRmPbknYltZVR43bwHFWQZvfMaVg4Y999wdMYbHUwqyywccCO6IMeb1EsKJF5wXM9ufnDq8CFOJiNnUHmqwHxrQaipsUJLQ/+Ty5WJk= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gDG/XDIdp/vsC3C4iCHaBtYfsfeWaKIr8h/vOvEBUfnPVV8efieaQWwv+SckKHY3nmqdkvZc7ZjsHRjhPXW8KHLP2DgVK1eOJ1uoRFeOJyiDu2G0KV6Rk5BIA4Ov5LKHgWlAUuR979dK/Dgbcoof10Rb0yfZnQS9mVzFubPNXe4F4PZSW8tqaws+OJuqFyBkxNe7S9E7o+2JKB10IKLqL1NY9Om9QWoS972OFUtaQ955P3i9F0kFhWgzePVYXMQ969X2ovWm1X68g/YEM7OFk2SuDgTQZBOsp4dUaVz8cvxjLI4mbx79GAAIv0/Gph03os70EUyn4mGGcFrUafZNmJNs3Ep8e7D6cVKVjboWFgOqxUeB85tRovarfAHySBiSi8pNtOvtq81bqoLqALsvKLjUd3mjkVA15V9OlQAWe1tz9a8cfNW6tL9PfHh7fOrGY5WvVrGz6zytLPIsGAR9OK8Q4Lj1IVcHeeB34oZC0mt+7RmMTZDvXnasFMWylNVU9m/WRM9YVfZgnePwiq6scklmDPcYA8eg3uh65rh4WAY760VyB8mjcGri8d+K6vrQWsfRvQ+ykKNTJRBuRrktIvlFbtvByftqpwBOkksjyUaVU5N1nXqtKZGuZ0XYWPw2ObUzUrJO+NWNB93jl/ogjBBWnMMRCK5Ij1INNs/8vb3COjxDI2IL2UJxDOcBiIXz5QHFnSo8GEdJoYhiC9cgQWC1XYhcF6bIHDQnQhTv8a2ejFxHV4dfa9kUM208iU2+wX2E0siS0V37D9/M7I1qghTC8X1LiDe4+tMmit1uG0n9RXTS3/5yfc4Qg+Ar731kDDRWuGjyG7eVBGfytAPU6WX8VwJ9U9XKeROMN+EcfH0Gxzllcct0y/jbfZeiT77xdmW+hVGnN+ABWDH2YDM6vYcL54nWohCLm7ykBCYnIgaT2MYNihtx3wEoR+TXgi0whyyvtAHwm0tnuGdVSZLLoLnTgC8q1GiuTQAe3abSd4iztJn5XOyXk4UxNadiwZeWJxcYv6twUbOOrDPKlIkM8ct7FakZMIgel/OQhi4Ryzmqz3RDiqKd/SFmjxgACACLPvSEXnHKHPsE0sG/qSqQW2ov6K8JK4iRiop4vF3It6ZjWHxN4Q1DKbXq9H69yivGV0D5/oBgEW/RIBouMqk8x1GNamJt7mUGVM8s+TuphZVXCe+nTjsWmku8tL8tMq5Y4/DDBYs7NsZuxcnho+3vdncjocdP4XEQbPIWtISqm7e/j/JT5Jwi5TW06+C5ZCSS X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d3ed05e7-8f76-421c-18fb-08dc26a3032b 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:35.6382 (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 4/6] avcodec/vc1dec: Don't call ff_get_format() twice 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: UCyM86P26GAt It is currently called once in the codecs' init function and once when (re)initializing the VC-1 decode context (which happens upon frame size changes as well as before decoding the first frame). The first one is unnecessary now that vc1_decode_frame() no longer requires avctx->hwaccel to be already set for hwaccel to work properly. Signed-off-by: Andreas Rheinhardt --- libavcodec/vc1dec.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 6462a40fd3..4f4aa8aa07 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -691,14 +691,6 @@ static av_cold int vc1_decode_init(AVCodecContext *avctx) if (v->profile == PROFILE_ADVANCED) avctx->level = v->level; - if (!CONFIG_GRAY || !(avctx->flags & AV_CODEC_FLAG_GRAY)) - avctx->pix_fmt = ff_get_format(avctx, avctx->codec->pix_fmts); - else { - avctx->pix_fmt = AV_PIX_FMT_GRAY8; - if (avctx->color_range == AVCOL_RANGE_UNSPECIFIED) - avctx->color_range = AVCOL_RANGE_MPEG; - } - ff_blockdsp_init(&s->bdsp); ff_h264chroma_init(&v->h264chroma, 8); From patchwork Mon Feb 5 23:36:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46062 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7b08:b0:19e:8a94:b663 with SMTP id s8csp1074895pzh; Mon, 5 Feb 2024 15:34:57 -0800 (PST) X-Google-Smtp-Source: AGHT+IFT2Kru8a9nRXRPCgquF2SfCo2QTK//zHyOIk9m9+mj+9DnkakPlg5rs9d42siDxbDo0LB0 X-Received: by 2002:aa7:c713:0:b0:55e:e829:1461 with SMTP id i19-20020aa7c713000000b0055ee8291461mr405352edq.42.1707176097528; Mon, 05 Feb 2024 15:34:57 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCVDtS/9p11qWbGKnwEo46kfFN8Vrc0u94ccYXd6pUULs6ddhSWFVziHARoiKF8XrXRN9vHI9e8yUWzBi4GB9lfjGQY37OE1L7sd19MgHeLpnxsrQkeUKOHZlDRioG7Y4gHQvJ7eB+NpMR01D0ulIzIdejx915VnrSE0y4GRYkrCAyefznUGN8qmnXpH+lNSPxt3mClkoccVKwFmwAcUV4bGk4T//3aPv0boeMgRVeiovrGchsYDV8dHVIKVsEOEoqIjICcbGE8+GR1PpxjeTGmhV+kX7gBtRj5kCPgBofi2VwIK9Xm71CpE+FLo5R+cleY6MXiwB/bxSw0NDn8l5/Tq7//FWzH44GNElylMh12z6FQ4y5uaD1Fb09vXlrFskV/n1dGMjEphleVgTA4AoryJ9r0cxMPE+7kv5UucREFWyWd1Gl1FMLYKIk+BDI0y4E+MiAv+QhiWt6uzK0eySEVK0W9ubb1vtc7uaDz3rJRQZOrE1fZx7StnhtGK1Fx1hDaSOTS7F+THAz4b0nn3GNKXeW62+ePP5+sjZZiZsf2QZrJOh85m6TLIt5kRYXXfYsblpDzDqYdYWlaYUkG9IdrkU88ULr3lzfD1k4fVp6ugohfi532Zg1iSKW75t6Ma+Czb8SWgr6cYc38FrFFajLEJUYVdQUPrp6BHqYUKiEkzM03SUKNs11m+BJTHKmVu8USZmvGjIPLxV8vnHRQEE8f8cME98D63kSNwRGD+DaaCQbd0JYm9Xcar+TRt9Uf5qhpq6eITPGSD8pYFRPxSmABKS+kGKVrBtlGhMcvOJf53Olo3+avhCt2n7CyuaH0DY5a/0oVyWhNMIBkJkifljRSI/qdIxk0/oTdfSwLItad7+qSP8EJnjDybT4XSMFJQvf8jOCB78y+2id9RILs6G5rjSdYn/qQFaU8mI8R/lgnD804pBlZxKoB0Ci0Gvgn+CV4DlG 7J2AMQozo2JWMc7iQnBmJkXGdJVEUXCTjK80PJBSKRoU5XlQ0LeY6Yf3Cw9mvwgZXxW88cxLWwGK6NFCBn7Y991oSsTuIeBcwgrmKBVTGDQmziDRhFeibadvHvgq4jWPQef8qkxfrjhSLWa5jGvkOvt8OS58wfm5Y1du/w4NKHoiYeLZBNqXShFlg3vSWhgT/JGPl3x3jNSzCS1vcrOdIr7nVm4baYN3DhmfVJbhk5/GEdqKPY8f6HXP7Wkn6NZ3AJT5NcGKObOQdqzsnm1NwHtHtFfdNoHwdwhLuGyJdy8UY/PjASiKtm+ubCliiCm9+52d8G1OEGk4bgY1pEZfhuIGagN4mbam5lMZ3+Lb9fB4BjbZJteAHe+Efv1ESgotnRQuGgN1oK2Rm0t/siqj6twt8vkJTdrE7oOCccoghiM25ddA46T6eB9W3PQWBnY9xzktKL/w6R0uUY0sDmnJTI67oh77rvM7hXvm8QRuJxUBo7mNw+ZwGW0UFJMFl4JiCzDEaiiuzNdwrMN9d1K029QO3U/tfn4xsL+5nxOt7Wzm98mf8/S7BERfctdvYrljyUgz5SLkQe8z5YXWCMmBOtVtE5IOhgB9o1uAa+617kPTJNNXbIeaMDJe/N9WDBy662cXw= Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v21-20020aa7d9d5000000b005605d24a24asi396501eds.401.2024.02.05.15.34.57; Mon, 05 Feb 2024 15:34:57 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=J1VPC0vG; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4056868D15D; Tue, 6 Feb 2024 01:34:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 D01B868C9AA for ; Tue, 6 Feb 2024 01:34:44 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UNyzR5OonQKEiXq7Irmjo+rxRT27YJeJdfoeUiMzdvjBYnzVir6HmqpriXSz8RVagjtIkwcpg8CgtbHtVWiKNJ12PFWKol35k+xs+RoAaZwBbiW6h+dtdCc8c280RYzeR/rbTgJV++izmjhHY8KHMW7WZsgm7y8fXaHpTLssD4M2lEnm05xYUguLTlaMq6TmgEPiVF3FK5DYy4U/8ApPBilM1BLAXnB3hChMxzTkWfYOQAtvDzKYH/UhXbVs5W7bgXLDSy5Zld7JcQyVk20sNMWD9JAhUIQKM4MtVEVFm4lktdp2rDrp/+X0Hu5RQ/1LRzkG/33K9y5z7qcSnAw8Xw== 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=YbfCKf19QCc4PDHIy07VALKh1+p1gG9W9EUcGFm1mvY=; b=SMWHj6MTUIGk1ePGY/2/MwPwVThYkeRLG5ITx6p7xRJnbTzKzUz6T0Lh7qRnNN63BsBiEu8UzbI9P3Y+12I5PUixqFAX1Srt9iggxx7IKzWSftm7e428BTI19y3M4SAFKNteN4J7agT3BHOfG2Gx9qHFqPO9RjpBFZdJ0zVhqNkYxhXExdDbB/fiIz2Kq0CNfK8/V3TEmU/iYOIaPwsy4can+Lvp2xoZio9KXsQqijw+EcrzjzUD14sT+sV7zZnTqtOU29GwUZRwbjnOHlHyvuHxaUknMgI7pUUUt8ggSIspv87xyW91uubM8UWFNIKy1u/FKYW6DlRx4dMeukcJZA== 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=YbfCKf19QCc4PDHIy07VALKh1+p1gG9W9EUcGFm1mvY=; b=J1VPC0vG6f3a2zT2iSQtqOx9jYZz87j7lW65wCtM1Ot73wF3itYK9a6jFTBFeezAI8DEQ32LMMeiPcRFBCsxmUUZA8yxVn27RRiPblQ9dJzhiVh3B018bYyuUNQugNbJ5w7FlFjxPseDLwDsjol1X5qtzHsXOI5e3Iqi+RRwJvTFJ7xTbE5ykpiyV3gBnzd3E2UsVH6WZF3q0aj/l5jJrBrYDYkQZnxYHQif7XwKeg7ukApN094ohyCjbgCmSHS2qOUbXevzDDHEa9IBUNsmDKFF58Jht3YpjyAvrKiLlwesowR5i+b6KK3b2U4vvaNT0NEaKI79ViyQtCjCYQVp1Q== 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:37 +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:37 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 6 Feb 2024 00:36:13 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [EeSrZKqse2n53vutOLBbzXUfFieWWfPC] 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-4-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: 52fefd10-e763-43ef-daa9-08dc26a303df X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vL2ev0dJvepssaWSlICDUDPtd6/f2Y7f64UauXPyJETW03Pff9bee5UQI5dqDcsrVVph1QyjqT6bqwDDUPL9gFLHXA237SL5cg4IOqmnQlupkFIc2o1nwqO6EZ/+43uqILi15zUnCAdAomCEVSggP5vNqbs7WuoAioBrkh3+iM80WWdU6mwI265exsC4QsNBZSGFtRfvActZIXfPLB0yS01o765/ippv0jAxvjWibcfbRvQFDGM5uU07KAoAH4gMk5LNvm4HxHN7G3QJeuxdsBy0ttHJmyIQQp9Qb/uaJMZBSA1ZBNI5nLGXWZo4sAmrWYu5FLEZ0i6gaD20l3r1dGCOGGRhDsQqy5Qs2IiEYMsj9qjWpkgCfC087G+J2qQEku9oGDiHj/HNSu7WTSbkmmgkdAjIIdeQM3DYd9wHMP93yPM8zxvLTK7SyrFc5ZSZsMR1ehlAeS4DU3LdsicVJYM6qQtf8l9nE2F/mwg5CTyl2tMwlB1Lf+OyAz7h77UCaLapj9bjbgU0T6u3JUrtlbPYKmBrVMJBgz0j6+A6lNcbvkGUAMby2MJKvDwYdGCdmgAsUoSrL7F+M1xqgFVB7/O9BN3iMRIMkRQc6ISCy18ivWkBcxivmKB+mI/KqqZ9 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: mIdnquiyURjhQbS+Mr5xdRxK9y/qCzdQYshKPPqQp8eVkVja5sFSI0A+9Cp5v1kJvJsd0COG4NR2llCWEcAEcslCmJupeSsFtNekZdzqfaIbj8ulvsVaN+Etf28djrHzivFrTEaw2pe0eJE6Td2loaysLwxzvglMqfdtb4HmHwD+W3x7WVNq8I9x9XC1OJqv/STMX5cKJOCJTdlyEl6RqXPVhary2eXKyepWcA4ZNfkJBrAnksXBOd0Hu/DK//kgctV47SNYe8fjzHMqO4BdsuNenpmvxxPzyu6HjT0UWJvgWioZZzC+cqbCkxDw+XuJCWIla2b5c+ZpRODvef6XU3Ha5UpBw187B3g3xDlY2RBXzzzSfic6iiajSktqPMEy9Q2PBBzNiCiOJEMNp+6G+mobYDRktKiOlbLB1FT79FexXl3ZaBGTidEjsBCZKw52EGQ2ssxlRYycaeTl6TPakCSCgh8AzLPeBknRMDI6Sxx9Anb4BH0L1+KIhe5M35nLMKEbI+tcOvawrV+i1DKyyvOefznl28EXP5wVnzMEtFeOFVdkV6c4jpLXW5txrbzsr1aQGKqeaW7HHJsxRCprbX1UnLM5n90Mvq5u6jC/8o+ZkQBq6wr5dXwuUNewScZLbO51ZvnEI5/nJRZ44mthN0KiLCsOBoQ+YCdvXviraXVz66TlrNVP/NoimQIgeUl+22mR5MxDdpAVys/0OgB0NoiSEbzfYFlc6IbM+IEE0R4XTAMga5SVps7h3XxebrQmi/cocDu4bJ9NnP74mU7LGysqAosrjUd+zA4LJRscJscaI4KpyTRG+UTe8S1sbnezn6AQUJX93px7q5qVmdV2+qRDxC/yWY9wNAVgSv1jMm+RXk7P0fVebj8TReAtBdQYzpQhlJMpIgmCmF1zM7v7I2I4My009b4wXKyvMIYyBdCv3E44TNI317+a5ah/97E6yWITDQ1AczG5MzlHVm4AAXPGOl8LHmPQ/Ayy+lPvC0yCQgKyUO5ca5PJMXO9C9ECo8niGc7qIaXdwNifryovwKsADjP5yo8vfUOllOkqFt96FuW4LyMCYfRAy+IIiMX5pm5GBVga8g5EilVOJiqEPapFNR7MtOmoUEUWAGp6407TzY+R0oapAfOuf4GxNJZJafdACmpiZtHEiDGHYqE+ffnSm0PIVJ6i7kbdhHZfBwN5PbBP6KtwDXtobdtELRsAetcrzJaSeA96KcIAsLuHDFARRbzXGAMUTa05/Owg6cfAnUXyc/oGFVv5SQwps0PO X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 52fefd10-e763-43ef-daa9-08dc26a303df 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:36.8084 (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 5/6] avcodec/vc1dec: 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 5bXrcFsg8U5t They are not intended for decoders (for which there is the get_format callback in case the user has a choice). Signed-off-by: Andreas Rheinhardt --- libavcodec/vc1dec.c | 64 ++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 35 deletions(-) diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 4f4aa8aa07..e71b92eef8 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -72,6 +72,30 @@ typedef struct SpriteData { int effect_params1[15], effect_params2[10]; ///< effect parameters in 16.16 fixed point format } SpriteData; +static const enum AVPixelFormat vc1_hwaccel_pixfmt_list_420[] = { +#if CONFIG_VC1_DXVA2_HWACCEL + AV_PIX_FMT_DXVA2_VLD, +#endif +#if CONFIG_VC1_D3D11VA_HWACCEL + AV_PIX_FMT_D3D11VA_VLD, + AV_PIX_FMT_D3D11, +#endif +#if CONFIG_VC1_D3D12VA_HWACCEL + AV_PIX_FMT_D3D12, +#endif +#if CONFIG_VC1_NVDEC_HWACCEL + AV_PIX_FMT_CUDA, +#endif +#if CONFIG_VC1_VAAPI_HWACCEL + AV_PIX_FMT_VAAPI, +#endif +#if CONFIG_VC1_VDPAU_HWACCEL + AV_PIX_FMT_VDPAU, +#endif + AV_PIX_FMT_YUV420P, + AV_PIX_FMT_NONE +}; + static inline int get_fp_val(GetBitContext* gb) { return (get_bits_long(gb, 30) - (1 << 29)) << 1; @@ -417,7 +441,11 @@ static enum AVPixelFormat vc1_get_format(AVCodecContext *avctx) return AV_PIX_FMT_GRAY8; } - return ff_get_format(avctx, avctx->codec->pix_fmts); + if (avctx->codec_id == AV_CODEC_ID_VC1IMAGE || + avctx->codec_id == AV_CODEC_ID_WMV3IMAGE) + return AV_PIX_FMT_YUV420P; + + return ff_get_format(avctx, vc1_hwaccel_pixfmt_list_420); } av_cold int ff_vc1_decode_init(AVCodecContext *avctx) @@ -1354,30 +1382,6 @@ err: } -static const enum AVPixelFormat vc1_hwaccel_pixfmt_list_420[] = { -#if CONFIG_VC1_DXVA2_HWACCEL - AV_PIX_FMT_DXVA2_VLD, -#endif -#if CONFIG_VC1_D3D11VA_HWACCEL - AV_PIX_FMT_D3D11VA_VLD, - AV_PIX_FMT_D3D11, -#endif -#if CONFIG_VC1_D3D12VA_HWACCEL - AV_PIX_FMT_D3D12, -#endif -#if CONFIG_VC1_NVDEC_HWACCEL - AV_PIX_FMT_CUDA, -#endif -#if CONFIG_VC1_VAAPI_HWACCEL - AV_PIX_FMT_VAAPI, -#endif -#if CONFIG_VC1_VDPAU_HWACCEL - AV_PIX_FMT_VDPAU, -#endif - AV_PIX_FMT_YUV420P, - AV_PIX_FMT_NONE -}; - const FFCodec ff_vc1_decoder = { .p.name = "vc1", CODEC_LONG_NAME("SMPTE VC-1"), @@ -1389,7 +1393,6 @@ const FFCodec ff_vc1_decoder = { FF_CODEC_DECODE_CB(vc1_decode_frame), .flush = ff_mpeg_flush, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, - .p.pix_fmts = vc1_hwaccel_pixfmt_list_420, .hw_configs = (const AVCodecHWConfigInternal *const []) { #if CONFIG_VC1_DXVA2_HWACCEL HWACCEL_DXVA2(vc1), @@ -1429,7 +1432,6 @@ const FFCodec ff_wmv3_decoder = { FF_CODEC_DECODE_CB(vc1_decode_frame), .flush = ff_mpeg_flush, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, - .p.pix_fmts = vc1_hwaccel_pixfmt_list_420, .hw_configs = (const AVCodecHWConfigInternal *const []) { #if CONFIG_WMV3_DXVA2_HWACCEL HWACCEL_DXVA2(wmv3), @@ -1470,10 +1472,6 @@ const FFCodec ff_wmv3image_decoder = { FF_CODEC_DECODE_CB(vc1_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, .flush = vc1_sprite_flush, - .p.pix_fmts = (const enum AVPixelFormat[]) { - AV_PIX_FMT_YUV420P, - AV_PIX_FMT_NONE - }, }; #endif @@ -1489,9 +1487,5 @@ const FFCodec ff_vc1image_decoder = { FF_CODEC_DECODE_CB(vc1_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, .flush = vc1_sprite_flush, - .p.pix_fmts = (const enum AVPixelFormat[]) { - AV_PIX_FMT_YUV420P, - AV_PIX_FMT_NONE - }, }; #endif From patchwork Mon Feb 5 23:36:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46063 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7b08:b0:19e:8a94:b663 with SMTP id s8csp1074947pzh; Mon, 5 Feb 2024 15:35:05 -0800 (PST) X-Google-Smtp-Source: AGHT+IFAAkVIUn6LeXN9xA9u2lVryU4ewLacEtjmf01G1QJJh37fvF36oraYASFvFKvMS0ssTISS X-Received: by 2002:aa7:da93:0:b0:560:24d8:d2d1 with SMTP id q19-20020aa7da93000000b0056024d8d2d1mr1209403eds.11.1707176105507; Mon, 05 Feb 2024 15:35:05 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCVdkWC+Q9+V3aTy3ndHjtUnUgsSeuMI8AB5RKXt2RG4FE8r3L41y3HNqjoZNH0ZJW15aSDhY4BHaKAcH/1gKjUYhjBqsFgQFvRtqe5WsmM0XSgRvNd+6KCid09rqJLf0ktJzr2bS4t1NVSoNN8zbkt9FMcsNYh64MkO20upNg9NFJ2rTdSjwL0ljW2I20Eu1zRzEdaIxNI+d7ts9rFg6ydZKOSMTP3Qwth8+GN+Fq5HXEadfhK3c1L1VGQdA3TZ9E2kq3L/RpxGCWIgUWNVUgARyn5gIs7aiyf/3KpmoXzhOSOluQIg0hiPINFgyovJNRxBSUFeBgqP4yXxyXiRneAY8hMnmOKl/A4cdJyKnD/rjbRYVk6bkPj4BCcKeQU7e+BxNgwFHlCOWPmU3BTRaWDT6qUP8prMSg3t1Nwd16rSMmjY8kpi6dxrFGahrwTt3+ZUZQBozVOPfXUZGnaunVAiRfCVttlJ5Z6hobz2xe0WAUwrcobKuud79BfhE/KcaxzPU6Bsx//QXvguJoUttV3oh6NGl/TUCHwRNvpiNWS7hPy/g2JkrKa3R2ITz4jCZ+Y3yi1Ok1+OFtyIkd82mZgOlpvFQwyG66aNNWELvicjE5QvaoMtBN4ZchT0/DsRWkY6z7F1GzIt0Cjveghf/zkU+fhmBafUDJUyMNISmFlmtVT1VNb5WfD74R2wCvQulj0ozN7qL0qMOQaOvo6E/+j4sZJTfDWAGjmnErCmx4s2hRJ29cbUwm2GA3CTPFYQ1O/2Si9PHYgxK7Gp8uezG5F1/+L72W+cm7ZOM60C9UZaa6ElTsSvclJC1/Rp/YtB8EjVLqv/aulHVapT+Vpr3zJN+K8bEOuwjl1VZZXuhAl5Js2VumwK4ToQoqg+gDPUNI3rw9CV1TlCMYDRU/Z9HZ5MOvjxUQccnN3Cq17/foIfPgZbe6fg2KXdiKPJpwh9BYi7Ub ePn8YX4fV4WtbBUAe4U5HNF/eVtx4U+3YrqlHEopTRLZikHUvIcDbkvs+hgjCtrqUEiAtgnn7SqJb9erLHrUMUhMF+ZlR2af2mkhraTsipVIuZ66ioSW+0CNAVj24OaqPjmJ3/d8UUMI7IyXLSMnj1jwYl9s1gXmWCx3aW05Kf3YpiaQ7VqzkfF8r0f8Yj0okDuVtxE5LntXYXMzwB0ZhAt0JYbwNVUgt+6ltHMbGdMG82hR7QxVmKAB+tIXdu3imkK4Dc6OzvSjCoFtteIdqqEAEPFXCtQwdXuZLu2TwLET1gWeMipruxjeZKgAMC6j0YK9F9TdpI5vcHfnSrivvUDcgt7a+hI3Gzu2GglPIg2Rnl3LYO9zCX5BItEfIsNJHJgfRKPHRTXxYrE3TqE5QT11znAHY/Fw0jkMFiF+gywgiUuHrjGDsvMbqCTC8nHfoAgOjlXDoQqC29dMwGutylOEQl/StGFb4HD9b5TFRb+DSW/Rqgy+GZwGVfIVKkMVC9nWf37SZoLYLWU6LVOIcv0UKUFKZERCPuCee4EGG9RTEnGbdOMnQeUTTjdqJutSc20ixGXAZoySW87rTe07B8e2Lr+6nm+qkXYXYuev/eD3eiUwPvN5nNXa0n2/U= Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y18-20020aa7c252000000b0056014f7906fsi402161edo.354.2024.02.05.15.35.05; Mon, 05 Feb 2024 15:35:05 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=d9bJCjWm; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4F25168D17D; Tue, 6 Feb 2024 01:34:56 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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: d08k7Dky8Rmk+fzbW9SKVwc6gdS2B5u+mNC+M5lnWKeM6KodA2KExjtC2DP2jz+hnPT+qzlgBl5579P3PQ8RdxVV9yYrnXWQR8n8aNcbdRPlonrf8jpaHAsNTCw4P/KK1w6LsgL4EvMHZsn0N493JfekxtKJjMkeBEVjGXsaBQvmzBB03trXtaCaDPRDxO8jcD2iFoW/cZyrVUGYiYWCMg3h+KN35+XXlkGCRF2LIx8v18eLtjPucx0myLJs8tMyDeO/hpwi6yezURE6srTbcFQ/lHMu0j1CB5V9xkaR2hzWiIVp9UrqZoXEMZcl5yB61U/VcMzULGhDy9ONwzyvvdogEJmifvwAa3pWfwaO/2r/VyJpu2O9ii3InD1U58c3MfgmI8qbMrE0Rk0nmze5BdqySBNqVey/YMxcyXJCh/y8KVyzE/EW1wHOkyTZUDg/LfDEGAU4xKRdNOlTGXKgqslcgBVDv0gWelzYFlp1t/fObyK0aybpHoMcXcAPbSwNsGseQDXvO4xY6bUXM5DZUQ1fASktA9liu885vs4LyvjjXZt4vt1p9J9vOBHMWRYm5nNkY2iVesvpbvJwdQO3unmtBNFZm6Ov1t3wRX8V67aRjQf4tvK+qLB0idGV3q77OaezR0PxrRf5gwMyrtzlQzl+tWDGWJajAVfuqDCfOCd1m6kWzaOse6q6hAFcXmOm2W1CmF00IAPsVajIzrHyI0cT4mQA++YC1H5EYXjGMYdthH6+rlYS84j6c3ukeXbsccOj8fzcYaEt5rn/MkrfiBGKDEaWMGVm6u++usMxZNdVHM4QnORDNLUChDjgDuGwa49O2zYywrF2zP67nBLxzyJ1ORYMKEy3Nk1KdfMqG2QpXWC0wrf4P0NZ41aoq4sikDktR4yTGkks/ACe/cN3QQGgEGDFrtXwlp+1Eob3VkJCkSGZoPxJa1F4cU7qWakbwMywMTs97Y0hygQjKTTwPud6PKu3Ol/j7INSmb/4+uVMCHgrDa5lGQi2cHKWmUBbAE2ygn5U68wW9JlN4ITIv+bMw93Yi7TW3ZYuHK76R5BgNyGpFxz+xf5ioF+/DqoVcRWMyuZ8FbZdcRbCfKlyQnemJdRm5ZQtVLRC8T/EjnavG1fz2jWVQ+EY99h36BiA8gOGKjW1DS9DqfZLzB9FspBwVMESVlZw0lgDbBgXZBB9aFuV/OH4i0buJbxAnwmC3iwgzB7NK03I3TYwkM0vxxz9RroB3L7lgHQuGcQivgkebYCQtSMW1kZTTsgmRJyG 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: a2wzexnplv47 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 }, };