From patchwork Fri Oct 29 02:45:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fei Wang X-Patchwork-Id: 31248 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:a610:0:0:0:0:0 with SMTP id q16csp1214383ioi; Thu, 28 Oct 2021 19:47:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx2dQNouXc2P53CIMFhXPqUde/b7sWvdv6CfeA7u8hzkJOp0RzBYUWYzJa14XR4Eu5aHBWb X-Received: by 2002:a50:d4cd:: with SMTP id e13mr11231311edj.29.1635475675126; Thu, 28 Oct 2021 19:47:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635475675; cv=none; d=google.com; s=arc-20160816; b=GLTxp06F9DtTVsnJiC0qnH1amWWAuwyPo/MXgIZFVbMOYiVGlC0fFkdoyzFNNtuw9w kJ/EUYNgvvuTLv+hNmF7crnxSzYrkKHr+MV7nCqICUrZfhl/IKJoIjMpJnmjpPHfVrzI /CAoJifV1prhiltuAuDX+28wSSQzxV7/zXRhacOPEQcopTLzrK61qdYuHsMfkchbzbdu /z1a2SItN9QaGTPyrOTh0nmKTBwvrsXnpyMzztV7ixedrVvLAoLzFJc+yUOtNmmRINjW K2SD+5wFunRGgkqz1Xti33wagKlLe2Q6CPvHtt+bsPzGaenb56PMy93xqJ56qYF/ZmTt cCgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=TImY2RfFNs5YL5nquEjqjisHggoFzB8Hpk1zBfxdwwQ=; b=nhksQ1uhUosJoSPipZlbL+S8TQyeZnFQB+UdstulEFiOCakvnqpK7DEy7Np55OTkPS 4L14/GSm3qbXSzM1fePyX5jFuXM7yS3UXw0idbv066pJDDxF4ABciwn1JFxswiHS/2xS CslZe3mJnurzOzNYXID9LzxYlmAKYPtEyaJJsJIWthBl1LR1kTbRTMG3bK8W+5zaiEUf TqA5KsiGOh74r3IFzYFSgK339bRC6b08cy/v9kCOIjzQdNlp7iIB2JmHghvaSghZimB3 Lqn0uRfB23HIguUzeb6SQf1yz9e99BBL9Pim/EST13BYYEKCtqP06D0q54QJnnhb13kJ +VKg== ARC-Authentication-Results: i=1; mx.google.com; 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=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id au25si7070882ejc.675.2021.10.28.19.47.54; Thu, 28 Oct 2021 19:47:55 -0700 (PDT) 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; 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=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3DEA868AAA6; Fri, 29 Oct 2021 05:47:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0F4E368A477 for ; Fri, 29 Oct 2021 05:47:42 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10151"; a="230525837" X-IronPort-AV: E=Sophos;i="5.87,191,1631602800"; d="scan'208";a="230525837" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Oct 2021 19:47:39 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,191,1631602800"; d="scan'208";a="498694875" Received: from t.sh.intel.com ([10.239.159.147]) by orsmga008.jf.intel.com with ESMTP; 28 Oct 2021 19:47:38 -0700 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Oct 2021 10:45:14 +0800 Message-Id: <20211029024514.86945-1-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v1] lavc/av1dec: drop redundant frame X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Fei Wang Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: h6VkrtKebsXV For some non-standard clip which contains multiple display frame data in a ivf packet, drop the redundant frame can make the decode continuously with some warning message shown. Otherwise decode will interrupt with unexpected error. Signed-off-by: Fei Wang --- libavcodec/av1dec.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index db110c50c7..58d10672c1 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -916,6 +916,16 @@ static int set_output_frame(AVCodecContext *avctx, AVFrame *frame, av_log2(s->operating_point_idc >> 8) > s->cur_frame.spatial_id) return 0; + /** + * Drop redundant frame data if there already exist one. Return 0 will + * make sure all frames can be decoded and maintainers a correct reference + * list. + */ + if (*got_frame) { + av_log(avctx, AV_LOG_WARNING, "Redundant frame data dropped!\n"); + return 0; + } + ret = av_frame_ref(frame, srcframe); if (ret < 0) return ret;