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 248E7452EA for ; Tue, 17 Jan 2023 15:39:16 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F053E68BE70; Tue, 17 Jan 2023 17:39:13 +0200 (EET) Received: from mail-lj1-f176.google.com (mail-lj1-f176.google.com [209.85.208.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1E3C768BE3B for ; Tue, 17 Jan 2023 17:39:07 +0200 (EET) Received: by mail-lj1-f176.google.com with SMTP id bn6so33511531ljb.13 for ; Tue, 17 Jan 2023 07:39:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :from:to:cc:subject:date:message-id:reply-to; bh=0xalApeiLA23V1PwKGHr62MAUTtRgOJ4Y7YaNeKLglk=; b=NbVFY+qNPGgqvD8raHwudAiRbnIpnx8nvhun5ba7qH/tj1duMR1ajBUqYk+D6gOYC6 7rxuXT8jkXM74hnZxdDBJSWKfVm7BjL6Y8q78GbW3mr5dRzEcn7PXbd5iZnWPhTXvceS MErqCwL+rpXVRDSM51evRPv+YURSmKeo/gkcEDrsNVCycspUXgKbGIaFIfIcZpl/2Un7 3Xxwa+8JZ+KtVZbk/lCyF1Q4OOd0W6gDVugP6wZnmvdVbpR62ztc44hISozh/vUhRAZ3 0Bdm9U2vQwKfdGFGiJFHAIF76mTi+B/PxqOuK3OYrJmDAS6o/kFdVyxVWKRMM0IwKtfp Gpnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=0xalApeiLA23V1PwKGHr62MAUTtRgOJ4Y7YaNeKLglk=; b=mgZgu6s5GgHeE2i8xxFPxXalOuuBuWh2ZhOhy3dJPWp9aSepnm/ZqZoUVc3YIkiztj ZzZZ2nkauLaJSVyzq2bj2GvI3IZ2zMzYtQS/sBZH7CzxX7+4i7FpifTV67bIPP1dGwrc J/8nc8ymR12pT0XnjfebGtxOxDnFqRdgILfLUjdzM11bgCyHkzCU+Oos+QjaOWYZYq9z ICU7wpawrhQH7jdkkC9oBhRg+BIMDYqMn5l2+XVoo93y1xOIrL9BLnAZPVWjGrEgMlUR AbjkACqnJlwpreArSM3gkpiae/ZW4NQtO9Vh32yrUmFAlNtNxpETdbCMjNo+OTAaim0I fvag== X-Gm-Message-State: AFqh2kpJvji4k3lMQxAvw+0yUtPT/XmuDIIvU9FxilHW83FpYV05lI5h 7MJUeOiN9neYDnYYPQ/sMSIoNHEPfN7+971H/lJeEGWp X-Google-Smtp-Source: AMrXdXtxtmhYB6/mtgcMWmwKA6aWVZMV9WfBHESSuFr2huHYIwdNmEHu+HMZcD9mDrhpLzCTQNairHDkeayS5YD/TTA= X-Received: by 2002:a2e:8699:0:b0:289:7736:b921 with SMTP id l25-20020a2e8699000000b002897736b921mr325956lji.44.1673969945265; Tue, 17 Jan 2023 07:39:05 -0800 (PST) MIME-Version: 1.0 References: <20230117143125.1106-1-pawday@mail.ru> In-Reply-To: <20230117143125.1106-1-pawday@mail.ru> From: Hendrik Leppkes Date: Tue, 17 Jan 2023 16:38:52 +0100 Message-ID: To: FFmpeg development discussions and patches 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: On Tue, Jan 17, 2023 at 3:36 PM wrote: > > From: Pawday > > Thank you Andreas Rheinhardt for review > > Here the fixes for runtime "else" conditions > > --- > libavcodec/avcodec.c | 16 +++++++++++----- > libavcodec/decode.c | 11 ++++++++--- > libavcodec/encode.c | 13 ++++++++----- > libavcodec/h264dec.c | 14 +++++++------- > 4 files changed, 34 insertions(+), 20 deletions(-) > > diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c > index a85d3c2309..0e792aead9 100644 > --- a/libavcodec/avcodec.c > +++ b/libavcodec/avcodec.c > @@ -403,10 +403,13 @@ 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) > +#else > + if (ffcodec(avctx->codec)->flush) > ffcodec(avctx->codec)->flush(avctx); > +#endif > } > The before and after behavior are not identical. Just because threads are supported does not imply they are always used. > void avsubtitle_free(AVSubtitle *sub) > @@ -441,12 +444,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..54ffd0f203 100644 > --- a/libavcodec/decode.c > +++ b/libavcodec/decode.c > @@ -300,10 +300,14 @@ 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 { > + } > +#endif > + > +#if !HAVE_THREADS > + if (!(avctx->active_thread_type & FF_THREAD_FRAME)) { Same issue here. Threads are not always active even if supported. > ret = codec->cb.decode(avctx, frame, &got_frame, pkt); > > if (!(codec->caps_internal & FF_CODEC_CAP_SETS_PKT_DTS)) > @@ -321,6 +325,7 @@ static inline int decode_simple_internal(AVCodecContext *avctx, AVFrame *frame, > } > } > } > +#endif > emms_c(); > actual_got_frame = got_frame; > > diff --git a/libavcodec/encode.c b/libavcodec/encode.c > index fbe2c97cd6..b19599e67e 100644 > --- a/libavcodec/encode.c > +++ b/libavcodec/encode.c > @@ -269,17 +269,20 @@ 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 && avci->frame_thread_encoder) > +#if CONFIG_FRAME_THREAD_ENCODER > + if (avci->frame_thread_encoder) > /* This will unref frame. */ > ret = ff_thread_video_encode_frame(avctx, avpkt, frame, &got_packet); > - else { > +#endif > +#if !CONFIG_FRAME_THREAD_ENCODER > + if (!avci->frame_thread_encoder) { > ret = ff_encode_encode_cb(avctx, avpkt, frame, &got_packet); And here.. > #if FF_API_THREAD_SAFE_CALLBACKS > if (frame) > av_frame_unref(frame); > #endif > } > +#endif // !CONFIG_FRAME_THREAD_ENCODER > > if (avci->draining && !got_packet) > avci->draining_done = 1; > @@ -670,11 +673,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; > } > diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c > index 6ede4e8c9f..4538974dab 100644 > --- a/libavcodec/h264dec.c > +++ b/libavcodec/h264dec.c > @@ -933,13 +933,13 @@ static int finalize_frame(H264Context *h, AVFrame *dst, H264Picture *out, int *g > > *got_frame = 1; > > - if (CONFIG_MPEGVIDEODEC) { > - ff_print_debug_info2(h->avctx, dst, NULL, > - out->mb_type, > - out->qscale_table, > - out->motion_val, > - out->mb_width, out->mb_height, out->mb_stride, 1); > - } > +#if CONFIG_MPEGVIDEODEC > + ff_print_debug_info2(h->avctx, dst, NULL, > + out->mb_type, > + out->qscale_table, > + out->motion_val, > + out->mb_width, out->mb_height, out->mb_stride, 1); > +#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". _______________________________________________ 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".