From patchwork Tue Mar 10 05:27:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 18104 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 2F33B448F7B for ; Tue, 10 Mar 2020 07:28:09 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0BF9468A127; Tue, 10 Mar 2020 07:28:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f195.google.com (mail-qk1-f195.google.com [209.85.222.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3A394687FAA for ; Tue, 10 Mar 2020 07:28:02 +0200 (EET) Received: by mail-qk1-f195.google.com with SMTP id c145so5833365qke.12 for ; Mon, 09 Mar 2020 22:28:02 -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=1ikQ+AWHRwQYLDRCcAPjiKFkyYQ29Ul4lS/NqEzy+E0=; b=cf860N4WmWzlYzuNN6X79mA4g2lxuE1lU5p/YM3DgedBJNl8vGRlIOXjdZllCoYv4+ wdJ/lZdDRqBHeBxqN1w6MxeTD4b72ojN6uzAZv3j5kBCjAuRQhWgN/jP3znjainvFzDK xjh41Ei8GyvStvajtw2wEcAdBHHchMgSqgDEbUQIMd5wyqVuah1iP0VvJ89ri+dvLB5t mIjmbO2zMirHd5Bcc07dXqq8kdWxQYzsFx5p6iQJ8w0O6lco//B1y/R3p9QOfQ2XqMob vOFAt2YqmvsU2Zi67tjI3HprSLfH8MkVR4vG2mbfPXtCebQpCfmv3CLTMNmAWXoQ5Dnp jgtg== 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=1ikQ+AWHRwQYLDRCcAPjiKFkyYQ29Ul4lS/NqEzy+E0=; b=qmyv1+G7v2S6TqyT0PiPv49j/0bL/MA2nwHqRzxLtL+KZ2k9j/Xml9lw9VNQT5bDIr dfPuGRIVyHnvaJesu4ZQzWi3cPeD1q2ojFi47hxKZkM1NqbjmGABqTJtyFUTfWy3ERmG z25vKWMGkRiFhl1CIYKk+DzDCmlcnVcO8W2BJ25UFxiaKn3OQM4HPujkG0z6yFqZSjU+ 4z8xGcsbIZAt4kzzpF212nQ1G09GcwiXUoH6cwevlBJkkWpi2bSSes9ZHSWl4KAWzIFU HCkTZ6fTopUIj/FosSyMEYeVHP5uSp9dW/wc9/hkIDNWloQNS0cHuJtCQlJJp0OphrGg 1O0Q== X-Gm-Message-State: ANhLgQ3BD0je2aYiNjSe0bzpK9UHWKDL6bNMCjTx0D3u4rKbZ4rTvkGr DrjR2L7XiSAM1CENOqGJKdYT7UN/ X-Google-Smtp-Source: ADFU+vsSFYN4odAtLzM41SzweUSF88h3cNO2ARwlw8/rc2sIh9Ab51xV/oJCbAG5oGgLkJBUjzs1Ng== X-Received: by 2002:a37:6807:: with SMTP id d7mr17967584qkc.112.1583818080748; Mon, 09 Mar 2020 22:28:00 -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 x127sm1825256qke.135.2020.03.09.22.28.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2020 22:28:00 -0700 (PDT) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Mar 2020 01:27:43 -0400 Message-Id: <20200310052743.15307-1-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] avcodec/v4l2_m2m_enc: Adapt to the new internal encode API 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 Should be squashed with: http://ffmpeg.org/pipermail/ffmpeg-devel/2020-February/257735.html Signed-off-by: Andriy Gelman --- libavcodec/v4l2_m2m.c | 8 ++++++++ libavcodec/v4l2_m2m.h | 3 +++ libavcodec/v4l2_m2m_enc.c | 15 ++++++++++++++- 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/libavcodec/v4l2_m2m.c b/libavcodec/v4l2_m2m.c index 2d21f910bcc..dab04313a8a 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_free(&s->frame); av_free(s); } @@ -417,5 +418,12 @@ int ff_v4l2_m2m_create_context(V4L2m2mPriv *priv, V4L2m2mContext **s) priv->context->self_ref = priv->context_ref; priv->context->fd = -1; + priv->context->frame = av_frame_alloc(); + if (!priv->context->frame) { + av_buffer_unref(&priv->context_ref); + *s = NULL; /* freed when unreferencing context_ref */ + return AVERROR(ENOMEM); + } + return 0; } diff --git a/libavcodec/v4l2_m2m.h b/libavcodec/v4l2_m2m.h index 456281f48c5..b67b2163310 100644 --- a/libavcodec/v4l2_m2m.h +++ b/libavcodec/v4l2_m2m.h @@ -58,6 +58,9 @@ typedef struct V4L2m2mContext { int draining; AVPacket buf_pkt; + /* Reference to a frame. Only used during encoding */ + AVFrame *frame; + /* Reference to self; only valid while codec is active. */ AVBufferRef *self_ref; diff --git a/libavcodec/v4l2_m2m_enc.c b/libavcodec/v4l2_m2m_enc.c index c9f1741bfd0..a52a3d9ad3b 100644 --- a/libavcodec/v4l2_m2m_enc.c +++ b/libavcodec/v4l2_m2m_enc.c @@ -24,6 +24,7 @@ #include #include #include +#include "encode.h" #include "libavcodec/avcodec.h" #include "libavutil/pixdesc.h" #include "libavutil/pixfmt.h" @@ -259,11 +260,24 @@ static int v4l2_receive_packet(AVCodecContext *avctx, AVPacket *avpkt) V4L2m2mContext *s = ((V4L2m2mPriv*)avctx->priv_data)->context; V4L2Context *const capture = &s->capture; V4L2Context *const output = &s->output; + AVFrame *frame = s->frame; int ret; if (s->draining) goto dequeue; + 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) + return ret; + if (!output->streamon) { ret = ff_v4l2_context_set_status(output, VIDIOC_STREAMON); if (ret) { @@ -367,7 +381,6 @@ static const AVOption options[] = { .priv_data_size = sizeof(V4L2m2mPriv), \ .priv_class = &v4l2_m2m_ ## NAME ##_enc_class, \ .init = v4l2_encode_init, \ - .send_frame = v4l2_send_frame, \ .receive_packet = v4l2_receive_packet, \ .close = v4l2_encode_close, \ .capabilities = AV_CODEC_CAP_HARDWARE | AV_CODEC_CAP_DELAY, \