[FFmpeg-cvslog] avcodec/v4l2_context: expose timeout for dequeue_frame
Aman Gupta
git at videolan.org
Wed Sep 11 20:40:19 EEST 2019
ffmpeg | branch: master | Aman Gupta <aman at tmm1.net> | Sat Aug 24 12:02:30 2019 -0700| [fac834b2ae0b2802f1eca9fd804fbdf6cd34ac33] | committer: Aman Gupta
avcodec/v4l2_context: expose timeout for dequeue_frame
Signed-off-by: Aman Gupta <aman at tmm1.net>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fac834b2ae0b2802f1eca9fd804fbdf6cd34ac33
---
libavcodec/v4l2_context.c | 6 +++---
libavcodec/v4l2_context.h | 3 ++-
libavcodec/v4l2_m2m_dec.c | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/libavcodec/v4l2_context.c b/libavcodec/v4l2_context.c
index 1f1b8347dc..862b382233 100644
--- a/libavcodec/v4l2_context.c
+++ b/libavcodec/v4l2_context.c
@@ -582,16 +582,16 @@ int ff_v4l2_context_enqueue_packet(V4L2Context* ctx, const AVPacket* pkt)
return ff_v4l2_buffer_enqueue(avbuf);
}
-int ff_v4l2_context_dequeue_frame(V4L2Context* ctx, AVFrame* frame)
+int ff_v4l2_context_dequeue_frame(V4L2Context* ctx, AVFrame* frame, int timeout)
{
V4L2Buffer* avbuf = NULL;
/*
- * blocks until:
+ * timeout=-1 blocks until:
* 1. decoded frame available
* 2. an input buffer is ready to be dequeued
*/
- avbuf = v4l2_dequeue_v4l2buf(ctx, -1);
+ avbuf = v4l2_dequeue_v4l2buf(ctx, timeout);
if (!avbuf) {
if (ctx->done)
return AVERROR_EOF;
diff --git a/libavcodec/v4l2_context.h b/libavcodec/v4l2_context.h
index ee08f3de41..1026f5b8e1 100644
--- a/libavcodec/v4l2_context.h
+++ b/libavcodec/v4l2_context.h
@@ -154,9 +154,10 @@ int ff_v4l2_context_dequeue_packet(V4L2Context* ctx, AVPacket* pkt);
* The frame must be non NULL.
* @param[in] ctx The V4L2Context to dequeue from.
* @param[inout] f The AVFrame to dequeue to.
+ * @param[in] timeout The timeout for dequeue (-1 to block, 0 to return immediately, or milliseconds)
* @return 0 in case of success, AVERROR(EAGAIN) if no buffer was ready, another negative error in case of error.
*/
-int ff_v4l2_context_dequeue_frame(V4L2Context* ctx, AVFrame* f);
+int ff_v4l2_context_dequeue_frame(V4L2Context* ctx, AVFrame* f, int timeout);
/**
* Enqueues a buffer to a V4L2Context from an AVPacket
diff --git a/libavcodec/v4l2_m2m_dec.c b/libavcodec/v4l2_m2m_dec.c
index a3744208f3..686e130387 100644
--- a/libavcodec/v4l2_m2m_dec.c
+++ b/libavcodec/v4l2_m2m_dec.c
@@ -162,7 +162,7 @@ static int v4l2_receive_frame(AVCodecContext *avctx, AVFrame *frame)
dequeue:
av_packet_unref(&avpkt);
- return ff_v4l2_context_dequeue_frame(capture, frame);
+ return ff_v4l2_context_dequeue_frame(capture, frame, -1);
}
static av_cold int v4l2_decode_init(AVCodecContext *avctx)
More information about the ffmpeg-cvslog
mailing list