highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '3c53627ac17fc6bdea5029be57da1e03b32d265d'

Browse Source 
* commit '3c53627ac17fc6bdea5029be57da1e03b32d265d':
  qsvdec: store the sync point in heap memory

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis 2016-04-11 14:56:27 +01:00
commit d30cf57a7b
1 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libavcodec/qsvdec.c
View File

@ -142,7 +142,7 @@ static int qsv_decode_init(AVCodecContext *avctx, QSVContext *q, AVPacket *avpkt
*/ */
if (!q->async_fifo) { if (!q->async_fifo) {
q->async_fifo = av_fifo_alloc((1 + 16) * q->async_fifo = av_fifo_alloc((1 + 16) *
(sizeof(mfxSyncPoint) + sizeof(QSVFrame*))); (sizeof(mfxSyncPoint*) + sizeof(QSVFrame*)));
if (!q->async_fifo) if (!q->async_fifo)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
@ -297,6 +297,16 @@ static void close_decoder(QSVContext *q)
if (q->session) if (q->session)
MFXVideoDECODE_Close(q->session); MFXVideoDECODE_Close(q->session);
while (q->async_fifo && av_fifo_size(q->async_fifo)) {
QSVFrame *out_frame;
mfxSyncPoint *sync;
av_fifo_generic_read(q->async_fifo, &out_frame, sizeof(out_frame), NULL);
av_fifo_generic_read(q->async_fifo, &sync, sizeof(sync), NULL);
av_freep(&sync);
}
cur = q->work_frames; cur = q->work_frames;
while (cur) { while (cur) {
q->work_frames = cur->next; q->work_frames = cur->next;
@ -316,7 +326,7 @@ static int do_qsv_decode(AVCodecContext *avctx, QSVContext *q,
QSVFrame *out_frame; QSVFrame *out_frame;
mfxFrameSurface1 *insurf; mfxFrameSurface1 *insurf;
mfxFrameSurface1 *outsurf; mfxFrameSurface1 *outsurf;
mfxSyncPoint sync; mfxSyncPoint *sync;
mfxBitstream bs = { { { 0 } } }; mfxBitstream bs = { { { 0 } } };
int ret; int ret;
int n_out_frames; int n_out_frames;
@ -349,13 +359,19 @@ static int do_qsv_decode(AVCodecContext *avctx, QSVContext *q,
bs.TimeStamp = avpkt->pts; bs.TimeStamp = avpkt->pts;
} }
sync = av_mallocz(sizeof(*sync));
if (!sync) {
av_freep(&sync);
return AVERROR(ENOMEM);
}
while (1) { while (1) {
ret = get_surface(avctx, q, &insurf); ret = get_surface(avctx, q, &insurf);
if (ret < 0) if (ret < 0)
return ret; return ret;
do { do {
ret = MFXVideoDECODE_DecodeFrameAsync(q->session, flush ? NULL : &bs, ret = MFXVideoDECODE_DecodeFrameAsync(q->session, flush ? NULL : &bs,
insurf, &outsurf, &sync); insurf, &outsurf, sync);
if (ret != MFX_WRN_DEVICE_BUSY) if (ret != MFX_WRN_DEVICE_BUSY)
break; break;
av_usleep(500); av_usleep(500);
@ -369,10 +385,11 @@ static int do_qsv_decode(AVCodecContext *avctx, QSVContext *q,
continue; continue;
} }
if (sync) { if (*sync) {
QSVFrame *out_frame = find_frame(q, outsurf); QSVFrame *out_frame = find_frame(q, outsurf);
if (!out_frame) { if (!out_frame) {
av_freep(&sync);
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"The returned surface does not correspond to any frame\n"); "The returned surface does not correspond to any frame\n");
return AVERROR_BUG; return AVERROR_BUG;
@ -383,6 +400,8 @@ static int do_qsv_decode(AVCodecContext *avctx, QSVContext *q,
av_fifo_generic_write(q->async_fifo, &sync, sizeof(sync), NULL); av_fifo_generic_write(q->async_fifo, &sync, sizeof(sync), NULL);
continue; continue;
} else {
av_freep(&sync);
} }
if (MFX_ERR_MORE_SURFACE != ret && ret < 0) if (MFX_ERR_MORE_SURFACE != ret && ret < 0)
break; break;
@ -390,7 +409,7 @@ static int do_qsv_decode(AVCodecContext *avctx, QSVContext *q,
/* make sure we do not enter an infinite loop if the SDK /* make sure we do not enter an infinite loop if the SDK
* did not consume any data and did not return anything */ * did not consume any data and did not return anything */
if (!sync && !bs.DataOffset && !flush) { if (!*sync && !bs.DataOffset && !flush) {
av_log(avctx, AV_LOG_WARNING, "A decode call did not consume any data\n"); av_log(avctx, AV_LOG_WARNING, "A decode call did not consume any data\n");
bs.DataOffset = avpkt->size; bs.DataOffset = avpkt->size;
} }
@ -404,6 +423,7 @@ static int do_qsv_decode(AVCodecContext *avctx, QSVContext *q,
} }
if (MFX_ERR_MORE_DATA!=ret && ret < 0) { if (MFX_ERR_MORE_DATA!=ret && ret < 0) {
av_freep(&sync);
av_log(avctx, AV_LOG_ERROR, "Error %d during QSV decoding.\n", ret); av_log(avctx, AV_LOG_ERROR, "Error %d during QSV decoding.\n", ret);
return ff_qsv_error(ret); return ff_qsv_error(ret);
} }
@ -417,9 +437,11 @@ static int do_qsv_decode(AVCodecContext *avctx, QSVContext *q,
out_frame->queued = 0; out_frame->queued = 0;
do { do {
ret = MFXVideoCORE_SyncOperation(q->session, sync, 1000); ret = MFXVideoCORE_SyncOperation(q->session, *sync, 1000);
} while (ret == MFX_WRN_IN_EXECUTION); } while (ret == MFX_WRN_IN_EXECUTION);
av_freep(&sync);
src_frame = out_frame->frame; src_frame = out_frame->frame;
ret = av_frame_ref(frame, src_frame); ret = av_frame_ref(frame, src_frame);