From patchwork Wed Apr 29 21:29:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 19382 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 5199D44A37C for ; Thu, 30 Apr 2020 00:52:18 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3100968C0F5; Thu, 30 Apr 2020 00:52:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f67.google.com (mail-qv1-f67.google.com [209.85.219.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7614A68AFEA for ; Thu, 30 Apr 2020 00:52:11 +0300 (EEST) Received: by mail-qv1-f67.google.com with SMTP id h6so1980921qvz.8 for ; Wed, 29 Apr 2020 14:52:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hzaeNiwBIaoOQHFKRe2db1MEUlrOACrtaLF2rXG/YBA=; b=cRxNP+v2muo7zgrw8e7VBn9wN2MpGKOgCTam4rUGSCw46oXdJ35mjLIEM3TD2BVgeH yc0TVE6RZtGG64+FuIMJhWFcPDSrL8+zaYiDFPRbCwVEuI4UPYpDto0yoHBo3ezx8H2n LYTE+absRd968WBgupp9aYjSb6U6YUrkLlWBLChKQdGgrygZkOkvWcQailD+Rt3gy9XV dslAUA+bLo6PqKZIY0yg7SO9zFXWLst/piLRQZsW0jd8rPuljVxjYKTMhnuAXh/kwC3b wQBG6QJ0b6lpcb1URXcrtMd8RpsfC06dJ5zf7U7n9HZbb7IV09y5P0w5156/J4/bJ6Ow gsug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hzaeNiwBIaoOQHFKRe2db1MEUlrOACrtaLF2rXG/YBA=; b=iOKdlj0vGQrE0j8DuKEySNAFtGk0hhXYGM6+1/M+FGVEfi65f9T2zBsOtIwVk98DN3 CkLI4edGBAjTI46bBF2tJYOmUwQlmtU0BXPhZ+Iq1wEBUZhZUNveDECxpdjiY9H2bO6r tTiNbfdO/VJk0LHbgx4Ny61HXISyPomw5HAdZsyTyLPf2ql11DU6VSk79z79vtcTL7rh Wm6VdKOAsgrt5Wpw5ewyv16iaXaVp4+LoeS0EaxBgQ5CqRfTHfRZIQZsnkA2DkFCzVNp EgENU4RRQQh0mojeS4XPXSygDfTlpDBlyBl47ibiCDPRGnxk/dy3EEMjurkR1FVgnRFO vvjg== X-Gm-Message-State: AGi0PuY0nhYYkMdZ4A3+qN9yrN78bp7+DLUg2FBbGeOpiJbdWkkfA6d7 GSZhaGy9KBxImID0xOVudbPvpNrJ X-Google-Smtp-Source: APiQypLVoVR0CcImTF8vWIbMO3+N+cgPvRGlHimOAPSh7mBsP2jCk8XHpEgRO15s2gj/pJw9JqE7yQ== X-Received: by 2002:a0c:e9cc:: with SMTP id q12mr35886712qvo.128.1588195806194; Wed, 29 Apr 2020 14:30:06 -0700 (PDT) Received: from localhost.localdomain (c-71-232-27-28.hsd1.ma.comcast.net. [71.232.27.28]) by smtp.gmail.com with ESMTPSA id d74sm279109qkc.106.2020.04.29.14.30.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Apr 2020 14:30:05 -0700 (PDT) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Wed, 29 Apr 2020 17:29:42 -0400 Message-Id: <20200429212942.28797-2-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200429212942.28797-1-andriy.gelman@gmail.com> References: <20200429212942.28797-1-andriy.gelman@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/v4l2_context: Finish draining if V4L2_BUF_FLAG_LAST is set 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 Cc: Andriy Gelman Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Andriy Gelman V4L2 api can indicate that flushing of the capture buffers is completed by setting the V4L2_BUF_FLAG_LAST flag. Use guards because the flag was only defined in Linux v4.2. Reference: linux/Documentation/media/uapi/v4l/dev-decoder.rst "The client must continue to handle both queues independently, similarly to normal decode operation. This includes: ... - queuing and dequeuing CAPTURE buffers, until a buffer marked with the V4L2_BUF_FLAG_LAST flag is dequeued" Signed-off-by: Andriy Gelman --- libavcodec/v4l2_context.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/v4l2_context.c b/libavcodec/v4l2_context.c index f0ecc18ebd..da802405e4 100644 --- a/libavcodec/v4l2_context.c +++ b/libavcodec/v4l2_context.c @@ -400,6 +400,10 @@ dequeue: ctx->done = 1; return NULL; } +#ifdef V4L2_BUF_FLAG_LAST + if (buf.flags & V4L2_BUF_FLAG_LAST) + ctx->done = 1; +#endif } avbuf = &ctx->buffers[buf.index];