[FFmpeg-devel] [PATCH 1/9] avcodec/(ffv1|h264|png|snow)dec: Remove comment out DRAW_HORIZ_BAND cap

[Andreas Rheinhardt]

Andreas Rheinhardt:
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
> ---
>  libavcodec/ffv1dec.c | 2 +-
>  libavcodec/h264dec.c | 2 +-
>  libavcodec/pngdec.c  | 4 ++--
>  libavcodec/snowdec.c | 2 +-
>  4 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c
> index d4bc60a7da..9a610c2ff9 100644
> --- a/libavcodec/ffv1dec.c
> +++ b/libavcodec/ffv1dec.c
> @@ -1099,7 +1099,7 @@ const FFCodec ff_ffv1_decoder = {
>      .close          = ffv1_decode_close,
>      FF_CODEC_DECODE_CB(decode_frame),
>      UPDATE_THREAD_CONTEXT(update_thread_context),
> -    .p.capabilities = AV_CODEC_CAP_DR1 /*| AV_CODEC_CAP_DRAW_HORIZ_BAND*/ |
> +    .p.capabilities = AV_CODEC_CAP_DR1 |
>                        AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_SLICE_THREADS,
>      .caps_internal  = FF_CODEC_CAP_INIT_CLEANUP |
>                        FF_CODEC_CAP_ALLOCATE_PROGRESS,
> diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c
> index 8f56f3ff92..6ede4e8c9f 100644
> --- a/libavcodec/h264dec.c
> +++ b/libavcodec/h264dec.c
> @@ -1075,7 +1075,7 @@ const FFCodec ff_h264_decoder = {
>      .init                  = h264_decode_init,
>      .close                 = h264_decode_end,
>      FF_CODEC_DECODE_CB(h264_decode_frame),
> -    .p.capabilities        = /*AV_CODEC_CAP_DRAW_HORIZ_BAND |*/ AV_CODEC_CAP_DR1 |
> +    .p.capabilities        = AV_CODEC_CAP_DR1 |
>                               AV_CODEC_CAP_DELAY | AV_CODEC_CAP_SLICE_THREADS |
>                               AV_CODEC_CAP_FRAME_THREADS,
>      .hw_configs            = (const AVCodecHWConfigInternal *const []) {
> diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c
> index 3c3eca601e..8080094d65 100644
> --- a/libavcodec/pngdec.c
> +++ b/libavcodec/pngdec.c
> @@ -1723,7 +1723,7 @@ const FFCodec ff_apng_decoder = {
>      .close          = png_dec_end,
>      FF_CODEC_DECODE_CB(decode_frame_apng),
>      UPDATE_THREAD_CONTEXT(update_thread_context),
> -    .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS /*| AV_CODEC_CAP_DRAW_HORIZ_BAND*/,
> +    .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS,
>      .caps_internal  = FF_CODEC_CAP_INIT_CLEANUP |
>                        FF_CODEC_CAP_ALLOCATE_PROGRESS |
>                        FF_CODEC_CAP_ICC_PROFILES,
> @@ -1741,7 +1741,7 @@ const FFCodec ff_png_decoder = {
>      .close          = png_dec_end,
>      FF_CODEC_DECODE_CB(decode_frame_png),
>      UPDATE_THREAD_CONTEXT(update_thread_context),
> -    .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS /*| AV_CODEC_CAP_DRAW_HORIZ_BAND*/,
> +    .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS,
>      .caps_internal  = FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM |
>                        FF_CODEC_CAP_ALLOCATE_PROGRESS | FF_CODEC_CAP_INIT_CLEANUP |
>                        FF_CODEC_CAP_ICC_PROFILES,
> diff --git a/libavcodec/snowdec.c b/libavcodec/snowdec.c
> index 5c95ffde11..bed29d3390 100644
> --- a/libavcodec/snowdec.c
> +++ b/libavcodec/snowdec.c
> @@ -662,6 +662,6 @@ const FFCodec ff_snow_decoder = {
>      .init           = ff_snow_common_init,
>      .close          = decode_end,
>      FF_CODEC_DECODE_CB(decode_frame),
> -    .p.capabilities = AV_CODEC_CAP_DR1 /*| AV_CODEC_CAP_DRAW_HORIZ_BAND*/,
> +    .p.capabilities = AV_CODEC_CAP_DR1,
>      .caps_internal  = FF_CODEC_CAP_INIT_CLEANUP,
>  };

Will apply this patchset tomorrow unless there are objections.

- Andreas