From patchwork Thu Aug 3 06:01:27 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: 43101 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c11f:b0:130:ccc6:6c4b with SMTP id bh31csp1101852pzb; Wed, 2 Aug 2023 23:02:30 -0700 (PDT) X-Google-Smtp-Source: APBJJlFPaXUWNAQLD1rIBuMuhhSLbdjskkUFKiXWTM+fXrFaIFNwO5uBTt7UkCLRwPZcc7Z2o87x X-Received: by 2002:a17:907:77ce:b0:992:a9c3:244f with SMTP id kz14-20020a17090777ce00b00992a9c3244fmr6330270ejc.4.1691042550490; Wed, 02 Aug 2023 23:02:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691042550; cv=none; d=google.com; s=arc-20160816; b=BQyUrjwUoXoapEoMP5+i3CHDdttO7Z2RIQP/d21VggrmZzf1DzyuRGARLsL5ZQSrVy 7rJNgRuB8ulmgEjkglk9Xr2R+8XbzwZ0mUjVeqHHjKwQZCDdHPTx78cU2hp6fOANajLh Kiz5jIRAxxB/T0R6wxm5YNr6LHIxIILZVAmFgyQGIv1YYBv+gnYtdEL7o5sTM8Q+4spr ubh0dfEzlfXzcV/lu32o4q/cYSeqqrcR1QSjhPkIRJMs5LzMqRejAjZQPg6GWubl0Vr6 ow/n3UhRvAtHSUPhZrGJl8aOjNr4FtEet2wXfDIheduv7/eHLpL/RLE8Yqp3eCujf4eE N4Jg== 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 :dkim-signature:delivered-to; bh=pJCN1g4NLL7UxRXp60gikYNHLBGMIEnWVWhzgFM8Jn0=; fh=W4D6CZujCwMgavJgzxxLHRZ9b2bBm3gY+ViKSXAXuN8=; b=tDBOkskrE0ALLGwYdwO7csjS0Xq7MtTRzVsVIjabiTrJS1La6nDbpVYvvwRpExZCC+ vp51g/AWH09kZxhq116E4jSC+waIuFskrMPxxVGG3gzbk76DaMp4+WFR0z/NM0tXBNX6 dR1M2U8XiKHvUYbXorfK/Y7oNWbMzkMREu7h9zr0lsY5rLfkCs3gzwAwFUAu2Mf2RAtv F7yY4gxMykcu00viqo6aX09n3mYbLotCCpCyN0vP9jkLsZGJ8gMbHq187uMImiQVxYDu n+e2pKHhIcfREM4oIQP8jpuaHIapKF7pHHUqw2c+V5dEJbkv8Sbv9CmEe5FUixsuXjqx Ze2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b="Mv9/ogjd"; 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 e13-20020a17090681cd00b00992ee6da8e7si11175823ejx.740.2023.08.02.23.02.29; Wed, 02 Aug 2023 23:02:30 -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; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b="Mv9/ogjd"; 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 91AA868C668; Thu, 3 Aug 2023 09:02:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (unknown [192.55.52.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D4E1B68C3D0 for ; Thu, 3 Aug 2023 09:02:18 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1691042544; x=1722578544; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=zvquBowizyP8kPT1iDcD+teYCDuNWLFUJjtCLJrqTe4=; b=Mv9/ogjd8S9G1HstyhDFxvsOcofWNXNUAguCTbKxuAgi9prgiTlPXUs1 MAUFas8PyWAzSujp8l//CGJDpnYGAOf/DIBAk1XP7LjYKWCY6EfyI7IkM JSjoLmCC6W2rCCkUoOytqExC2DwzB1xhKtREONW++3SEgtc/JCcUzk6Va 91XO+N4LM2HaA/M4LSNiZCVMziKvbAT9scNXsAzDJu3OqHyv3BVQgycHS MY5d7J22fBINY46bBcwMDpVwYjbfrP7w4R3XrH8x+zCvTQqVynjl5hPOx G2xhm6lBmdh2VtpBYXsD+f38yfYVi4z1G+q/Q1knyATY+q9/HTmVW2UGQ g==; X-IronPort-AV: E=McAfee;i="6600,9927,10790"; a="456152794" X-IronPort-AV: E=Sophos;i="6.01,251,1684825200"; d="scan'208";a="456152794" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Aug 2023 23:01:48 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10790"; a="903224593" X-IronPort-AV: E=Sophos;i="6.01,251,1684825200"; d="scan'208";a="903224593" Received: from t-dg2.sh.intel.com ([10.238.200.86]) by orsmga005.jf.intel.com with ESMTP; 02 Aug 2023 23:01:47 -0700 From: fei.w.wang-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Thu, 3 Aug 2023 14:01:27 +0800 Message-Id: <20230803060132.501741-1-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 1/6] avcodec/cbs_av1: Add tx mode enum values 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: /vblGztq5bL9 From: Fei Wang Signed-off-by: Fei Wang --- libavcodec/av1.h | 7 +++++++ libavcodec/cbs_av1_syntax_template.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/libavcodec/av1.h b/libavcodec/av1.h index 384f7cddc7..8704bc41c1 100644 --- a/libavcodec/av1.h +++ b/libavcodec/av1.h @@ -175,6 +175,13 @@ enum { AV1_RESTORE_SWITCHABLE = 3, }; +// TX mode (section 6.8.21) +enum { + AV1_ONLY_4X4 = 0, + AV1_TX_MODE_LARGEST = 1, + AV1_TX_MODE_SELECT = 2, +}; + // Sequence Headers are actually unbounded because one can use // an arbitrary number of leading zeroes when encoding via uvlc. // The following estimate is based around using the lowest number diff --git a/libavcodec/cbs_av1_syntax_template.c b/libavcodec/cbs_av1_syntax_template.c index a747e17784..3a5cafbfb7 100644 --- a/libavcodec/cbs_av1_syntax_template.c +++ b/libavcodec/cbs_av1_syntax_template.c @@ -1028,9 +1028,9 @@ static int FUNC(read_tx_mode)(CodedBitstreamContext *ctx, RWContext *rw, int err; if (priv->coded_lossless) - infer(tx_mode, 0); + infer(tx_mode, AV1_ONLY_4X4); else - increment(tx_mode, 1, 2); + increment(tx_mode, AV1_TX_MODE_LARGEST, AV1_TX_MODE_SELECT); return 0; }