lavc: Drop deprecated way of setting codec dimensions

[ffmpeg] / libavcodec / qsv_internal.h

diff --git a/libavcodec/qsv_internal.h b/libavcodec/qsv_internal.h
index 949f6ebf9b1cbb2e2bc16fcf629a8fa6cd1435a6..7ac347ea2118c1729652acc3e54f625c998be5b0 100644 (file)
--- a/libavcodec/qsv_internal.h
+++ b/libavcodec/qsv_internal.h
@@ -25,6 +25,8 @@
 
 #include "libavutil/frame.h"
 
+#include "avcodec.h"
+
 #define QSV_VERSION_MAJOR 1
 #define QSV_VERSION_MINOR 1
 
@@ -34,25 +36,61 @@
     (MFX_VERSION_MAJOR > (MAJOR) ||         \
      MFX_VERSION_MAJOR == (MAJOR) && MFX_VERSION_MINOR >= (MINOR))
 
+typedef struct QSVMid {
+    AVBufferRef *hw_frames_ref;
+    mfxHDL handle;
+
+    AVFrame *locked_frame;
+    AVFrame *hw_frame;
+    mfxFrameSurface1 surf;
+} QSVMid;
+
 typedef struct QSVFrame {
     AVFrame *frame;
-    mfxFrameSurface1 *surface;
-
-    mfxFrameSurface1 surface_internal;
+    mfxFrameSurface1 surface;
 
     int queued;
+    int used;
 
     struct QSVFrame *next;
 } QSVFrame;
 
+typedef struct QSVFramesContext {
+    AVBufferRef *hw_frames_ctx;
+    void *logctx;
+
+    /* The memory ids for the external frames.
+     * Refcounted, since we need one reference owned by the QSVFramesContext
+     * (i.e. by the encoder/decoder) and another one given to the MFX session
+     * from the frame allocator. */
+    AVBufferRef *mids_buf;
+    QSVMid *mids;
+    int  nb_mids;
+} QSVFramesContext;
+
 /**
  * Convert a libmfx error code into a libav error code.
  */
-int ff_qsv_error(int mfx_err);
+int ff_qsv_map_error(mfxStatus mfx_err, const char **desc);
+
+int ff_qsv_print_error(void *log_ctx, mfxStatus err,
+                       const char *error_string);
+
+int ff_qsv_print_warning(void *log_ctx, mfxStatus err,
+                         const char *warning_string);
 
 int ff_qsv_codec_id_to_mfx(enum AVCodecID codec_id);
+int ff_qsv_profile_to_mfx(enum AVCodecID codec_id, int profile);
+
+int ff_qsv_map_pixfmt(enum AVPixelFormat format, uint32_t *fourcc);
 
 int ff_qsv_init_internal_session(AVCodecContext *avctx, mfxSession *session,
                                  const char *load_plugins);
 
+int ff_qsv_init_session_hwcontext(AVCodecContext *avctx, mfxSession *session,
+                                  QSVFramesContext *qsv_frames_ctx,
+                                  const char *load_plugins, int opaque);
+
+int ff_qsv_find_surface_idx(QSVFramesContext *ctx, QSVFrame *frame);
+
 #endif /* AVCODEC_QSV_INTERNAL_H */