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 39540452C9 for ; Tue, 17 Jan 2023 12:04:41 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9DCE068BE3E; Tue, 17 Jan 2023 14:04:38 +0200 (EET) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2039.outbound.protection.outlook.com [40.92.74.39]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 540D468B579 for ; Tue, 17 Jan 2023 14:04:31 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gWt9NjlKMOxigjrMQiQ4N3SxG4jwWxwEmiXyc9ZSgHjvs6WgkgnUmTsptXIbt4QfWBLpSS31qtEbzct/ll1jT69zbyriDov+JWv3h2y2IxehqIQNqk6wE1fkUJJ0ELevrJLuDTlaO4kb1ci8bmGkSSYegFU6p0nfdOPbb1h8iFPZgEXTVHH4kteZODEk3iDBEVq7RcEq+O+mUbGfc3TtczUCjaqOytOq2TZ9lxdopI6A+1c20AWEo8tbt4eKiTGgWKZYp6co7F3TLO3kX3i/zhphNDUqNtRkE8wKzyq+oZXEiagnku8KjiAPd8AO/HlTIbTGzT67V6gVtKbLgQwTxA== 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=ocovzLunHWqucJ8m1NaXFD3dKPs6cF/fS57kerpo7eE=; b=QrN2rd4zlGBjLY3pNY4Sze1DyAK+/AZ7h/iKkHTa2iVeS6T3x8s5ZTq6oZt29pBiSJHfR/8u1uoxCxycgeTDPNcCxVmLGGr5s0oUAskk7RIleX1wGfe5PWEi49jZCn5BSZX6DexT07Li4AsKGoeXS2cEYNO50z/tyQIneCuvYaY0ZGcAJIuD1aKDcAIw9S4cFF3ZrypK8qIKtUr3e4cVhB6QI72tZ7gaw+9F4LNv7kwoD9re64zfQnC5jCua3Es6skiYeWGNSxj6eWT8iO0JAwlssH2dYvwN9tygnKscDbfO7vJ3fskWkzjS9ptofj01RYXzCAAXlRe43O7GVAhg1w== 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=ocovzLunHWqucJ8m1NaXFD3dKPs6cF/fS57kerpo7eE=; b=a5neOTMrFvI+0KowY4kEk7U9aFSAvZ+s2AAjyFnf1pUocEiio2xN070mDUsy9HWkLy3/dNTR50frDrw2lpbX9SBWJpxLyRULbDs2Nw1tBQPADnDmi8qu3Gv91fwIbvdgJEgO2lss914dx/wSlmISTKWCKb/ah7/csOv1f7iNwnKzOPXRi4K4EtMt/X0lHIXSTZ/M15pj34yAWhdqMVide4lHE/4jMUHTYoK4U4Tztv8J//VMKT5aTlJL+SEE0AWpHJoAKxDX8uFxg3OF9IJyZsUMOhkCsvlAmF7+G5GxZC1itbEydOJVvu4TEUgo7mroe4Blyjpv4/m9CYXUdy+3PQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS4P250MB0416.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4c3::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5986.23; Tue, 17 Jan 2023 12:04:29 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::117f:e26d:2e5b:ede8]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::117f:e26d:2e5b:ede8%5]) with mapi id 15.20.5986.023; Tue, 17 Jan 2023 12:04:29 +0000 Message-ID: Date: Tue, 17 Jan 2023 13:04:59 +0100 To: ffmpeg-devel@ffmpeg.org References: <20230117113805.1882-1-pawday@mail.ru> Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: <20230117113805.1882-1-pawday@mail.ru> X-TMN: [lDnJbsnRUraainewxlMbFSiRYT+K1e2S] X-ClientProxiedBy: FR3P281CA0159.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a2::19) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <76fcd328-ab1b-ac66-2da5-33d83b906ad5@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS4P250MB0416:EE_ X-MS-Office365-Filtering-Correlation-Id: b3477831-a931-4a81-2cbb-08daf882fca9 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4gchjCUOpQJ454C2ZsCaMScuL4zh8mvfCZf+xSbmTaMb6kKRJGpa/TPpKDzKt56QINVEGHHEXYpjPuDJoOsZLl/VFOReJLw7/o4cH/OzQWVhHWkvF9uGjap0MND8Pnn+R1dWHknOyq7dCSor1MkWd4xoNXwyn+iy7k5Z5mvq5t6N8jtZHjjd+u27e0FmXsuFU/1VFOnIeLeyTxPzhc+mtjRK397qrXJC8nbcWWfon/5IedjzM5o5XxOx3hhkysbXZ21+4PPFmdf3ftwWLwB/jiIy4fnRDZFjLJLE5V0p6NJPc6bHGyfZlRH4N+m9eYxXYbtiX8FVI5o77OXG/y3paLZvodzqdgpBa7OP1nq6rqqKV8/TG28KSckE7dsU3pSUqin12GX0TPk7u5g9Zc6beYNl/qVmKgufXK3oyK6gVBp/f/fXDLHbNEcU7M3AubjHssXpKrJ0ZNQvwKcEWdCvx7ev6wtRRPj1XL/SPoKsdUG/IL0ML06YRl6ZwqXrZ/kofVqFvNq2fD1c5owoyUIhe6PISMZGRMCOMOfDPX4mFebBlHCRTmCBXysZdrVs4euEYousjNAG77XZ65uFd7KrF/TiCV2g8QAfR+r6PILilynp6jKZpoBy3EvhAIYjH+5CKWwFlUCOCavVHth638ygbecyyh+XdrMD7hAxo2uAZlE= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?SFBoem9mT2RnM2dUR3FhNUQvWFkzUXd2U0NoMEEweWloYTZFMjJ3OFNENlV5?= =?utf-8?B?V2JsYzAzTThTMXAyckJrU2tnYUdZd25OUjBvdVZYRlZubUE2OXNveHdpeVB2?= =?utf-8?B?UXlJQzZrSDM1eE5hMjBabWgrMTZMNkRJT2hzakd3bFBGOXZYbVJHYnZBN0NN?= =?utf-8?B?bXY0RmFCTGRQWEpCaTFtaEVvMTFXaS9FWmF5eWIwUS8wRlBGalYwZSs1Y1pE?= =?utf-8?B?dUkwdTJGTWdCTnNlUmdUeFlTYTlsNGw3SzBPR1Rtb3pkMGFwYUltTDlZd1Qw?= =?utf-8?B?MjhQVjlsMUIvaStYZzgyVXc1RitKYkNFVDZhQlk5MTFUVWxOckt1UGVXODkr?= =?utf-8?B?THdBeDBUTDdweEVPLyt2QnpBbVhYYVlDT3hhS2RackFRMFo2K1N4ZDZucVZO?= =?utf-8?B?c2x3eUsyY0RsMGNTTG1ESFhzSzlsZ1M0eU9DMnNhdHhOTjFWWWhOQVNFSVBV?= =?utf-8?B?Vk9tU2w4UjhwQkpNams0SVVnZmFVczRYek5tbGQ1ZzV4MUZ1c2p2ZGpJZnpp?= =?utf-8?B?eHRxTUlBdDZSQ2NrMHNvT2FLK01zVDF0RTl1Y0F0RjVhVzVGVHdTNTYwWEJx?= =?utf-8?B?RTNkUUZnMEh4R1IvaWp0MHNRTjlpalluRnRGRElIaWtrTjM3a2hqTDhxUWRN?= =?utf-8?B?RU5BMVdyMjk3UFNaK1dBUlRzakZFVWF0WVBhbllBVE1ubkQvcHNKcVQ5SFdj?= =?utf-8?B?em5LVEZINFFBWDNLZHpBbHVqb25JZ0hZV2UwMmp6REpqUFZJQ1BHS3BPZFNQ?= =?utf-8?B?VGxqTjhmOTVLQ0FCR2Zoc3hHN0dURUUwc2VocE9OVENybEVBMDA2K3J3anNL?= =?utf-8?B?bkxrN2NVcklsdjd3ZkpaK09lcEp2R0xNd21LMHlwb0dWeTNMNHBqOHp0NWtl?= =?utf-8?B?TWF5YmJubnYvZmJOelN4bDVUWkRyU05BR0JNdnJiczlWVnVJSGN4cEJHeUM0?= =?utf-8?B?akpRMlN2MElXSWZiUklHNlBXcHZjcVNmTTJPc1lZWDczT3RFWWs2U004WmJl?= =?utf-8?B?UWhBZUpKNVFlSDFTUlYzdmoxNHhISHVjYWJCa0dMejFGc25VbDN3bml3OTUv?= =?utf-8?B?OWxzZ0xYVmJCQ2VvVUxTT1krSnlSNlFvT3lyT0JrVXQ2YTZlSSsxb3dIQXAr?= =?utf-8?B?UE9kN3dwWDNqMFk3RFQ3cGdoUjBTWE5KYytzZnFCeU5aMC9pY3czYW1WMTRY?= =?utf-8?B?VWxnMTRwTWQvNkhVTkxmU3BEeEZsbExNbjJpMUZnY3lzWEZwaVB2dnFVVzBo?= =?utf-8?B?a2c0UHVGejRoRGRFR24rQmpIdU9jbGNqeitYM0cxUWRHSmZLam1BUDZ6N01w?= =?utf-8?B?OU5MRmVuNCtramt1MlZWTk1JU1N3MWY1WFc0RCsrN2VIemNicXZiYnVCVklC?= =?utf-8?B?US9DdFhXbkk1MVNXSHljK2R3VWNVR0V2dm5tV1NmbGl2Y3RJV2dTUCtJVG04?= =?utf-8?B?M294TTBZSFhYZWQvc0o1TVRuUjMvYTVQYlBHeW1Wc1BObVRJRzV2TFA5Q2N4?= =?utf-8?B?dE5ualk3VnZHdnBTbDJ4TkpuVVA5VUIraERYZ1JKZUttNHhuWG5OOXl0RGFl?= =?utf-8?B?ZnlWaVNMM2JOZXg5RFRySEZ6Z2tWZDh5Yy9SMFFqMlY2bnIyK0pjTnVpRkRX?= =?utf-8?B?TFNGcUdQK3E1ektpdWhtUkpKanhlM0lYa210VXJhUzFwK0IvdStqVmZPWVlu?= =?utf-8?B?aFdOZyt0UUpFdDRUWHRRSFdxTkw3TUdXSXE0UXZaSk5VZFp1ZFVTVnNqUjhN?= =?utf-8?Q?kV7eRFjakYXIn/vUfc=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b3477831-a931-4a81-2cbb-08daf882fca9 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jan 2023 12:04:29.6915 (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: AS4P250MB0416 Subject: Re: [FFmpeg-devel] [PATCH] avcodec: Use preprocessors conditions 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 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: pawday-at-mail.ru@ffmpeg.org: > From: Pawday > > --- > libavcodec/avcodec.c | 13 +++++++++---- > libavcodec/decode.c | 5 +++-- > libavcodec/encode.c | 8 ++++---- > 3 files changed, 16 insertions(+), 10 deletions(-) > > diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c > index a85d3c2309..1e24bdf333 100644 > --- a/libavcodec/avcodec.c > +++ b/libavcodec/avcodec.c > @@ -403,10 +403,12 @@ void avcodec_flush_buffers(AVCodecContext *avctx) > av_frame_unref(avci->buffer_frame); > av_packet_unref(avci->buffer_pkt); > > - if (HAVE_THREADS && avctx->active_thread_type & FF_THREAD_FRAME) > +#if HAVE_THREADS > + if (avctx->active_thread_type & FF_THREAD_FRAME) > ff_thread_flush(avctx); > else if (ffcodec(avctx->codec)->flush) > ffcodec(avctx->codec)->flush(avctx); > +#endif This is wrong: You are not flushing when no threads are available. > } > > void avsubtitle_free(AVSubtitle *sub) > @@ -441,12 +443,15 @@ av_cold int avcodec_close(AVCodecContext *avctx) > if (avcodec_is_open(avctx)) { > AVCodecInternal *avci = avctx->internal; > > - if (CONFIG_FRAME_THREAD_ENCODER && > - avci->frame_thread_encoder && avctx->thread_count > 1) { > +#if CONFIG_FRAME_THREAD_ENCODER > + if (avci->frame_thread_encoder && avctx->thread_count > 1) { > ff_frame_thread_encoder_free(avctx); > } > - if (HAVE_THREADS && avci->thread_ctx) > +#endif > +#if HAVE_THREADS > + if (avci->thread_ctx) > ff_thread_free(avctx); > +#endif > if (avci->needs_close && ffcodec(avctx->codec)->close) > ffcodec(avctx->codec)->close(avctx); > avci->byte_buffer_size = 0; > diff --git a/libavcodec/decode.c b/libavcodec/decode.c > index 6be2d3d6ed..7979b9277a 100644 > --- a/libavcodec/decode.c > +++ b/libavcodec/decode.c > @@ -300,8 +300,8 @@ static inline int decode_simple_internal(AVCodecContext *avctx, AVFrame *frame, > return AVERROR_EOF; > > got_frame = 0; > - > - if (HAVE_THREADS && avctx->active_thread_type & FF_THREAD_FRAME) { > +#if HAVE_THREADS > + if (avctx->active_thread_type & FF_THREAD_FRAME) { > ret = ff_thread_decode_frame(avctx, frame, &got_frame, pkt); > } else { > ret = codec->cb.decode(avctx, frame, &got_frame, pkt); > @@ -321,6 +321,7 @@ static inline int decode_simple_internal(AVCodecContext *avctx, AVFrame *frame, > } > } > } > +#endif Same issue as above: In case HAVE_THREADS is false, the else branch needs to be taken, but you #if them away. (Have you even tested this with threading disabled? It should not work at all.) > emms_c(); > actual_got_frame = got_frame; > > diff --git a/libavcodec/encode.c b/libavcodec/encode.c > index fbe2c97cd6..6f39bfeb50 100644 > --- a/libavcodec/encode.c > +++ b/libavcodec/encode.c > @@ -269,7 +269,7 @@ static int encode_simple_internal(AVCodecContext *avctx, AVPacket *avpkt) > got_packet = 0; > > av_assert0(codec->cb_type == FF_CODEC_CB_TYPE_ENCODE); > - > +#if CONFIG_FRAME_THREAD_ENCODER > if (CONFIG_FRAME_THREAD_ENCODER && avci->frame_thread_encoder) > /* This will unref frame. */ > ret = ff_thread_video_encode_frame(avctx, avpkt, frame, &got_packet); > @@ -280,7 +280,7 @@ static int encode_simple_internal(AVCodecContext *avctx, AVPacket *avpkt) > av_frame_unref(frame); > #endif > } > - > +#endif > if (avci->draining && !got_packet) > avci->draining_done = 1; > > @@ -670,11 +670,11 @@ int ff_encode_preinit(AVCodecContext *avctx) > return AVERROR(ENOMEM); > } > > - if (CONFIG_FRAME_THREAD_ENCODER) { > +#if CONFIG_FRAME_THREAD_ENCODER > ret = ff_frame_thread_encoder_init(avctx); > if (ret < 0) > return ret; > - } > +#endif > > return 0; > } _______________________________________________ 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".