From patchwork Mon Sep 11 07:52:25 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: 43684 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4e27:b0:149:dfde:5c0a with SMTP id gk39csp1973201pzb; Mon, 11 Sep 2023 00:53:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEk8+OszbxPkLvZS59Z8WRZ63I0hvQvKg+2M99/YtK7HI2LIoyquJGH5L0DZwH/Vc37KRaQ X-Received: by 2002:a05:6512:788:b0:4fb:9e1a:e592 with SMTP id x8-20020a056512078800b004fb9e1ae592mr6344869lfr.4.1694418780698; Mon, 11 Sep 2023 00:53:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694418780; cv=none; d=google.com; s=arc-20160816; b=TZhnYTwVfDbJK0pUB9lqMFOcJ5uczaiGjjcgVlFMLN4dy5tv8aOir6vzI2soyt1j8V TCHw557+VIYFtjtJMNumKnE6CrbaEk4zlSC2OyJgRmrSEhAHbYvSFX9cVPcuORrpq9KC BSQvrI+BiggLnebIlLY7BRVrD1f/DQpawX6si1fLhz8Efdl761/c3IY7tvo0uz8t46z7 vB55xne7gEb+ABGOyAqoZAJanYfp8iqiRzjlD+y8LEWBLB0draYEgdLKZvfphMXujByk eO/EhNe62OjpuX5C8f7qn9v43IC3Dv30jjdjTOJvQGBmaXjlRxrJmA7mHWNbNkmbU5Ic mR/g== 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=1RjL3pPBceiDRNn4TpBfcrIa4sctQizy5ROjY03JciE=; fh=i4ESP4ZRFDcfYfwXKWpOXjc2YhmIGuOsCfZUnwNO0gc=; b=kLgw/IF6zT8I9chthCPqGU0GFgJz8dBAzmITsgyCaETKlyCphmw9i8EvOqj9bqC3T1 W6vgPdMO7NpUysKoWfCU5wAo1xK9OgXb9kecrjenkJa6jKPdJWCgZGYBSmnpkFNTWf3z XWimmo2lw8LY/tWouuhVNrauIZ0w+/+XoaPULRujbD1Afpfax80XjkFDMzOt0/ItCqia GxgUAy/UODC9zwDyO80y5wxelv4P4rnKk+/bQxIBVSVZxaIaYBwX02RtR3KiL9VNrQJj +89iPIMQjxSgnzHB3usd58TtjjU5bNJcB3nMAWp3HjdlisIvavGciN2q8Ob8X5TMqsNN vk0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=ZiklBkdq; 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 d13-20020a056402078d00b005234945a7d4si6117101edy.531.2023.09.11.00.52.59; Mon, 11 Sep 2023 00:53:00 -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=ZiklBkdq; 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 014FA68C8FE; Mon, 11 Sep 2023 10:52:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BC10368C8CF for ; Mon, 11 Sep 2023 10:52:48 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1694418774; x=1725954774; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=lvYH0nwk3H0dAXbQ89PXZWyXvaEM98tPqpuh0S6bEzU=; b=ZiklBkdq2ZzxA46EL0HOYKbJ41+Q1uVKHXCD6/xIekGUkWaLToD4h00G R6NIpKpr5HocGEZmD6eVCF9Dytw2M5FVeUThVXRZjYnb8CV2kCtpQmjMH BR6iGIl5TK6pFBWk7lGOy65Y5QVh+ZndU7pDOhKkaokx6yzZg6eLO05PH dROumbCclvB94PvM3oyOZGTaW8pozR59hqdUlEZBpmC2Ur0+OPjOl1chN 89/UO8uH2WAh7YPbbj9sNLvCaQx0LiXoA2uGOD4q/2XEv+e0jJjXsoygl nsOydMxcPmAERdFNw2k4pZUo10R8xboqNhW+ZIc89/f3nIpFRNRziRHty A==; X-IronPort-AV: E=McAfee;i="6600,9927,10829"; a="380718540" X-IronPort-AV: E=Sophos;i="6.02,243,1688454000"; d="scan'208";a="380718540" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Sep 2023 00:52:45 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10829"; a="778300381" X-IronPort-AV: E=Sophos;i="6.02,243,1688454000"; d="scan'208";a="778300381" Received: from t-dg2.sh.intel.com ([10.239.159.29]) by orsmga001.jf.intel.com with ESMTP; 11 Sep 2023 00:52:44 -0700 From: fei.w.wang-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Sep 2023 15:52:25 +0800 Message-Id: <20230911075232.797886-1-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 1/8] 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: RI3+bt2xsX1Y From: Fei Wang Signed-off-by: Fei Wang Acked-by: Neal Gompa Reviewed-by: Neal Gompa --- 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 6f09c4e410..3be1f2d30f 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; }