RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-04-01 22:49:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit 'f5c4d38c78347b09478e21a661befff4b2d44643'

Browse Source 
* commit 'f5c4d38c78347b09478e21a661befff4b2d44643':
  qsvdec: properly handle asynchronous decoding

Conflicts:
	libavcodec/qsvdec.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2015-07-19 16:13:35 +02:00
commit f929081f2e
3 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/qsv_internal.h
View File

@ -55,6 +55,8 @@ typedef struct QSVFrame {
mfxFrameSurface1 surface_internal; mfxFrameSurface1 surface_internal;
int queued;
struct QSVFrame *next; struct QSVFrame *next;
} QSVFrame; } QSVFrame;

42
libavcodec/qsvdec.c
View File

@ -54,6 +54,11 @@ int ff_qsv_decode_init(AVCodecContext *avctx, QSVContext *q)
mfxVideoParam param = { { 0 } }; mfxVideoParam param = { { 0 } };
int ret; int ret;
q->async_fifo = av_fifo_alloc((1 + q->async_depth) *
(sizeof(mfxSyncPoint) + sizeof(QSVFrame*)));
if (!q->async_fifo)
return AVERROR(ENOMEM);
q->iopattern = MFX_IOPATTERN_OUT_SYSTEM_MEMORY; q->iopattern = MFX_IOPATTERN_OUT_SYSTEM_MEMORY;
if (avctx->hwaccel_context) { if (avctx->hwaccel_context) {
@ -134,7 +139,7 @@ static void qsv_clear_unused_frames(QSVContext *q)
{ {
QSVFrame *cur = q->work_frames; QSVFrame *cur = q->work_frames;
while (cur) { while (cur) {
if (cur->surface && !cur->surface->Data.Locked) { if (cur->surface && !cur->surface->Data.Locked && !cur->queued) {
cur->surface = NULL; cur->surface = NULL;
av_frame_unref(cur->frame); av_frame_unref(cur->frame);
} }
@ -183,12 +188,12 @@ static int get_surface(AVCodecContext *avctx, QSVContext *q, mfxFrameSurface1 **
return 0; return 0;
} }
static AVFrame *find_frame(QSVContext *q, mfxFrameSurface1 *surf) static QSVFrame *find_frame(QSVContext *q, mfxFrameSurface1 *surf)
{ {
QSVFrame *cur = q->work_frames; QSVFrame *cur = q->work_frames;
while (cur) { while (cur) {
if (surf == cur->surface) if (surf == cur->surface)
return cur->frame; return cur;
cur = cur->next; cur = cur->next;
} }
return NULL; return NULL;
@ -198,6 +203,7 @@ int ff_qsv_decode(AVCodecContext *avctx, QSVContext *q,
AVFrame *frame, int *got_frame, AVFrame *frame, int *got_frame,
AVPacket *avpkt) AVPacket *avpkt)
{ {
QSVFrame *out_frame;
mfxFrameSurface1 *insurf; mfxFrameSurface1 *insurf;
mfxFrameSurface1 *outsurf; mfxFrameSurface1 *outsurf;
mfxSyncPoint sync; mfxSyncPoint sync;
@ -232,21 +238,37 @@ int ff_qsv_decode(AVCodecContext *avctx, QSVContext *q,
} }
if (sync) { if (sync) {
AVFrame *src_frame; QSVFrame *out_frame = find_frame(q, outsurf);
MFXVideoCORE_SyncOperation(q->session, sync, 60000); if (!out_frame) {
src_frame = find_frame(q, outsurf);
if (!src_frame) {
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;
} }
out_frame->queued = 1;
av_fifo_generic_write(q->async_fifo, &out_frame, sizeof(out_frame), NULL);
av_fifo_generic_write(q->async_fifo, &sync, sizeof(sync), NULL);
}
if (!av_fifo_space(q->async_fifo) ||
(!avpkt->size && av_fifo_size(q->async_fifo))) {
AVFrame *src_frame;
av_fifo_generic_read(q->async_fifo, &out_frame, sizeof(out_frame), NULL);
av_fifo_generic_read(q->async_fifo, &sync, sizeof(sync), NULL);
out_frame->queued = 0;
MFXVideoCORE_SyncOperation(q->session, sync, 60000);
src_frame = out_frame->frame;
ret = av_frame_ref(frame, src_frame); ret = av_frame_ref(frame, src_frame);
if (ret < 0) if (ret < 0)
return ret; return ret;
outsurf = out_frame->surface;
frame->pkt_pts = frame->pts = outsurf->Data.TimeStamp; frame->pkt_pts = frame->pts = outsurf->Data.TimeStamp;
frame->repeat_pict = frame->repeat_pict =
@ -274,6 +296,10 @@ int ff_qsv_decode_close(QSVContext *q)
av_freep(&cur); av_freep(&cur);
cur = q->work_frames; cur = q->work_frames;
} }
av_fifo_free(q->async_fifo);
q->async_fifo = NULL;
ff_qsv_close_internal_session(&q->internal_qs); ff_qsv_close_internal_session(&q->internal_qs);
return 0; return 0;

3
libavcodec/qsvdec.h
View File

@ -28,6 +28,7 @@
#include <mfx/mfxvideo.h> #include <mfx/mfxvideo.h>
#include "libavutil/fifo.h"
#include "libavutil/frame.h" #include "libavutil/frame.h"
#include "libavutil/pixfmt.h" #include "libavutil/pixfmt.h"
@ -47,6 +48,8 @@ typedef struct QSVContext {
*/ */
QSVFrame *work_frames; QSVFrame *work_frames;
AVFifoBuffer *async_fifo;
// options set by the caller // options set by the caller
int async_depth; int async_depth;
int iopattern; int iopattern;