ffv1dec: add support for hwaccels

This commit adds support for hardware accelerated decoding to the decoder. The previous commits already refactored the decoder, this commit simply adds calls to hooks to decode.

Lynne committed 1 year ago

Commit 23eb4991 parent 53ff9002 files · +75 −8Browse files

Showing the changes to libavcodec (2 of 2 files). Show all

Unified · Split

2 files

libavcodec/ffv1.h +2 −0
libavcodec/ffv1dec.c +73 −8

libavcodec/ffv1.h+2−0

     int64_t picture_number;
     int key_frame;
     ProgressFrame picture, last_picture;
+    void *hwaccel_picture_private, *hwaccel_last_picture_private;
     uint32_t crcref;
     enum AVPixelFormat pix_fmt;
+    enum AVPixelFormat configured_pix_fmt;
     const AVFrame *cur_enc_frame;
     int plane_count;

libavcodec/ffv1dec.c+73−8

 #include "libavutil/refstruct.h"
 #include "thread.h"
 #include "decode.h"
+#include "hwconfig.h"
+#include "hwaccel_internal.h"
+#include "config_components.h"
 static inline int get_vlc_symbol(GetBitContext *gb, VlcState *const state,
                                  int bits)
     if (ret < 0)
         return ret;
-    f->avctx->pix_fmt = get_pixel_format(f);
+    if (f->configured_pix_fmt != f->pix_fmt) {
-    if (f->avctx->pix_fmt < 0)
+        f->avctx->pix_fmt = get_pixel_format(f);
-        return AVERROR(EINVAL);
+        if (f->avctx->pix_fmt < 0)
+            return AVERROR(EINVAL);
+        f->configured_pix_fmt = f->pix_fmt;
+    }
     ff_dlog(f->avctx, "%d %d %d\n",
             f->chroma_h_shift, f->chroma_v_shift, f->pix_fmt);
     FFV1Context *f = avctx->priv_data;
     int ret;
+    f->pix_fmt = AV_PIX_FMT_NONE;
+    f->configured_pix_fmt = AV_PIX_FMT_NONE;
     if ((ret = ff_ffv1_common_init(avctx, f)) < 0)
         return ret;
     FFV1Context *f      = avctx->priv_data;
     int ret;
     AVFrame *p;
+    const FFHWAccel *hwaccel = NULL;
     /* This is copied onto the first slice's range coder context */
     RangeCoder c;
     ff_progress_frame_unref(&f->last_picture);
-    FFSWAP(ProgressFrame, f->picture, f->last_picture);
+    av_refstruct_unref(&f->hwaccel_last_picture_private);
+    FFSWAP(ProgressFrame, f->picture, f->last_picture);
+    FFSWAP(void *, f->hwaccel_picture_private, f->hwaccel_last_picture_private);
     f->avctx = avctx;
     f->frame_damaged = 0;
     if (avctx->skip_frame >= AVDISCARD_ALL)
         return avpkt->size;
+    if (avctx->hwaccel)
+        hwaccel = ffhwaccel(avctx->hwaccel);
     ret = ff_progress_frame_get_buffer(avctx, &f->picture,
                                        AV_GET_BUFFER_FLAG_REF);
     if (ret < 0)
         return ret;
+    ret = ff_hwaccel_frame_priv_alloc(avctx, &f->hwaccel_picture_private);
+    if (ret < 0)
+        return ret;
     p = f->picture.f;
     p->pict_type = AV_PICTURE_TYPE_I; //FIXME I vs. P
             p->flags |= AV_FRAME_FLAG_TOP_FIELD_FIRST;
     }
+    /* Start */
+    if (hwaccel) {
+        ret = hwaccel->start_frame(avctx, avpkt->data, avpkt->size);
+        if (ret < 0)
+            return ret;
+    }
     ff_thread_finish_setup(avctx);
-    ret = decode_slices(avctx, c, avpkt);
+    /* Decode slices */
-    if (ret < 0)
+    if (hwaccel) {
-        return ret;
+        uint8_t *buf_end = avpkt->data + avpkt->size;
+        if (!(p->flags & AV_FRAME_FLAG_KEY) && f->last_picture.f)
+            ff_progress_frame_await(&f->last_picture, f->slice_count - 1);
+        for (int i = f->slice_count - 1; i >= 0; i--) {
+            uint8_t *pos;
+            uint32_t len;
+            ret = find_next_slice(avctx, avpkt->data, buf_end, i,
+                                  &pos, &len);
+            if (ret < 0)
+                return ret;
+            buf_end -= len;
+            ret = hwaccel->decode_slice(avctx, pos, len);
+            if (ret < 0)
+                return ret;
+        }
+    } else {
+        ret = decode_slices(avctx, c, avpkt);
+        if (ret < 0)
+            return ret;
+    }
+    /* Finalize */
+    if (hwaccel) {
+        ret = hwaccel->end_frame(avctx);
+        if (ret < 0)
+            return ret;
+    }
     ff_progress_frame_report(&f->picture, INT_MAX);
     ff_progress_frame_unref(&f->last_picture);
+    av_refstruct_unref(&f->hwaccel_last_picture_private);
     if ((ret = av_frame_ref(rframe, f->picture.f)) < 0)
         return ret;
     fdst->ac                  = fsrc->ac;
     fdst->colorspace          = fsrc->colorspace;
     fdst->pix_fmt             = fsrc->pix_fmt;
+    fdst->configured_pix_fmt  = fsrc->configured_pix_fmt;
     fdst->ec                  = fsrc->ec;
     fdst->intra               = fsrc->intra;
     av_assert1(fdst->max_slice_count == fsrc->max_slice_count);
     ff_progress_frame_replace(&fdst->picture, &fsrc->picture);
+    av_refstruct_replace(&fdst->hwaccel_picture_private,
+                         fsrc->hwaccel_picture_private);
     return 0;
 }
     FFV1Context *const s = avctx->priv_data;
     ff_progress_frame_unref(&s->picture);
+    av_refstruct_unref(&s->hwaccel_picture_private);
     ff_progress_frame_unref(&s->last_picture);
-    av_freep(&avctx->stats_out);
+    av_refstruct_unref(&s->hwaccel_last_picture_private);
     ff_ffv1_close(s);
     .caps_internal  = FF_CODEC_CAP_INIT_CLEANUP |
                       FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM |
                       FF_CODEC_CAP_USES_PROGRESSFRAMES,
+    .hw_configs     = (const AVCodecHWConfigInternal *const []) {
+        NULL
+    },
 };

ffv1dec: add support for hwaccels

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code