qsvenc: add an API for allocating opaque surfaces

Anton Khirnov committed 11 years ago

Commit dc923bc1 parent 2ec96b64 files · +111 −5Browse files

Unified · Split

4 files

doc/APIchanges +3 −0
libavcodec/qsv.h +47 −0
libavcodec/qsvenc.c +53 −4
libavcodec/qsvenc.h +8 −1

@@ -13,6 +13,9 @@ libavutil: 2015-08-28 · 12 unmodified lines
13		13
14	API changes, most recent first:	14	API changes, most recent first:
15		15
		16	2015-xx-xx - xxxxxxx - lavc 57.0.0 - qsv.h
		17	Add an API for allocating opaque surfaces.
		18
16	2015-xx-xx - xxxxxxx - lavu 55.2.0 - dict.h	19	2015-xx-xx - xxxxxxx - lavu 55.2.0 - dict.h
17	Change return type of av_dict_copy() from void to int, so that a proper	20	Change return type of av_dict_copy() from void to int, so that a proper
18	error code can be reported.	21	error code can be reported.

libavcodec/qsv.h+47−0

@@ -23,6 +23,8 @@ · 22 unmodified lines
23		23
24	#include <mfx/mfxvideo.h>	24	#include <mfx/mfxvideo.h>
25		25
		26	#include "libavutil/buffer.h"
		27
26	/**	28	/**
27	* This struct is used for communicating QSV parameters between libavcodec and	29	* This struct is used for communicating QSV parameters between libavcodec and
28	* the caller. It is managed by the caller and must be assigned to	30	* the caller. It is managed by the caller and must be assigned to
@@ -48,6 +50,51 @@ typedef struct AVQSVContext { · 19 unmodified lines
48	*/	50	*/
49	mfxExtBuffer **ext_buffers;	51	mfxExtBuffer **ext_buffers;
50	int nb_ext_buffers;	52	int nb_ext_buffers;
		53
		54	/**
		55	* Encoding only. If this field is set to non-zero by the caller, libavcodec
		56	* will create an mfxExtOpaqueSurfaceAlloc extended buffer and pass it to
		57	* the encoder initialization. This only makes sense if iopattern is also
		58	* set to MFX_IOPATTERN_IN_OPAQUE_MEMORY.
		59	*
		60	* The number of allocated opaque surfaces will be the sum of the number
		61	* required by the encoder and the user-provided value nb_opaque_surfaces.
		62	* The array of the opaque surfaces will be exported to the caller through
		63	* the opaque_surfaces field.
		64	*/
		65	int opaque_alloc;
		66
		67	/**
		68	* Encoding only, and only if opaque_alloc is set to non-zero. Before
		69	* calling avcodec_open2(), the caller should set this field to the number
		70	* of extra opaque surfaces to allocate beyond what is required by the
		71	* encoder.
		72	*
		73	* On return from avcodec_open2(), this field will be set by libavcodec to
		74	* the total number of allocated opaque surfaces.
		75	*/
		76	int nb_opaque_surfaces;
		77
		78	/**
		79	* Encoding only, and only if opaque_alloc is set to non-zero. On return
		80	* from avcodec_open2(), this field will be used by libavcodec to export the
		81	* array of the allocated opaque surfaces to the caller, so they can be
		82	* passed to other parts of the pipeline.
		83	*
		84	* The buffer reference exported here is owned and managed by libavcodec,
		85	* the callers should make their own reference with av_buffer_ref() and free
		86	* it with av_buffer_unref() when it is no longer needed.
		87	*
		88	* The buffer data is an nb_opaque_surfaces-sized array of mfxFrameSurface1.
		89	*/
		90	AVBufferRef *opaque_surfaces;
		91
		92	/**
		93	* Encoding only, and only if opaque_alloc is set to non-zero. On return
		94	* from avcodec_open2(), this field will be set to the surface type used in
		95	* the opaque allocation request.
		96	*/
		97	int opaque_alloc_type;
