Message ID | AM7PR03MB66603F7AFAA6FAADB79C65758F249@AM7PR03MB6660.eurprd03.prod.outlook.com |
---|---|
State | Superseded |
Headers | show
Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp1770670iov; Sat, 29 Jan 2022 22:30:40 -0800 (PST) X-Google-Smtp-Source: ABdhPJzYNG/zZ1WUuD9nsQ5QdIt6QJNoPPwylZfWaOynwul3S+6G22CdxghTXzngkT7XDkv5tAgC X-Received: by 2002:a05:6402:2066:: with SMTP id bd6mr15539255edb.364.1643524240272; Sat, 29 Jan 2022 22:30:40 -0800 (PST) Return-Path: <ffmpeg-devel-bounces@ffmpeg.org> Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z22si6909040edd.349.2022.01.29.22.30.39; Sat, 29 Jan 2022 22:30:40 -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=lOP2ld82; 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 3A75568B17E; Sun, 30 Jan 2022 08:28:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2058.outbound.protection.outlook.com [40.92.90.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B74BF68B151 for <ffmpeg-devel@ffmpeg.org>; Sun, 30 Jan 2022 08:28:38 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=U2ACsylHwrZx9yKZZRZKDp2JoOIPayizClNpY/7FfMaavjCet/L0UQhgpYltg2ZU5+qEAUBDQjd2hJym9tXRvL/LC6N+11sCYN6CHoSHoRLsOkGQr3S0XzY98+xAqJPFtmyugNRufjYO67azUNmMIX5SjWiO4aCRoqZYTs0EjFiqHg67433WlTvNucnXrLP9YvSiowsjytlH0Z51peCTdCWu3n6jaZfWki93G8M0V4r/dpOUb2rrTU+Th/Pxt7NwCmhKBBld50l+d9dUbIUtBPad/Nc4kST+LvjJHREI75U04Sa7j66vf1CfP7gPDQim9BCLK2LQ4JyUFsddarzdiw== 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=Dmv73b1+VxoXS1HF5a2+6VZQXLBEEXbWtjrkx5Xsnug=; b=UNUDExul1leyLfDU9QMOVsodPu5QCbnZeSAgv+jIw6pMgtxy2+mFtPFlsVXbPpv9yMsp6QrP1thg7/qeOz0mzGZd1MlDUHDFNc9xXIZKA7gw0al9Bs5sL7P5lBIT9KrMQ6Ft0/VlgcmHoIGZ3FLL91zJ4oZGlcS1kSkjcNWKVWYR/BHwOiibBrLahSM1ZKTo0vb46hnzeQLxsx4bPHAPq0xIq5JQoX9lrncTbdkouQ6OBL6EU1SJNlLRXkI+gQN+pNwkzO6xGNQkkxRGZOAR+1gnaeiJyXQXdELDCiSerulpiFn9zj5iJNffyM0I6YE/7EEvouZ1cfHyk1VvOzrraw== 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=Dmv73b1+VxoXS1HF5a2+6VZQXLBEEXbWtjrkx5Xsnug=; b=lOP2ld82XVIiY/KmlcQkl3rb/0GQGRYPU+8iZWhzRGiijOiAvWDsSdMWPdZH3Y8e7FSXNyFiOTNCCKG9SWX/Royt//bN7pJ+aTAXGRdLkHYEohEWmUEJY0uaFwJpoegoZ047r30xMeFcTrQCKDZ134W9/2otoj26vHt+C4o/YjOVonDlLlLNSJ6+OH0L2iMOxNems1wNQL/ktEynyCNMsT4FYvTPlrEu9aancDiBOqbBDfxi09+Ez9IGlG/95tg1NfjSQo25DrAyiJ9wUaRJrkQNjp45ZEHpQ1Xb6RAB6MsB5z+bfID0Yb2zTNoOvUQjp/SZUGPO5Q1l5ZvC4f4H2w== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by PAXPR03MB7666.eurprd03.prod.outlook.com (2603:10a6:102:202::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.20; Sun, 30 Jan 2022 06:28:37 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%6]) with mapi id 15.20.4930.021; Sun, 30 Jan 2022 06:28:37 +0000 From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> To: ffmpeg-devel@ffmpeg.org Date: Sun, 30 Jan 2022 07:27:25 +0100 Message-ID: <AM7PR03MB66603F7AFAA6FAADB79C65758F249@AM7PR03MB6660.eurprd03.prod.outlook.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <AM7PR03MB666068B09E9D0014E1CC65DD8F249@AM7PR03MB6660.eurprd03.prod.outlook.com> References: <AM7PR03MB666068B09E9D0014E1CC65DD8F249@AM7PR03MB6660.eurprd03.prod.outlook.com> X-TMN: [qZ5bRqeYU8kZs76SHyjMfT43MVkAe8xR] X-ClientProxiedBy: AM6PR10CA0044.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:80::21) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220130062749.936489-16-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 20d92f76-1f52-48ad-7037-08d9e3b9bfcd X-MS-TrafficTypeDiagnostic: PAXPR03MB7666:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NxtDfP43+MwC2J+9MTivQoVocQLcz9RJB4tFiNQgvg69Y6MJmqysA6eO9tT8xshTNIJJA/ijAt1iKQac8VjvjMYbybSvAqbSVzUdM6vpvNc2QASqslyFDRPApxwktNqVYHCAFm/Te2cwqeXF5VeHO1yC7i+o64AOxoC4KGcYn6A9YFlAKmNNL8vKgsyOsapCh5SGKqw3WKU9lkrui1SUbEQVZSMkLtjP0kuyHFGSIoyotO53+o9bagjEdjCc9koPxMMQDlbk7b3ZQ81foSGjsDrCCR5ic06HrwLBx2PKDhgcD0hBwbbWuV0F0DMJWJiUvkXTct9ZfLNnZ8is3GaE4yYrbAW4YE+e67nHG4mqr4/KTNulrfKrxhhtKeRSlaEA7PS5w+w6WafF9ipYSy0ib8x10rUuvo/HGrS05dpnylBzozrFPgaqJSz9g4pBC8Tol1dB17jQptgpytPO5o8eH1V226cJhPWtCXT4FrewBzDBpvycwCh80dKjaoedgvteTMUvNDribLr+RkBf6kB6euZ6R2NH8U6UIEFBRJ/jtkEg1Io1oO15rphkiTlCyFDI X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DLSAq4vwPlKA5AQB9yg+NxvY/plX7ep+du1nXvWnOAa43YSymsEoSQGAKrAEiVNVxcMGmtern6haueCF12t4En027iA0xQ7KArGAbCS4HLv9o/8j9lqyALrxfGdvVOZqAvr/ujhFM55p/qy4tRt5qdzqeexgqUbGu8jMdnQ7bYjnUrxV7D3eZSeX/7iX7vcQBUDyRuYS1R/F4rLKzEmLZsUyezpJtXhQ2IyETRUOtoUNZZdhW58UdwebEnGDPJsMuTfG2OExI7BSDcbHe1XGeZgi8Shsl24tdlocfIJBJ0GWima0Vvl3RM3jUf6LzVLsMchk1Xw4UGKhoh2npVu50C44Kf4YaP/5pVopODDOXdbuCz0nbTZQ3mun6Yjn2S1smVWpHeBono5WwgUWNjEYv2FE0v4kNC5e/l8p6xa69jxPMeZtR/hFfzh7/bBSXPjvdGZTBXFTbLn3f+5SAEcNlZhuSRCW0E95sr5cv8FBztCXopT/9RL0XWPQwI5/JyTUrBxjkHjiaDn+odmH4HzLnFO02jE9tuR6ISUkHqfibz3yl4fFC1HV0qgR9xQ00e+7G5WoCCjVfNdupzV9raalUK7l4kYATjT51cZWfGZfl1Fv7YcBdyULU/VQXPQMDbHl77u0ITTDh0v9f7f1fFn/VfqodICUBZzPtvaylKLs4CSuW713EWzNlMSgKv8QPMV1e8GPYODiaUO/5JFKiaUB1TZK5SYvdUvEfeMy8w776SoNUX7nC5yS2KOl3C3DIrnuFMbvzmT+zzTxwkS/Y7sGVLRlmsCbPW5xe5bZ6+vrSJv3dW1cvDtVrpvLbtWlnlabFBtHiey48dDkoueSr4NoafXcKR4OK5GcuXZvDlWq3CCZXQS45egBVT98h6Xbwi4UwPA3wYZ0cvU9Lx+bE3Uj+9zeJEcmXQ+LuYcpQHBakOmPdlEaWHFc+GqJ/FCYDZuTmoQ7K7xkc3ub3NH80Pmipw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 20d92f76-1f52-48ad-7037-08d9e3b9bfcd X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jan 2022 06:28:37.6939 (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: PAXPR03MB7666 Subject: [FFmpeg-devel] [PATCH 17/41] avcodec/mpegvideo_enc: Don't find encoder by ID X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org> List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel> List-Post: <mailto:ffmpeg-devel@ffmpeg.org> List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> X-TUID: niljGSWOn/WK |
Series |
[FFmpeg-devel,01/41] avcodec/mpegvideo_enc: Allow slices only for slice-thread-able codecs
|
expand
|
Context | Check | Description |
---|---|---|
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
andriy/make_ppc | success | Make finished |
andriy/make_fate_ppc | success | Make fate finished |
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 02efc9c2e9..f21febd4db 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1216,7 +1216,6 @@ static int encode_frame(AVCodecContext *c, AVFrame *frame, AVPacket *pkt) static int estimate_best_b_count(MPVMainEncContext *s) { - const AVCodec *codec = avcodec_find_encoder(s->avctx->codec_id); AVPacket *pkt; const int scale = s->brd_scale; int width = s->width >> scale; @@ -1300,7 +1299,7 @@ static int estimate_best_b_count(MPVMainEncContext *s) c->time_base = s->avctx->time_base; c->max_b_frames = s->max_b_frames; - ret = avcodec_open2(c, codec, NULL); + ret = avcodec_open2(c, s->avctx->codec, NULL); if (ret < 0) goto fail;
mpegvideo-based encoders supporting bframes implement this by opening encoders of their own to test how long the chains of bframes are supposed to be. The needed AVCodec was obtained via avcodec_find_encoder(). This is complicated, as the current encoder can be directly obtained. And it also is not guaranteed that one actually gets the current encoder or not another encoder for the same codec ID (the latter does not seem to be the case now). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/mpegvideo_enc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)