lavc/vvc_dec: Add hardware decode API

Fei Wang committed 2 years ago

Commit 4dc18c71 parent a94aa2d3 files · +86 −13Browse files

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

Unified · Split

3 files

libavcodec/vvc/dec.c +76 −13
libavcodec/vvc/dec.h +4 −0
libavcodec/vvc/refs.c +6 −0

  */
 #include "libavcodec/codec_internal.h"
 #include "libavcodec/decode.h"
+#include "libavcodec/hwaccel_internal.h"
+#include "libavcodec/hwconfig.h"
 #include "libavcodec/profiles.h"
 #include "libavcodec/refstruct.h"
 #include "libavutil/cpu.h"
     ff_refstruct_replace(&dst->rpl_tab, src->rpl_tab);
     ff_refstruct_replace(&dst->rpl, src->rpl);
+    ff_refstruct_replace(&dst->hwaccel_picture_private,
+                          src->hwaccel_picture_private);
     dst->nb_rpl_elems = src->nb_rpl_elems;
     dst->poc = src->poc;
     return 0;
 }
-static void export_frame_params(VVCContext *s, const VVCFrameContext *fc)
+static enum AVPixelFormat get_format(AVCodecContext *avctx, const VVCSPS *sps)
+{
+#define HWACCEL_MAX 0
+    enum AVPixelFormat pix_fmts[HWACCEL_MAX + 2], *fmt = pix_fmts;
+    switch (sps->pix_fmt) {
+    case AV_PIX_FMT_YUV420P:
+        break;
+    case AV_PIX_FMT_YUV420P10:
+        break;
+    }
+    *fmt++ = sps->pix_fmt;
+    *fmt = AV_PIX_FMT_NONE;
+    return ff_get_format(avctx, pix_fmts);
+}
+static int export_frame_params(VVCContext *s, const VVCFrameContext *fc)
 {
     AVCodecContext *c = s->avctx;
     const VVCSPS *sps = fc->ps.sps;
     const VVCPPS *pps = fc->ps.pps;
+    int ret;
-    c->pix_fmt      = sps->pix_fmt;
+    // Reset HW config if pix_fmt/w/h change.
-    c->coded_width  = pps->width;
+    if (s->pix_fmt != sps->pix_fmt || c->coded_width != pps->width || c->coded_height != pps->height) {
-    c->coded_height = pps->height;
+        c->coded_width  = pps->width;
-    c->width        = pps->width  - ((pps->r->pps_conf_win_left_offset + pps->r->pps_conf_win_right_offset) << sps->hshift[CHROMA]);
+        c->coded_height = pps->height;
-    c->height       = pps->height - ((pps->r->pps_conf_win_top_offset + pps->r->pps_conf_win_bottom_offset) << sps->vshift[CHROMA]);
+        ret = get_format(c, sps);
+        if (ret < 0)
+            return ret;
+        c->pix_fmt = ret;
+        s->pix_fmt = sps->pix_fmt;
+    }
+    c->width  = pps->width  - ((pps->r->pps_conf_win_left_offset + pps->r->pps_conf_win_right_offset) << sps->hshift[CHROMA]);
+    c->height = pps->height - ((pps->r->pps_conf_win_top_offset + pps->r->pps_conf_win_bottom_offset) << sps->vshift[CHROMA]);
     c->has_b_frames = sps->r->sps_dpb_params.dpb_max_num_reorder_pics[sps->r->sps_max_sublayers_minus1];
+    return 0;
 }
 static int frame_setup(VVCFrameContext *fc, VVCContext *s)
     if (ret < 0)
         return ret;
-    export_frame_params(s, fc);
+    ret = export_frame_params(s, fc);
-    return ret;
+    if (ret < 0)
+        return ret;
+    return 0;
 }
 static int decode_slice(VVCContext *s, VVCFrameContext *fc, const H2645NAL *nal, const CodedBitstreamUnit *unit)
     ret = slice_init_entry_points(sc, fc, nal, unit);
     if (ret < 0)
         return ret;
+    if (s->avctx->hwaccel) {
+        if (is_first_slice) {
+            ret = FF_HW_CALL(s->avctx, start_frame, NULL, 0);
+            if (ret < 0)
+                return ret;
+        }
+        ret = FF_HW_CALL(s->avctx, decode_slice,
+                         nal->raw_data, nal->raw_size);
+        if (ret < 0)
+            return ret;
+    }
     fc->nb_slices++;
     return 0;
 static int submit_frame(VVCContext *s, VVCFrameContext *fc, AVFrame *output, int *got_output)
 {
-    int ret = ff_vvc_frame_submit(s, fc);
+    int ret;
-    if (ret < 0) {
+    if (s->avctx->hwaccel) {
-        ff_vvc_report_frame_finished(fc->ref);
+        if (ret = FF_HW_SIMPLE_CALL(s->avctx, end_frame) < 0) {
-        return ret;
+            av_log(s->avctx, AV_LOG_ERROR,
+                   "Hardware accelerator failed to decode picture\n");
+            ff_vvc_unref_frame(fc, fc->ref, ~0);
+            return ret;
+        }
+    } else {
+        if (ret = ff_vvc_frame_submit(s, fc) < 0) {
+            ff_vvc_report_frame_finished(fc->ref);
+            return ret;
+        }
     }
     s->nb_frames++;
     s->nb_delayed++;
-    if (s->nb_delayed >= s->nb_fcs) {
+    if (s->nb_delayed >= s->nb_fcs || s->avctx->hwaccel) {
         if ((ret = wait_delayed_frame(s, output, got_output)) < 0)
             return ret;
     }
     GDR_SET_RECOVERED(s);
     ff_thread_once(&init_static_once, init_default_scale_m);
+    s->pix_fmt = AV_PIX_FMT_NONE;
     return 0;
 }

libavcodec/vvc/dec.h+4−0

      * A combination of VVC_FRAME_FLAG_*
      */
     uint8_t flags;
+    void *hwaccel_picture_private; ///< hardware accelerator private data
 } VVCFrame;
 typedef struct SliceContext {
     uint64_t nb_frames;     ///< processed frames
     int nb_delayed;         ///< delayed frames
+    enum AVPixelFormat pix_fmt; ///< pix format of current frame
 }  VVCContext ;
 #endif /* AVCODEC_VVC_DEC_H */

libavcodec/vvc/refs.c+6−0

 #include "libavutil/thread.h"
 #include "libavcodec/refstruct.h"
 #include "libavcodec/thread.h"
+#include "libavcodec/decode.h"
 #include "refs.h"
         ff_refstruct_unref(&frame->rpl_tab);
         frame->collocated_ref = NULL;
+        ff_refstruct_unref(&frame->hwaccel_picture_private);
     }
 }
         if (!frame->progress)
             goto fail;
+        ret = ff_hwaccel_frame_priv_alloc(s->avctx, &frame->hwaccel_picture_private);
+        if (ret < 0)
+            goto fail;
         return frame;
 fail:
         ff_vvc_unref_frame(fc, frame, ~0);

lavc/vvc_dec: Add hardware decode API

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code