51	} AVQSVContext;	98	} AVQSVContext;
52		99
53	/**	100	/**

libavcodec/qsvenc.c+53−4

         q->extco.CAVLC                = avctx->coder_type == FF_CODER_TYPE_VLC ?
                                         MFX_CODINGOPTION_ON : MFX_CODINGOPTION_UNKNOWN;
-        q->extparam_internal[0] = (mfxExtBuffer *)&q->extco;
+        q->extparam_internal[q->nb_extparam_internal++] = (mfxExtBuffer *)&q->extco;
     }
     return 0;
     return 0;
 }
+static int qsv_init_opaque_alloc(AVCodecContext *avctx, QSVEncContext *q)
+{
+    AVQSVContext *qsv = avctx->hwaccel_context;
+    mfxFrameSurface1 *surfaces;
+    int nb_surfaces, i;
+    nb_surfaces = qsv->nb_opaque_surfaces + q->req.NumFrameSuggested + q->async_depth;
+    q->opaque_alloc_buf = av_buffer_allocz(sizeof(*surfaces) * nb_surfaces);
+    if (!q->opaque_alloc_buf)
+        return AVERROR(ENOMEM);
+    q->opaque_surfaces = av_malloc_array(nb_surfaces, sizeof(*q->opaque_surfaces));
+    if (!q->opaque_surfaces)
+        return AVERROR(ENOMEM);
+    surfaces = (mfxFrameSurface1*)q->opaque_alloc_buf->data;
+    for (i = 0; i < nb_surfaces; i++) {
+        surfaces[i].Info      = q->req.Info;
+        q->opaque_surfaces[i] = surfaces + i;
+    }
+    q->opaque_alloc.Header.BufferId = MFX_EXTBUFF_OPAQUE_SURFACE_ALLOCATION;
+    q->opaque_alloc.Header.BufferSz = sizeof(q->opaque_alloc);
+    q->opaque_alloc.In.Surfaces     = q->opaque_surfaces;
+    q->opaque_alloc.In.NumSurface   = nb_surfaces;
+    q->opaque_alloc.In.Type         = q->req.Type;
+    q->extparam_internal[q->nb_extparam_internal++] = (mfxExtBuffer *)&q->opaque_alloc;
+    qsv->nb_opaque_surfaces = nb_surfaces;
+    qsv->opaque_surfaces    = q->opaque_alloc_buf;
+    qsv->opaque_alloc_type  = q->req.Type;
+    return 0;
+}
 int ff_qsv_enc_init(AVCodecContext *avctx, QSVEncContext *q)
 {
+    int opaque_alloc = 0;
     int ret;
     q->param.IOPattern  = MFX_IOPATTERN_IN_SYSTEM_MEMORY;
         q->session         = qsv->session;
         q->param.IOPattern = qsv->iopattern;
+        opaque_alloc = qsv->opaque_alloc;
     }
     if (!q->session) {
         return ff_qsv_error(ret);
     }
+    if (opaque_alloc) {
+        ret = qsv_init_opaque_alloc(avctx, q);
+        if (ret < 0)
+            return ret;
+    }
     if (avctx->hwaccel_context) {
         AVQSVContext *qsv = avctx->hwaccel_context;
         int i, j;
-        q->extparam = av_mallocz_array(qsv->nb_ext_buffers + FF_ARRAY_ELEMS(q->extparam_internal),
+        q->extparam = av_mallocz_array(qsv->nb_ext_buffers + q->nb_extparam_internal,
                                        sizeof(*q->extparam));
         if (!q->extparam)
             return AVERROR(ENOMEM);
             q->param.ExtParam[i] = qsv->ext_buffers[i];
         q->param.NumExtParam = qsv->nb_ext_buffers;
-        for (i = 0; i < FF_ARRAY_ELEMS(q->extparam_internal); i++) {
+        for (i = 0; i < q->nb_extparam_internal; i++) {
             for (j = 0; j < qsv->nb_ext_buffers; j++) {
                 if (qsv->ext_buffers[j]->BufferId == q->extparam_internal[i]->BufferId)
                     break;
         }
     } else {
         q->param.ExtParam    = q->extparam_internal;
-        q->param.NumExtParam = FF_ARRAY_ELEMS(q->extparam_internal);
+        q->param.NumExtParam = q->nb_extparam_internal;
     }
     ret = MFXVideoENCODE_Init(q->session, &q->param);
     av_fifo_free(q->async_fifo);
     q->async_fifo = NULL;
+    av_freep(&q->opaque_surfaces);
+    av_buffer_unref(&q->opaque_alloc_buf);
     av_freep(&q->extparam);
     return 0;

libavcodec/qsvenc.h+8−1

@@ -49,7 +49,14 @@ typedef struct QSVEncContext { · 48 unmodified lines
49	mfxFrameAllocRequest req;	49	mfxFrameAllocRequest req;
50		50
51	mfxExtCodingOption extco;	51	mfxExtCodingOption extco;
52	mfxExtBuffer *extparam_internal[1];	52
		53	mfxExtOpaqueSurfaceAlloc opaque_alloc;
		54	mfxFrameSurface1 **opaque_surfaces;
		55	AVBufferRef *opaque_alloc_buf;
		56
		57	mfxExtBuffer *extparam_internal[2];
		58	int nb_extparam_internal;
		59
53	mfxExtBuffer **extparam;	60	mfxExtBuffer **extparam;
54		61
55	AVFifoBuffer *async_fifo;	62	AVFifoBuffer *async_fifo;

qsvenc: add an API for allocating opaque surfaces

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code