virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

qsvenc: support passing arbitrary external buffers to the encoder

Browse Source
This commit is contained in:
Anton Khirnov
2015-08-05 15:22:34 +02:00
parent 68e00ad66d
commit 772c87c5a6
2 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
libavcodec/qsvenc.c
View File

@@ -134,10 +134,7 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q)
q->extco.CAVLC = avctx->coder_type == FF_CODER_TYPE_VLC ? q->extco.CAVLC = avctx->coder_type == FF_CODER_TYPE_VLC ?
MFX_CODINGOPTION_ON : MFX_CODINGOPTION_UNKNOWN; MFX_CODINGOPTION_ON : MFX_CODINGOPTION_UNKNOWN;
q->extparam[0] = (mfxExtBuffer *)&q->extco; q->extparam_internal[0] = (mfxExtBuffer *)&q->extco;
q->param.ExtParam = q->extparam;
q->param.NumExtParam = FF_ARRAY_ELEMS(q->extparam);
} }
return 0; return 0;
@@ -228,6 +225,35 @@ int ff_qsv_enc_init(AVCodecContext *avctx, QSVEncContext *q)
return ff_qsv_error(ret); return ff_qsv_error(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),
sizeof(*q->extparam));
if (!q->extparam)
return AVERROR(ENOMEM);
q->param.ExtParam = q->extparam;
for (i = 0; i < qsv->nb_ext_buffers; i++)
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 (j = 0; j < qsv->nb_ext_buffers; j++) {
if (qsv->ext_buffers[j]->BufferId == q->extparam_internal[i]->BufferId)
break;
}
if (j < qsv->nb_ext_buffers)
continue;
q->param.ExtParam[q->param.NumExtParam++] = q->extparam_internal[i];
}
} else {
q->param.ExtParam = q->extparam_internal;
q->param.NumExtParam = FF_ARRAY_ELEMS(q->extparam_internal);
}
ret = MFXVideoENCODE_Init(q->session, &q->param); ret = MFXVideoENCODE_Init(q->session, &q->param);
if (ret < 0) { if (ret < 0) {
av_log(avctx, AV_LOG_ERROR, "Error initializing the encoder\n"); av_log(avctx, AV_LOG_ERROR, "Error initializing the encoder\n");
@@ -512,5 +538,7 @@ int ff_qsv_enc_close(AVCodecContext *avctx, QSVEncContext *q)
av_fifo_free(q->async_fifo); av_fifo_free(q->async_fifo);
q->async_fifo = NULL; q->async_fifo = NULL;
av_freep(&q->extparam);
return 0; return 0;
} }

3
libavcodec/qsvenc.h
View File

@@ -49,7 +49,8 @@ typedef struct QSVEncContext {
mfxFrameAllocRequest req; mfxFrameAllocRequest req;
mfxExtCodingOption extco; mfxExtCodingOption extco;
mfxExtBuffer *extparam[1]; mfxExtBuffer *extparam_internal[1];
mfxExtBuffer **extparam;
AVFifoBuffer *async_fifo; AVFifoBuffer *async_fifo;