From patchwork Fri Jul 17 02:09:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 21138 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 D5FBD448612 for ; Fri, 17 Jul 2020 06:44:36 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A2F60689D89; Fri, 17 Jul 2020 06:44:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0B3BD6801C7 for ; Fri, 17 Jul 2020 06:44:30 +0300 (EEST) Received: by mail-pf1-f195.google.com with SMTP id a14so4731342pfi.2 for ; Thu, 16 Jul 2020 20:44:29 -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:mime-version :content-transfer-encoding; bh=dtlXlwQCuIUkHDdVA7ZWgtnESXEtXWARiNDBOXa7y3o=; b=QUTIhxEgwbZi5rVRmCL0M2FcOBeo7HCAFNvmIFaVEKAcZVRiOE8hXvIa9WveyUsCll cc5FIXww6sETScfadNvaAOmkiNsm5v8HtsuHKn5yDiiT21/RGsJmUGEtOkDer2brb9Ue SikF+TGoL5AoEQfRwnj+wahs4nDgtD5D6MN4qzdL85DzZdIcYNS5FlukRD07z3uufVZK OD09OfOCnpWqsPKSsX1Avw/xA1y1m8aNYq6J3qFFhqOZKmOUsKYgnTUKGuyVWa42VV7i XZtG3AO5OZrFIojs06PALYFVHJq2frWbIMmFGOARg5WjJY7slR1Z3Bmr2PrN2IGHNbpc zNbA== 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:mime-version :content-transfer-encoding; bh=dtlXlwQCuIUkHDdVA7ZWgtnESXEtXWARiNDBOXa7y3o=; b=VgpxY5iuOEPWLRQEC4uY6MJyTgr7KPLh0z20E93jUbZsnzYHptYoy3dAv7ea349NRZ eI8QvjSGlM9zOVYtaD+g4OFVBKlMoJd2MPxLy/wylInJ6ROiQeLx81krFpWWRdwIGHyj LiIsRL7cQMwbf4zk9rGlkAI5QlSxhqt6HdWQbyEjVFfieQ3conw6fYizXPpkvSd8GEap gQWSp7nxE3uZgeoTTh7sjUb4P1jUqrQVjsDWcEoxu7fZoRFocIotRqGr+RqXSlfghjFh TVLbbkjzyZy8oF5o8imLP18Nloh1fyetHlgE6V02LwdfBqkpA/P+zals3xfSD5x2+Bec jK4A== X-Gm-Message-State: AOAM532Y1YoHrQGOQ2uu36n5BfkhU0xZeIu/9atgqyUQlqJSKY/Fy675 tA5aP1i8KFsrMiQt9F4vtmlC5lr2 X-Google-Smtp-Source: ABdhPJyBtRYyu/+zbUcCRIy5iEpOa7Z3tDSUoPFpiywPtUxL/K0LGzF3H17i/FoOlkBtOPxZZRpwbg== X-Received: by 2002:a0c:e1c3:: with SMTP id v3mr6766313qvl.209.1594951777944; Thu, 16 Jul 2020 19:09:37 -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 u71sm9704200qka.40.2020.07.16.19.09.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jul 2020 19:09:37 -0700 (PDT) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Thu, 16 Jul 2020 22:09:16 -0400 Message-Id: <20200717020918.385084-1-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/v4l2_context: return EAGAIN to signal full buffers 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 Return proper error when a frame buffers are full. This path is triggered on the DragonBoard 410c since the encoding API change in commit 827d6fe73d2f5472c1c2. Signed-off-by: Andriy Gelman --- libavcodec/v4l2_context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/v4l2_context.c b/libavcodec/v4l2_context.c index 29b144ed73e..ff1ea8e57b0 100644 --- a/libavcodec/v4l2_context.c +++ b/libavcodec/v4l2_context.c @@ -599,7 +599,7 @@ int ff_v4l2_context_enqueue_frame(V4L2Context* ctx, const AVFrame* frame) avbuf = v4l2_getfree_v4l2buf(ctx); if (!avbuf) - return AVERROR(ENOMEM); + return AVERROR(EAGAIN); ret = ff_v4l2_buffer_avframe_to_buf(frame, avbuf); if (ret) From patchwork Fri Jul 17 02:09:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 21136 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 34FC44480D1 for ; Fri, 17 Jul 2020 05:15:10 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 12A5668B5EE; Fri, 17 Jul 2020 05:15:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f196.google.com (mail-qt1-f196.google.com [209.85.160.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0D4E868B54C for ; Fri, 17 Jul 2020 05:15:04 +0300 (EEST) Received: by mail-qt1-f196.google.com with SMTP id e12so6562015qtr.9 for ; Thu, 16 Jul 2020 19:15:03 -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=vhC59TvLsRnHxkIAjOVgb2gfQ2wc0r3H9GEBDnHCogU=; b=aDlzHQ7mA+L9Mqg0R1XiP0Q9p7nBksUzAPiJkkufOVH9mW/upNGcfLpUC1mdhqclvc dNvUTpcfScmKsWsmjuXCTK01+iXhGgw9pJ+YUzw84+jIYBepskz2n9W7JAK++Oyi8HHD 3UKge5+uDR+100x6DpF8Unhl3PIK2IdiLX2Nk6JMSrg2cVgNS9KdWX3YkSwH+fU6D773 nlZEklEqnG7IKFfsyLshnSabmRJCIHSmvgUhwPuSX0fU8sSYoLQpgzOPiEfLHQ7f7Con 2WzALN8FRUrYytgkyQ4kAfepTnBTrlXkj6RowD9jvPvwLSINj1r3jRkcXO6tALwyoKEh GxXQ== 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=vhC59TvLsRnHxkIAjOVgb2gfQ2wc0r3H9GEBDnHCogU=; b=UwxRw+hhgzZeH8P2GqVvLuEToOIWyirMRySOSeN7aqLRWKvJnF+sAyKBpH/o1EjnvC RnaJN/AZNDHfsRHmWolbcmp1P15GSrzkQNscJy8BMwTuwlAXLwSyVFeE5t17Qzcujj8+ PXU3ANS1I6fczi45c6MyEEXzHmz8k/1CyYV1nXWUznFq421lyY9EVqRWVWLhVzB+GW4n SR6dzXpoD41PHCWGp7dUOUsm5fD4enu9PhudmvCOm+ll1WgSmfvYeB0fuv5mo0w+N1kk pn7Sxn/0x5G2Rrd8Wjj6rzfryxh6sDXw4ydW5QgpdAv7upE+2+dUk23Of3DUFeXa8x8S dtyw== X-Gm-Message-State: AOAM5324id3RBuMbIkXFvJaZ5pFKQvwYx0d81mLZ2EFsrrV1LHa6jbpf TKE2w1OLiYIbdw/oRhKkG6lPCp2M X-Google-Smtp-Source: ABdhPJyNAJk64n7wU4veTi5CR/sUYFHgGoUxe5PmfkaBER3Z4pPATUwI/Zh+BsE7vuyLqr1GHRr9QA== X-Received: by 2002:a37:a543:: with SMTP id o64mr206938qke.247.1594951789152; Thu, 16 Jul 2020 19:09:49 -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 u71sm9704200qka.40.2020.07.16.19.09.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jul 2020 19:09:48 -0700 (PDT) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Thu, 16 Jul 2020 22:09:17 -0400 Message-Id: <20200717020918.385084-2-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200717020918.385084-1-andriy.gelman@gmail.com> References: <20200717020918.385084-1-andriy.gelman@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/v4l2_m2m_enc: buffer frame if it cannot be enqueued 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 Currently if the frame buffers are full, the frame is unrefed and dropped. Instead buffer the frame so that it is enqueued in the following v4l2_receive_packet() call. The behavior was observed on DragonBoard 410c. Signed-off-by: Andriy Gelman --- libavcodec/v4l2_m2m.c | 1 + libavcodec/v4l2_m2m_enc.c | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libavcodec/v4l2_m2m.c b/libavcodec/v4l2_m2m.c index d8d872ea099..6b545045100 100644 --- a/libavcodec/v4l2_m2m.c +++ b/libavcodec/v4l2_m2m.c @@ -329,6 +329,7 @@ static void v4l2_m2m_destroy_context(void *opaque, uint8_t *context) sem_destroy(&s->refsync); close(s->fd); + av_frame_unref(s->frame); av_frame_free(&s->frame); av_free(s); diff --git a/libavcodec/v4l2_m2m_enc.c b/libavcodec/v4l2_m2m_enc.c index 56df4286add..6d74c4c083d 100644 --- a/libavcodec/v4l2_m2m_enc.c +++ b/libavcodec/v4l2_m2m_enc.c @@ -295,16 +295,20 @@ static int v4l2_receive_packet(AVCodecContext *avctx, AVPacket *avpkt) if (s->draining) goto dequeue; + if (!frame->buf[0]) { ret = ff_encode_get_frame(avctx, frame); if (ret < 0 && ret != AVERROR_EOF) return ret; if (ret == AVERROR_EOF) frame = NULL; + } ret = v4l2_send_frame(avctx, frame); - av_frame_unref(frame); - if (ret < 0) + if (ret != AVERROR(EAGAIN)) + av_frame_unref(frame); + + if (ret < 0 && ret != AVERROR(EAGAIN)) return ret; if (!output->streamon) { From patchwork Fri Jul 17 02:09:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 21137 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 836D04488F6 for ; Fri, 17 Jul 2020 05:18:03 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5D5E968B5FC; Fri, 17 Jul 2020 05:18:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f193.google.com (mail-qk1-f193.google.com [209.85.222.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B554A68B588 for ; Fri, 17 Jul 2020 05:17:56 +0300 (EEST) Received: by mail-qk1-f193.google.com with SMTP id k18so7537115qke.4 for ; Thu, 16 Jul 2020 19:17:56 -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=oTti01P25gDoiDdtWJZQxcpTFzaXmfiTYpHmbDH4ZGc=; b=tPnnUZtlRGdwbUT+/dNIkyZzYBXsThBjFJUdJ0YG3zI7MahKqeqgKfEzLK8WR6xQfp eznBZ/90gX6pqpxagIpw3ZgyiXOqy6U6pmYnLhruMOUniTjJnnbOrp2da3Wpi300nRhc 7TkQovI8LLUq1VHf19JUBgPPdLv1FiL0GO5ooDTU30xmj3z1nd07Cig+HWzws85XSCTP CfTK9YKEKj1ek6f9BKosq+UM+HHRVbBKldpVfUkWaec9pEiL6AUrzl66tIULViG6oItN jCh4Z7SijhSL830G00vqO/N1kS4+mdof7cqJyb0TRZYj8UC3nZdBmz1S0+4kv4lmq7Kl aNkQ== 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=oTti01P25gDoiDdtWJZQxcpTFzaXmfiTYpHmbDH4ZGc=; b=UsJ7PVyFiNJE3u0DaE1tPfYVXmXCTd5BU82rH4O+whwK2NEuxG4BgCJhuVjETXqobM ddCenrSm7MiNopIX5xc58uU4dW4uDEruZWMsNi51poKQxS6hQ1dhMJIKTbyQdbm19wl0 pvANUB/2Ac4jmJgb2m7l/F0E42cftjUJRcEJLUqd1Kr1O68gPnWz0YU5LoGpFhjsE1x3 FifBeEV5X74Egsh3r+vL3iGxDym94Qb0pqAv+9DgFg2OmmlPlr1Qpr61vcaByhKIK+tQ bjPTL2U9S7N/E3Jcr5QRIX8TthERwfI2UfBZ1omJjry/O6VOhwU2oCx+q7hS3SW3ZL/v JuKg== X-Gm-Message-State: AOAM5303tLkEmRcnpAdoUMcArlQmiCgmQGFHmPHPCBR4BFNQ+H8v4PXG Tpm/+o0TkbRV87txlRxk9Lhsgdii X-Google-Smtp-Source: ABdhPJzvFqFaVpIFCwwVw1WvcRP3FuQXPDdiHw12QKAZlVY6eJ3JOsn5Z9TRdK1eniyiYwhAACxkBQ== X-Received: by 2002:ac8:fec:: with SMTP id f41mr7712856qtk.212.1594951791757; Thu, 16 Jul 2020 19:09:51 -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 u71sm9704200qka.40.2020.07.16.19.09.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jul 2020 19:09:51 -0700 (PDT) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Thu, 16 Jul 2020 22:09:18 -0400 Message-Id: <20200717020918.385084-3-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200717020918.385084-1-andriy.gelman@gmail.com> References: <20200717020918.385084-1-andriy.gelman@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/v4l2_m2m_enc: reindent after previous commit 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 Signed-off-by: Andriy Gelman --- libavcodec/v4l2_m2m_enc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/v4l2_m2m_enc.c b/libavcodec/v4l2_m2m_enc.c index 6d74c4c083d..6e18217c35f 100644 --- a/libavcodec/v4l2_m2m_enc.c +++ b/libavcodec/v4l2_m2m_enc.c @@ -296,12 +296,12 @@ static int v4l2_receive_packet(AVCodecContext *avctx, AVPacket *avpkt) goto dequeue; if (!frame->buf[0]) { - ret = ff_encode_get_frame(avctx, frame); - if (ret < 0 && ret != AVERROR_EOF) - return ret; + ret = ff_encode_get_frame(avctx, frame); + if (ret < 0 && ret != AVERROR_EOF) + return ret; - if (ret == AVERROR_EOF) - frame = NULL; + if (ret == AVERROR_EOF) + frame = NULL; } ret = v4l2_send_frame(avctx, frame);