jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-28 13:46:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2079 from jasaw/xu4-hw-h264

Browse Source 
ffmpeg: make v4l2 buffer dequeue non-blocking (zero timeout)
This commit is contained in:
Calin Crisan 2019-09-02 09:18:29 +02:00 committed by GitHub
commit 83cd5fdb22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/ffmpeg/1006-avcodec-v4l2-add-timeout-when-dequeueing-buffers.patch
View File

@ -15,7 +15,7 @@ index efcb0426e4..8f9420e28d 100644
* 2. an input buffer is ready to be dequeued
*/
- avbuf = v4l2_dequeue_v4l2buf(ctx, -1);
+ avbuf = v4l2_dequeue_v4l2buf(ctx, ctx_to_m2mctx(ctx)->draining ? -1 : 50);
+ avbuf = v4l2_dequeue_v4l2buf(ctx, ctx_to_m2mctx(ctx)->draining ? -1 : 0);
if (!avbuf) {
if (ctx->done)
return AVERROR_EOF;
@ -24,7 +24,7 @@ index efcb0426e4..8f9420e28d 100644
* 2. an input buffer ready to be dequeued
*/
- avbuf = v4l2_dequeue_v4l2buf(ctx, -1);
+ avbuf = v4l2_dequeue_v4l2buf(ctx, ctx_to_m2mctx(ctx)->draining ? -1 : 50);
+ avbuf = v4l2_dequeue_v4l2buf(ctx, ctx_to_m2mctx(ctx)->draining ? -1 : 0);
if (!avbuf) {
if (ctx->done)
return AVERROR_EOF;