From patchwork Tue Jul 18 03:11:58 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: 42791 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:b813:b0:130:ccc6:6c4b with SMTP id fi19csp220538pzb; Mon, 17 Jul 2023 20:12:35 -0700 (PDT) X-Google-Smtp-Source: APBJJlFgKS/sttybUhU+lzrZRzNI+TJ0HF6PRDrwSZ7D0huBFjjYsLD45FQWNzhGQiUB1z8V8u2C X-Received: by 2002:a05:6402:1859:b0:51e:2664:f695 with SMTP id v25-20020a056402185900b0051e2664f695mr13599290edy.23.1689649955469; Mon, 17 Jul 2023 20:12:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689649955; cv=none; d=google.com; s=arc-20160816; b=HGGmKHjRdtHCbT9qRthJPTAh17K+tu8OF9d0SiHoY+0BILOnvQSPhT3sn5tmM4t8WI uUbcYdVsTtG/3DnEkC8qcNIgh9Y4mPUgFYw7G84vSvCq8Tns5d0uTZZV2Z28qLjWUoT2 iwUzAA/Si3sT7Pso4Af8iY+IJO83GAeYTyAIlzakgQF7iYgCzIWgyrc7lBgwBzNg5sN3 jg8TgOU7QruTU64XNFeut7S4GW1W1Gsz+gBELWzsg6hh7OTbBAnkKBrqAo3O55IchINE JODznJnR3l4WX9wMVU4dYV8Q34lmnLbZpyE8o/RGyrqycu/7d63drYYIs0Q087lqz9LZ 5+1Q== 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=WuNXSuFjhoA8Uw9nFNyBaf+NaIP7BZZW48M2iaEZmo/XOeClKiQxqWJpizNrW0ZGrS qZdhc00vbyR/C4QhW0sX6bRBN5PJQpsxjijmlsfLsTEs/HQNJpGoYvRopRnq2SfXklkW 8/Zs4o+DU1Nhektx/5R7FexQXc7rtPH3eFGRQfJxslZ+QY25ez9IadjXBvIMty5nTQTT vB35DcGhULskD808ktCpKusciqPoZLMFxXOdO9A8sKNEP8R9Z+RjV/JGhbNwneDZ6p78 mE/MRy50PJyFI+iMuu2rtpBWeXoV6lIc3XsDebccttLGr97+qhig7FMac+xxZGbzLaMK uK3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=CFzXZiAT; 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 e19-20020a50fb93000000b0050bc94fe05csi557399edq.117.2023.07.17.20.12.34; Mon, 17 Jul 2023 20:12:35 -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=CFzXZiAT; 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 70BF068C1C3; Tue, 18 Jul 2023 06:12:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 863C768BFE7 for ; Tue, 18 Jul 2023 06:12:23 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1689649948; x=1721185948; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=OKKy0kTXTtY0tvPI7I7oJgih0c9P4SxeMJRfuBWOfiM=; b=CFzXZiATo0ONA2AQg78yzdw8iBHxz3zFOP82YhK3PrdwNzRMkdq+6MN9 P7gUa3/ZifRZQS7+xtZFwsGIYj+his5BamsulC2eChm6KxNwvnqSeSRG2 /tLF8gly0oG1vsz3IAkiv6mrGkVC6UU8YYtX8SSIiCw1LlfQaAnXghT99 7AcFZA9IquSgOnV9qyAjn617WgxLBfGrLQp1cXbdl9YN0eUsSBenpS9jY 36SJ7KW+OkQOgL26kbnaagYuhFHuEj3LsV8UYrJj2tM8+0J7HkS6StQJQ kVvObBG/rNRBfERt8w+XdIdZqjAY7f/zy64z+Sp7zcQaoFmLhLcyO7BcE g==; X-IronPort-AV: E=McAfee;i="6600,9927,10774"; a="366133476" X-IronPort-AV: E=Sophos;i="6.01,213,1684825200"; d="scan'208";a="366133476" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Jul 2023 20:12:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10774"; a="758646234" X-IronPort-AV: E=Sophos;i="6.01,213,1684825200"; d="scan'208";a="758646234" Received: from t-dg2.sh.intel.com ([10.238.200.63]) by orsmga001.jf.intel.com with ESMTP; 17 Jul 2023 20:12:19 -0700 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Jul 2023 11:11:58 +0800 Message-Id: <20230718031203.87803-1-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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: /tHuF8sFGJzE 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; }