From patchwork Tue Sep 3 01:02:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 14863 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 8F303449F2B for ; Tue, 3 Sep 2019 04:03:22 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7B070687FD4; Tue, 3 Sep 2019 04:03:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f68.google.com (mail-ot1-f68.google.com [209.85.210.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 653E1687FCB for ; Tue, 3 Sep 2019 04:03:20 +0300 (EEST) Received: by mail-ot1-f68.google.com with SMTP id z17so15028909otk.13 for ; Mon, 02 Sep 2019 18:03:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tmm1-net.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+vjX5gQmhtf0hc9rGAbpkua4fhW69gL2RwKZUXf/eeI=; b=IVRlV4/n4Duc82sh7bTlz016NAZhRTHBbxKHnqUXLIUx8zGaw91ySw2Y2LdXaUeIvM Dqv+RIoZRjM3AdLNJNIL5U/QIYazYHfQxPTgFyTACmzNaEJ2mBP37FFSSyjQ1pENLLe2 2Si2efMXgVfvLvaVGn/5Mpu4eYxI0Tw4L9/P7ZWCVHJNJs4/qn45y82YTKOxADybrcqt EBDKAf/o5tUFLa1GKPBSkJU18of+uYJjbBQSi6mts0PkQpzGhnRwnGWx5r+krFGdoWJ9 Q85d+VPP1Slxg0tGNlb88m3cpRVZbeVxCDvEkb8CcANbpw5u2abQ3dRx1j91grNUWwgw I6Bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=+vjX5gQmhtf0hc9rGAbpkua4fhW69gL2RwKZUXf/eeI=; b=mLnDBZnCcaQz614ngO/KMzG7Mb0iCK2TFFgHF2iebYy1GxAor5BPvoDyVUjsBTmrc/ R1BKRdSUySL1aP43N0Fav3qalKpoA3C5BtKm9pjCLfQfi0QAauLMrLETv+rcKH22WmzC ybhvVNvBm8pzFjzBGIh7Zp/3mBWnjXoQg+1FeMV3J4aR7q3mL6D1myvSmWr52yq+EstE 4tRnvi+VWsD4q1eFgkh7bUX4jN+DDjcQUuGgN69TXcgQvQVtvOHPtJI18wYU4yy9+n1A +oVE/mFIueDabFwM3VUwYDPyELEaKfTdqk1FC+rO5D77ATmqDjEvWbTnSWGFw+cbI9C/ VoPA== X-Gm-Message-State: APjAAAXz4686nY8WF+LCzyMN6KUmwpjnLpQ5LhI7ssEzteR9E9/akNGY oTMlnOm2R8HZsGIe5Dw4nUMIHkz5Gsk= X-Google-Smtp-Source: APXvYqzjwCaN4/Ay6xkpMO5u/oDT4Pmf6H7p48Rtf8JQ3wnlHgVcSzdkKcCoN+2ZstMHn26xXfFoYQ== X-Received: by 2002:a05:6830:61a:: with SMTP id w26mr25407190oti.294.1567472598765; Mon, 02 Sep 2019 18:03:18 -0700 (PDT) Received: from tmm1-imac.lan (ip184-189-221-177.sb.sd.cox.net. [184.189.221.177]) by smtp.gmail.com with ESMTPSA id a21sm4299633oie.9.2019.09.02.18.03.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 02 Sep 2019 18:03:18 -0700 (PDT) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Mon, 2 Sep 2019 18:02:24 -0700 Message-Id: <20190903010230.96236-20-ffmpeg@tmm1.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190903010230.96236-1-ffmpeg@tmm1.net> References: <20190903010230.96236-1-ffmpeg@tmm1.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 19/25] avcodec/v4l2_m2m_dec: fix dropped packets while decoding 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: lorusak@gmail.com, Aman Gupta , jorge.ramirez.ortiz@gmail.com, Aman Gupta Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Maxime Jourdan * FFmpeg retrieves a packet from the bitstream * It attempts to get an input buffer (from its own list or by dequeuing one from the driver) * If no input buffer is found, the bitstream packet is dropped instead of scheduled for trying again later It's an issue that showed especially at high speeds (like using `-f null -` as output parameters). Signed-off-by: Aman Gupta --- libavcodec/v4l2_m2m.h | 1 + libavcodec/v4l2_m2m_dec.c | 21 ++++++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/libavcodec/v4l2_m2m.h b/libavcodec/v4l2_m2m.h index 97848363ef..662e682aa5 100644 --- a/libavcodec/v4l2_m2m.h +++ b/libavcodec/v4l2_m2m.h @@ -56,6 +56,7 @@ typedef struct V4L2m2mContext { /* null frame/packet received */ int draining; + AVPacket buf_pkt; /* Reference to self; only valid while codec is active. */ AVBufferRef *self_ref; diff --git a/libavcodec/v4l2_m2m_dec.c b/libavcodec/v4l2_m2m_dec.c index b37b6ac7d9..71b2211594 100644 --- a/libavcodec/v4l2_m2m_dec.c +++ b/libavcodec/v4l2_m2m_dec.c @@ -143,9 +143,14 @@ static int v4l2_receive_frame(AVCodecContext *avctx, AVFrame *frame) AVPacket avpkt = {0}; int ret; - ret = ff_decode_get_packet(avctx, &avpkt); - if (ret < 0 && ret != AVERROR_EOF) - return ret; + if (s->buf_pkt.size) { + avpkt = s->buf_pkt; + memset(&s->buf_pkt, 0, sizeof(AVPacket)); + } else { + ret = ff_decode_get_packet(avctx, &avpkt); + if (ret < 0 && ret != AVERROR_EOF) + return ret; + } if (s->draining) goto dequeue; @@ -154,6 +159,8 @@ static int v4l2_receive_frame(AVCodecContext *avctx, AVFrame *frame) if (ret < 0) { if (ret != AVERROR(EAGAIN)) return ret; + + s->buf_pkt = avpkt; /* no input buffers available, continue dequeing */ } @@ -171,7 +178,8 @@ static int v4l2_receive_frame(AVCodecContext *avctx, AVFrame *frame) } dequeue: - av_packet_unref(&avpkt); + if (!s->buf_pkt.size) + av_packet_unref(&avpkt); return ff_v4l2_context_dequeue_frame(capture, frame, -1); } @@ -244,7 +252,10 @@ static av_cold int v4l2_decode_init(AVCodecContext *avctx) static av_cold int v4l2_decode_close(AVCodecContext *avctx) { - return ff_v4l2_m2m_codec_end(avctx->priv_data); + V4L2m2mPriv *priv = avctx->priv_data; + V4L2m2mContext* s = priv->context; + av_packet_unref(&s->buf_pkt); + return ff_v4l2_m2m_codec_end(priv); } static void v4l2_flush(AVCodecContext *avctx)