[FFmpeg-devel] [PATCH] avcodec: Use preprocessors conditions

[Andreas Rheinhardt]

pawday-at-mail.ru at ffmpeg.org:
> From: Pawday <pawday at mail.ru>
> 
> ---
>  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;
>  }