From patchwork Tue Jan 9 22:56:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jorge Ramirez-Ortiz X-Patchwork-Id: 7240 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.78.2 with SMTP id r2csp4473015jaa; Tue, 9 Jan 2018 14:57:09 -0800 (PST) X-Google-Smtp-Source: ACJfBouxTliuDZbGOvTKtbRg5ZUOyWbHW+j7iFYFjHV7hA2AKMiSp+Ih07A8TRfdcDcNM/kl4HB3 X-Received: by 10.28.237.21 with SMTP id l21mr12663965wmh.76.1515538629176; Tue, 09 Jan 2018 14:57:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515538629; cv=none; d=google.com; s=arc-20160816; b=QcFs4f8BCprtwKrQRStqhOssE4P5hdM9VwZ+F5ceuNlRfO4J1Iwgu6iwRAbBRhX/+v fvCjTvuXsNu+BxBlNEWJnXGCjFqbCzR9+jfvISsIEhLprTweZNRiMC3WqRzypguqEFb7 gXOGM9ZJGaW/uH12CMOfeThkamgmT+kbuSJStUp5ERX+O/ow99oSxLbs3eRm9m57qiqM TnQ9XH+xX/RJ5SNEjAB6kicSxJ5bxv/TplqxqIlyo4IbSHlD5Ob1XkIx+2DqEvu6AOMJ dWz996tOxCHz9FfvDOXgvzB2ZnI9j/xuF4do5fnItY3cKZC9uhGcQKBhgfc13ZQBQ07Z Xd7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=xFI2MXpizqXONaMXerDo06+s3U6gmR+tXb1ERyw7dq4=; b=s9xXllu7Kttjs5s2wTDjASCf6yOqBjww/VbaarVBmHHuYJx9Hvjd/Hq61cDb27WS3v Xsxsx1UhpOfSUkitoS5qenZc0VG1IALtHH8S1LyWlHhQF++ou+lKJsZk88+7G4aovT56 ycGiOGksDfElzmZN9capWfnALPv0gzhnLB9zOMhJiQCWhXYwdW9EYYkgkeQ1bLXvMpa1 CQ8wWzVIlBCF30OzLYGqeQ0mHbjPDZ9gBD7aVshvJIN3KmUKemjCFINTjQdh7sQHGC8h KBjX2B+NSXHQVy5v1LmfGcDF2JivjPxxUFGiJsryqB3Chqbd7+Mh8QQAWDNVEb/LGOc/ 6AHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=UL0X028W; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r72si203774wmg.233.2018.01.09.14.57.08; Tue, 09 Jan 2018 14:57:09 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=UL0X028W; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 25130689FDB; Wed, 10 Jan 2018 00:56:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 843EE6883C8 for ; Wed, 10 Jan 2018 00:56:51 +0200 (EET) Received: by mail-wr0-f193.google.com with SMTP id n9so5841488wrg.2 for ; Tue, 09 Jan 2018 14:56:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=gdqtuXfOZR+8lOdKYFBE8jGpy64IfyHaakt5skmV1KE=; b=UL0X028WPT/boQCN0Dy1brWF95CnEludRicb7chXWgPTCRdLE/YqIwn2Zi+PDOzYcS zvk46W35eAkaW5O9/fKeWAWrlAotdKZ2uAWkCXQDNy1we/J7g40xbv0nFxqd/3SZAPBP 5D5I7HeyJKhmwMFQUgwV705zshk0omYNcd+h+ElvSUhytO5P200h3ETvwa9f5seeJTmw crg9I0l2q8mQVBNVLdedevZur1RPEdcbreTm2TL+k7sWE0z0pDrnrsPI50fY2jHsafyC reheLnCPawsxbDnbRQ5DQuvVbAjgqXgIRR7QCdCAL+Zvcoqj6hVfXZ+bG7zXKsEFSg9a cTww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=gdqtuXfOZR+8lOdKYFBE8jGpy64IfyHaakt5skmV1KE=; b=AWNmNwRwcc/c/bxzBzvHQN2V462qa9nGsWw+lAMQWentR05oVhp5bYadeP4QXPR7Q+ py7nJHQd3TGl3oQiZ8EWEG/NtIv+tT7UYuhgZaTR8apQnrn5pEjrpsvS/8AYEhvTAMHJ Af6qoz7vZCPJAThV0SFbWGaf/KC9HIw1XnzDRNqaXwoMwLoAoKba6bFrtNNEQ4JONBXB IUmyTV4THRg6qhzmgpdvK0c+bcQP/e7REcBoruXS0Jm+jILJIFmUUHRrsleUo8mEA7xU 1WuuScZ9+Ez5oacm7SGwPnT9avKTQWpaBAu99IpTzLdjnSxQ3/Wo7zYMuOrqxq0e5taL lg7A== X-Gm-Message-State: AKGB3mJnZmpMIpsiRBntJz+wKkutJreB/HAOR1gJoBGpu04KOBm0A4MQ 6b/jUZQ/ygLtXEw0AQmN4buFCWdO X-Received: by 10.223.161.134 with SMTP id u6mr16070290wru.176.1515538612522; Tue, 09 Jan 2018 14:56:52 -0800 (PST) Received: from igloo.80.58.61.254 (141.pool85-51-114.dynamic.orange.es. [85.51.114.141]) by smtp.gmail.com with ESMTPSA id 34sm18615615wry.34.2018.01.09.14.56.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 09 Jan 2018 14:56:51 -0800 (PST) From: Jorge Ramirez-Ortiz To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Jan 2018 23:56:42 +0100 Message-Id: <1515538603-13208-2-git-send-email-jorge.ramirez.ortiz@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515538603-13208-1-git-send-email-jorge.ramirez.ortiz@gmail.com> References: <1515538603-13208-1-git-send-email-jorge.ramirez.ortiz@gmail.com> Subject: [FFmpeg-devel] [PATCH v1 2/3] avcodec: v4l2_m2m: remove unnecessary timeout. X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jorge Ramirez-Ortiz Qualcomm's db410c/db820 Venus driver currently present in mainline kernel has a bug which mishandles the CMD_STOP requests causing the decoder to block while draining [1]. This patch removes the workaround that was used to prevent that situation. Encoding/Decoding tested on db820c. [1] on CMD_STOP, the driver is flushing all buffers and never raising IPIPE which ends up in blocking on poll. --- libavcodec/v4l2_buffers.c | 10 ++++++-- libavcodec/v4l2_context.c | 61 ++++++++++++++++++++++++++++------------------- 2 files changed, 44 insertions(+), 27 deletions(-) diff --git a/libavcodec/v4l2_buffers.c b/libavcodec/v4l2_buffers.c index 4e68f90..8e4d4d1 100644 --- a/libavcodec/v4l2_buffers.c +++ b/libavcodec/v4l2_buffers.c @@ -213,8 +213,14 @@ static void v4l2_free_buffer(void *opaque, uint8_t *unused) if (s->reinit) { if (!atomic_load(&s->refcount)) sem_post(&s->refsync); - } else if (avbuf->context->streamon) - ff_v4l2_buffer_enqueue(avbuf); + } else { + if (s->draining) { + /* no need to queue more buffers to the driver */ + avbuf->status = V4L2BUF_AVAILABLE; + } + else if (avbuf->context->streamon) + ff_v4l2_buffer_enqueue(avbuf); + } av_buffer_unref(&avbuf->context_ref); } diff --git a/libavcodec/v4l2_context.c b/libavcodec/v4l2_context.c index 4c16992..dde97d0 100644 --- a/libavcodec/v4l2_context.c +++ b/libavcodec/v4l2_context.c @@ -217,6 +217,7 @@ static int v4l2_stop_decode(V4L2Context *ctx) { struct v4l2_decoder_cmd cmd = { .cmd = V4L2_DEC_CMD_STOP, + .flags = 0, }; int ret; @@ -234,6 +235,7 @@ static int v4l2_stop_encode(V4L2Context *ctx) { struct v4l2_encoder_cmd cmd = { .cmd = V4L2_ENC_CMD_STOP, + .flags = 0, }; int ret; @@ -256,10 +258,26 @@ static V4L2Buffer* v4l2_dequeue_v4l2buf(V4L2Context *ctx, int timeout) .events = POLLIN | POLLRDNORM | POLLPRI | POLLOUT | POLLWRNORM, /* default blocking capture */ .fd = ctx_to_m2mctx(ctx)->fd, }; - int ret; + int i, ret; + + /* if we are draining and there are no more capture buffers queued in the driver we are done */ + if (!V4L2_TYPE_IS_OUTPUT(ctx->type) && ctx_to_m2mctx(ctx)->draining) { + for (i = 0; i < ctx->num_buffers; i++) { + if (ctx->buffers[i].status == V4L2BUF_IN_DRIVER) + goto start; + } + ctx->done = 1; + return NULL; + } +start: if (V4L2_TYPE_IS_OUTPUT(ctx->type)) pfd.events = POLLOUT | POLLWRNORM; + else { + /* no need to listen to requests for more input while draining */ + if (ctx_to_m2mctx(ctx)->draining) + pfd.events = POLLIN | POLLRDNORM | POLLPRI; + } for (;;) { ret = poll(&pfd, 1, timeout); @@ -267,11 +285,6 @@ static V4L2Buffer* v4l2_dequeue_v4l2buf(V4L2Context *ctx, int timeout) break; if (errno == EINTR) continue; - - /* timeout is being used to indicate last valid bufer when draining */ - if (ctx_to_m2mctx(ctx)->draining) - ctx->done = 1; - return NULL; } @@ -286,7 +299,7 @@ static V4L2Buffer* v4l2_dequeue_v4l2buf(V4L2Context *ctx, int timeout) ret = v4l2_handle_event(ctx); if (ret < 0) { /* if re-init failed, abort */ - ctx->done = EINVAL; + ctx->done = 1; return NULL; } if (ret) { @@ -325,23 +338,25 @@ dequeue: ret = ioctl(ctx_to_m2mctx(ctx)->fd, VIDIOC_DQBUF, &buf); if (ret) { if (errno != EAGAIN) { - ctx->done = errno; + ctx->done = 1; if (errno != EPIPE) av_log(logger(ctx), AV_LOG_DEBUG, "%s VIDIOC_DQBUF, errno (%s)\n", ctx->name, av_err2str(AVERROR(errno))); } - } else { - avbuf = &ctx->buffers[buf.index]; - avbuf->status = V4L2BUF_AVAILABLE; - avbuf->buf = buf; - if (V4L2_TYPE_IS_MULTIPLANAR(ctx->type)) { - memcpy(avbuf->planes, planes, sizeof(planes)); - avbuf->buf.m.planes = avbuf->planes; - } + return NULL; } + + avbuf = &ctx->buffers[buf.index]; + avbuf->status = V4L2BUF_AVAILABLE; + avbuf->buf = buf; + if (V4L2_TYPE_IS_MULTIPLANAR(ctx->type)) { + memcpy(avbuf->planes, planes, sizeof(planes)); + avbuf->buf.m.planes = avbuf->planes; + } + return avbuf; } - return avbuf; + return NULL; } static V4L2Buffer* v4l2_getfree_v4l2buf(V4L2Context *ctx) @@ -552,14 +567,12 @@ int ff_v4l2_context_dequeue_frame(V4L2Context* ctx, AVFrame* frame) { V4L2Buffer* avbuf = NULL; - /* if we are draining, we are no longer inputing data, therefore enable a - * timeout so we can dequeue and flag the last valid buffer. - * + /* * blocks until: * 1. decoded frame available * 2. an input buffer is ready to be dequeued */ - avbuf = v4l2_dequeue_v4l2buf(ctx, ctx_to_m2mctx(ctx)->draining ? 200 : -1); + avbuf = v4l2_dequeue_v4l2buf(ctx, -1); if (!avbuf) { if (ctx->done) return AVERROR_EOF; @@ -574,14 +587,12 @@ int ff_v4l2_context_dequeue_packet(V4L2Context* ctx, AVPacket* pkt) { V4L2Buffer* avbuf = NULL; - /* if we are draining, we are no longer inputing data, therefore enable a - * timeout so we can dequeue and flag the last valid buffer. - * + /* * blocks until: * 1. encoded packet available * 2. an input buffer ready to be dequeued */ - avbuf = v4l2_dequeue_v4l2buf(ctx, ctx_to_m2mctx(ctx)->draining ? 200 : -1); + avbuf = v4l2_dequeue_v4l2buf(ctx, -1); if (!avbuf) { if (ctx->done) return AVERROR_EOF;