| Message ID | 20230117143125.1106-1-pawday@mail.ru |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel] avcodec: Use preprocessors conditions | expand |
On Tue, Jan 17, 2023 at 3:36 PM <pawday-at-mail.ru@ffmpeg.org> wrote: > > From: Pawday <pawday@mail.ru> > > 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".
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 } 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)) { 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); #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;
From: Pawday <pawday@mail.ru> 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(-)