From patchwork Mon Jul 10 07:39:36 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: 42576 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp540818pzb; Mon, 10 Jul 2023 00:40:10 -0700 (PDT) X-Google-Smtp-Source: APBJJlF2hBw8MGRTMu3steAAn/4viwPxbgc53kJL3WGTntFUBedx7doVAa27lYu2F4LoRDvf3G3r X-Received: by 2002:a17:906:56:b0:960:d9d:ffb5 with SMTP id 22-20020a170906005600b009600d9dffb5mr13526241ejg.41.1688974810342; Mon, 10 Jul 2023 00:40:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688974810; cv=none; d=google.com; s=arc-20160816; b=cEtsEIsZC0yVfFvgWAVQVP1QxEv8KB4bkAJ3NNakyE/Ule3c5hduVh/a8qg3rRgn6V eipjjDZWNHq4kb4h8DONQzzwVvdPO4WjRSNpQKSbblZvtDbnz3H1CKTKJ91LAutIUkdD vOMZ7F2ARFJjomgQYaFgW7VPOboZGluzFdrOrQp3ll2IZBdMeu8vPYqaBmNGj3HiFPwh l5mJgRyqXTdkLTT/EAw5m2BucZBZpTFIrcZn5EOPIvEFMk0Ay4o2rwZuO2yBFCespD7+ PN426VJolkuUZBzFsJyTgEPfSqDtufe2ew1i6MJNJnmlEOSCBQnaiiiX2RQ5ro89Bg0Y 5pxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=9HDRWksiEl77h7Nx4iTYpWswbPh/EgRIKxGi136jtxM=; fh=mjbWUF9Ti4XQB/BKUMmQysKKolB1ZI3Lwoj9K8X2M00=; b=XBr/Nw7V6YXfw8a9Q/ECSA/0Fq3TOmYYGz8paBML42awFXvn1n5NPyZ2r6ZD+pCAMx BcYap0DA3sHIUVRUAxs1o2jY1rIky4qlXvSXyBu/O0B8QG+p2o55awnZXKNYpudJxHbc JuPppmB7iQIU/HQaZaM//rujkLPtCB6cU0fGyQ3waUq6iHL95Cxf5yHElmj7RRKIy35b wi1cbL8J9Mf1TOI53EGHvPWaCKwFX/lCC/E+SWp1bs6vP/91WFPFZegUPSIkg51fjVbW JX6ceB6NTZ0FacqBrljmampuemJhVmoH2H48HiZBbPNvz25xixhNB4qjujXxDV5BDIbS P+6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=VYSexhrm; 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 jw9-20020a17090776a900b0099396527229si8560826ejc.65.2023.07.10.00.40.09; Mon, 10 Jul 2023 00:40:10 -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=VYSexhrm; 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 6C69368C3BF; Mon, 10 Jul 2023 10:40:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2C58968BE76 for ; Mon, 10 Jul 2023 10:39:58 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1688974804; x=1720510804; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=OKKy0kTXTtY0tvPI7I7oJgih0c9P4SxeMJRfuBWOfiM=; b=VYSexhrmCbvVgcxDboZRAzuBa42FmDiN/8ynKd2sjqI1d4BK/GfnL39K 89b0Vu7yyFpjCCz3YugJNHgbAxtMZK0ezuJ5TipxEBq7HrShKKIzCFLQB dgwka0RETK3l5OS2cAhejryBS1Xu3U+m3P0xnLtXb5HFrYDUaYa/01oRS lSGqhCSBARH7FpkICfdkPN2NFgZMKJN/Ny4kL/C2QOToj1pEkb3Vlss80 3OyiDF/t5LB6A0nhps2TReY5nlc9GA+5hc73IE2Pi6UAXA9/eMgcGVA1J Fr+Ry0uC2vlcJ8Ny1JaW3I5W6QdVlKG9ECBHen9Leaw1UZpzWljzoNEzi Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10766"; a="430350927" X-IronPort-AV: E=Sophos;i="6.01,194,1684825200"; d="scan'208";a="430350927" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jul 2023 00:39:56 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10766"; a="720610994" X-IronPort-AV: E=Sophos;i="6.01,194,1684825200"; d="scan'208";a="720610994" Received: from t-dg2.sh.intel.com ([10.238.200.63]) by orsmga002.jf.intel.com with ESMTP; 10 Jul 2023 00:39:55 -0700 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Jul 2023 15:39:36 +0800 Message-Id: <20230710073941.425658-1-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v1 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: r4xbzPCyQXk+ 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; }