From patchwork Tue Dec 26 03:31:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Fei W" X-Patchwork-Id: 45323 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6623:b0:194:e134:edd4 with SMTP id n35csp2826454pzh; Mon, 25 Dec 2023 19:32:50 -0800 (PST) X-Google-Smtp-Source: AGHT+IEfOyED5oS4v5ISQsvD3GBA5fsr9MOHGXSumLGLDGkvab9MJvUYucGvVX28B8P2n3SJ8rbQ X-Received: by 2002:a05:6512:2397:b0:50e:7227:9bd7 with SMTP id c23-20020a056512239700b0050e72279bd7mr1805223lfv.66.1703561570231; Mon, 25 Dec 2023 19:32:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703561570; cv=none; d=google.com; s=arc-20160816; b=c8xasCSXU5qlohETrK3rC7lvKAajGTpvS7aSr6BTsmzU9ZfCDrP99DCucsFrL+xsYX IvQpjJbP1IKvq7tc+K8rSFTTmulm3LC7xpQL0d9WZirnxxSsyx3J6RFde5GBa/Sekdj6 fNLH7bNBl4mpQj3jqCdzpusQMv7AAE+K2YX0XqcAUE3ll12JapymXYwsKWD9vMfPsRAW phULw+VCI31lBVBIlOTDfaL7aO39Isz1FuiT+vh9481l3EFJYT8Sa9W3XsNnVjrGohnn PXWcoEHesPknebpRgZcjzZnz4nheplZF8ztTVUtAF8tbDYs+iTxIjDMYQUAq7Or616IX PSeA== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=Drj8JLN0J66S1HPIkIVuZOHXiCFFfpoD1MF9n8XBlS8=; fh=i4ESP4ZRFDcfYfwXKWpOXjc2YhmIGuOsCfZUnwNO0gc=; b=ocEfPP1Ir4NbcMVxt99Y+a43sqCNRXzlLRfc8FOWm8iQPnchndXvbsKG3vcSd/M9Tg 3JPbAx+3W+qh8o+K9GWbMVPtSsPUDlpaqir4LGNihCl1klaD4rDnw1QymyJH4lyrHu/7 Cpfd/QG3FKblLJkcZZ60np2nYVm5zfYeKzM4fEzP63XlRGyzbPVZ5Knrs0fefClyneeX h2EoUQHn8K16NmkqmAQZXSsF+P4A+RPCjoU0GnXpGJtmRerqO/aRnqVavFCgsFwhEKg1 +p8wdHY/Abg+6pbY+fgaUSGVAxsXSq3GCvnBIn9tT3fnNkr7LCpKF6RCoZ48DxLejRio 4oYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=noYEFdN9; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q27-20020a50c35b000000b005545f5ca3b8si3662927edb.528.2023.12.25.19.32.49; Mon, 25 Dec 2023 19:32:50 -0800 (PST) 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; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=noYEFdN9; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0758068D1A0; Tue, 26 Dec 2023 05:32:39 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 013DA68CCE5 for ; Tue, 26 Dec 2023 05:32:31 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1703561557; x=1735097557; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=tzEfzlHDg8G3YOhRc9XGhDNLAYxxeo7ROeniN/hyP+Y=; b=noYEFdN98r8GHhX1bMmufJ6WE04DMApeNbeZRI5LlNjNh/aaT3TYqG8r GgDIA9dd+DHPQl0Y6yM0Dk0asiwiHcef4QttCnbHZRV7pCC7/8WnYD7ul mffDd6bgDRZJ8ITx4FpLLjxn2aTCSJHUYXDqCpiphthPSi1T0t/5FFLPJ dGjWlXA9yFSI4X+u1vvZyDbZn2Rp+gU7TJrdFV9zE/R0uiznlWFxz06ww atM8f5k8nXSIf/r4bSIl08Oo/IYkI5V9BHqKX5rI+ooV11Q8U+h3QofL2 rvcBmmzWptc6IMEEp8iYtpYfbBmOY4aQ7MZ0CRogLLp8nsvPuDX/hX4ln g==; X-IronPort-AV: E=McAfee;i="6600,9927,10934"; a="393476906" X-IronPort-AV: E=Sophos;i="6.04,304,1695711600"; d="scan'208";a="393476906" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Dec 2023 19:30:56 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10934"; a="901307222" X-IronPort-AV: E=Sophos;i="6.04,304,1695711600"; d="scan'208";a="901307222" Received: from t-dg2.sh.intel.com ([10.239.159.57]) by orsmga004.jf.intel.com with ESMTP; 25 Dec 2023 19:30:55 -0800 From: fei.w.wang-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Tue, 26 Dec 2023 11:31:43 +0800 Message-Id: <20231226033143.1175171-2-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231226033143.1175171-1-fei.w.wang@intel.com> References: <20231226033143.1175171-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v1 2/2] avcodec/av1dec: Return error for unsupported tile list OBU 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.w.wang@intel.com Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Nh59T7osdVIm From: Fei Wang Otherwise decoding maybe successful but output result is incorrect. Signed-off-by: Fei Wang --- libavcodec/av1dec.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index e8041c1f58..9b1778dcc4 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -1202,6 +1202,12 @@ static int av1_receive_frame_internal(AVCodecContext *avctx, AVFrame *frame) av_log(avctx, AV_LOG_DEBUG, "Obu idx:%d, obu type:%d.\n", i, unit->type); + if (unit->type == AV1_OBU_TILE_LIST) { + av_log(avctx, AV_LOG_ERROR, "Large scale tile decoding is unsupported.\n"); + ret = AVERROR_PATCHWELCOME; + goto end; + } + if (!obu) continue;