From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id B11DC47453 for ; Tue, 10 Oct 2023 03:31:45 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5BE3D68C738; Tue, 10 Oct 2023 06:31:42 +0300 (EEST) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5613768C5D5 for ; Tue, 10 Oct 2023 06:31:33 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1696908699; x=1728444699; h=from:to:subject:date:message-id:references:in-reply-to: content-transfer-encoding:mime-version; bh=SYxQcL/dmlHzmjRmgEcKb9W3+VDPvGqGjhDoVar0cbM=; b=WMEO1zFskW4ES4oefbi/1+NGB8Eew1wpLYMeee/SW/1wfzUN8iQL5B90 fGfsUhqHpdJ4qBRr6iWi5ntGMUAh9lgMLSsXGBW/YRqGBaNbV7qui60qa rrmo2AW9aF+5sI2RHG0N1TCNNRTbd7v3Fnk6Yy9zAnIeS1TZ/tNhz/fq9 uC33pWGFNEGDcXeNKhiq716Er68GnDfqoLqCycPKLh8JhJIHtMg+CixjR qglV9HT+J7XSy5KzY2NpxP0AeygbFdJfD+9kk26HqqN1oLhv+NvcV2ySS gAH7ssNkRTry7ewMqqkIlsWvEi9arVdR4yhyzuW/eYcg5g4pSXlvdKxp8 A==; X-IronPort-AV: E=McAfee;i="6600,9927,10858"; a="388171614" X-IronPort-AV: E=Sophos;i="6.03,211,1694761200"; d="scan'208";a="388171614" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Oct 2023 20:31:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10858"; a="819064322" X-IronPort-AV: E=Sophos;i="6.03,211,1694761200"; d="scan'208";a="819064322" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by fmsmga008.fm.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 09 Oct 2023 20:31:03 -0700 Received: from fmsmsx612.amr.corp.intel.com (10.18.126.92) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.32; Mon, 9 Oct 2023 20:31:03 -0700 Received: from fmsmsx602.amr.corp.intel.com (10.18.126.82) by fmsmsx612.amr.corp.intel.com (10.18.126.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.32; Mon, 9 Oct 2023 20:31:02 -0700 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.32 via Frontend Transport; Mon, 9 Oct 2023 20:31:02 -0700 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.101) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.32; Mon, 9 Oct 2023 20:31:02 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LxNmoSr46PtnYR4yL4MCVJsFedFx30HgfK9HjxHLCrRlUqhOOXce+fLVW2r0ZjAhZ7NFMGj7qxKqR/W+FOnRGaIm5OtgW46LrJfCNyUXWPTa1J/vQWiQDHt7R7+9x+6mZgJc28tvrl89fvRJxk6udByxs5HRTahpP2ukEd4Mwy+fobsIb5/5jU9Y0yRRaTxxJ8nZGrkROVJDB2M9vwulgZelaqrFWbIZRQrtuQM+geOdCQbkJBEsI0uTf9ELegElPo0ZXc3pMyiXwIKJpi/PKIAgQnOiTUUaDnWdon6oOjtDgyEAuE96GH0xq9u+dfu46fKHGKH30bKTkpzK+s54LQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=88dpJUUTov+IuWB5WKpF+qNKZJcfgBoztf8sib7O6PE=; b=QIbBF+d6gFqUuW1/TwkiFUTCUtxlc5ZTbnZ4kQLgDn3cNCj9ouqc9PUUWH9RU7LKUg8vxmTXAb2nVAd+xw6NYPM+n44B8ljJNT+7F2FZk4H3VY9+wsC0KOTk594gn1sSqxsIs79tmsgzsGi6yce+mrwcWUZ1usboiQo+rZXPP1b1Z7Bt3+r107gR7+LBZNKtttveLWtH42+mwBNaqpyZp+XCzqzQsJEhyQDDkFiURXJ+djZWFLxhBR2VHvWIEPRoFAAGrIaFgWszGBGHQp0LpuspnD6tAZ3Vf2O9x1qKoCHcoRmGbIzU06mtqXQM/SSEGutmBTlSXr2Im/lltFMphA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from DM6PR11MB2681.namprd11.prod.outlook.com (2603:10b6:5:bd::33) by IA1PR11MB6347.namprd11.prod.outlook.com (2603:10b6:208:388::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.36; Tue, 10 Oct 2023 03:31:00 +0000 Received: from DM6PR11MB2681.namprd11.prod.outlook.com ([fe80::8f95:f5b:207f:4a1e]) by DM6PR11MB2681.namprd11.prod.outlook.com ([fe80::8f95:f5b:207f:4a1e%3]) with mapi id 15.20.6863.032; Tue, 10 Oct 2023 03:31:00 +0000 From: "Dai, Jianhui J" To: "Dai, Jianhui J" , "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v1] avcodec/cbs: Keep ff_cbs_trace_syntax_element Thread-Index: Adn6remfkCjk64uBRNWNs04RIhyP1QAe6MvQ Date: Tue, 10 Oct 2023 03:30:59 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: DM6PR11MB2681:EE_|IA1PR11MB6347:EE_ x-ms-office365-filtering-correlation-id: 10bf62d3-d4bf-4612-776b-08dbc94152b1 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: FLLy1ReP0+EYB1TlDXlXvNHtDcu+UJbB071ShAcg0yRvUUYtqZ8W7waBoGEtYcef6KG54kUQaDAsxTYAYJC4B6TXkyobE2M1Ta67QhLzM10B8jTjFveJ35o0uwCDYaZb5VxkBB9Cy1/gg0wWTpgIYz7wtBtShNaW5/ieK/4qbuZEcvfLqtdWTNMdGcoymyy02U57Gp849rvOTZ2L9kALZZ11vJWhhC7XJ4u7VhmQjudRFAM8Q6m1rGxt/P8zztljOnxVE5w/PxND3N591XWC8sL1T2AHpdTLbSnCL8Bti/WgBiPoV1fIKmVpzeWZFrc+ZHj7iaDC/eYn9NMCiku+BbeY9BqsNZB2LggIC7iOyhSGHrY5OTAh7X7pMY9Pd7TqjHHQTRVO2KGnNUu/w7jdpIXxO3uGA98r/tsn+V/pT2lK4ilHpJpwA9WaHrbjcK+n4wHJg7coCAVJc3qKjjznGyrQAmzdmT5wv6q9WxA86P7+UyR6QgupCWRZ3n7/CiEPD2gdjB4EAHzqgOwhNBT0SloZto017ZrZxD6cvqQjN4/YnSwHJxrcIC8TaXDRgRPdWjZFeMfCyFkD9we1SWZ3X50ga/MOfKMDg518PsUG1q2aXsq7OKJICxvsfiw0GMoq x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM6PR11MB2681.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(366004)(376002)(39860400002)(346002)(396003)(136003)(230922051799003)(186009)(1800799009)(64100799003)(451199024)(33656002)(86362001)(2906002)(52536014)(8676002)(8936002)(41300700001)(55016003)(5660300002)(122000001)(66476007)(66556008)(66946007)(76116006)(64756008)(82960400001)(66446008)(38070700005)(71200400001)(38100700002)(7696005)(6506007)(316002)(110136005)(83380400001)(478600001)(53546011)(9686003)(2940100002)(26005); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?Xf7cuZmxvdQ03gCWkMU2orekHtfF2qxmGWbfUx92DKI+TyVGStWVwUzJl6F+?= =?us-ascii?Q?UkWS0uoRWo0kBoEW7+SSAi8rYowsZeDe8i/ymTzpW1BhOwWveeYP+xYMY0G8?= =?us-ascii?Q?L8foqAtoc26H+Afz/YwfSkh9BBFfNyMVN232BSX6Itrni1V0qP6ZvN3OymaQ?= =?us-ascii?Q?GKHJJuuwHDz0kvCeeBl+1ZmFYWXNsOI4n7mbeT7IwTFkuw/YHEZ5b/Amo51v?= =?us-ascii?Q?IO6wSfu7iMvjAT4EmGNSRPSEguy3LOILv3RPgwyWO4xSjPZYJ9ANj+A0EjGx?= =?us-ascii?Q?gtK7Vecdr19lXCE3NXZ0wwW1bkDoDPdRHiUXd8d6wuL493OdYfJdRp7Nqjei?= =?us-ascii?Q?sSC46juDZFCl8mrW9wvZc4iQBexmDA1Zfzo35qW8z32A3qKkTL1lKMzB3OpY?= =?us-ascii?Q?iO3570n+fvSrYyFlPGdQdHHVKMmGao6uA3Dbi0u9ycRG9IIU6/O9TQyKAPku?= =?us-ascii?Q?lFJLNjko8FpfDWM02opZYzYMVI1L6D2YRououWAsuC/mcFuPz0FLgFalUAps?= =?us-ascii?Q?YcwvAv71hMTYMTcW+DzIdI6UtpTD/6f7UeKEOKtlLPFmzJzVL3coDONRKFK5?= =?us-ascii?Q?duW98nNH1GZBkp3E+HLnycMNsfgf/jkZLie0HKdmw0MJfn28kqu4LzIdsmpj?= =?us-ascii?Q?qrsTsFyCeyY8UtNWCjzlWhJ2yKxuCasl3kCIck8M+xd+i3AJ8VT67ymOBPd3?= =?us-ascii?Q?n+NU7sOf6rQ6BO04cD9OQ8FOmNUj1uLTO5ygnJnekm8wRR4vc4vxUqAqa036?= =?us-ascii?Q?IvlrZW/7CVImrGiCR9PVxoTMu0Hey7Ohh/gUV07S8/f35btFGIVTLquQZ3OM?= =?us-ascii?Q?PKonv0Um1rUBdH7qwc9nQYZdAZt1lGzjOFbksOWyQOPUNs+Ba7hPFnM8xZ11?= =?us-ascii?Q?ex5f+yweTiXboT5cE8vF7wdrXyh5msuEbDK20qz6Vg9q1g/qXsBooLdJs6CV?= =?us-ascii?Q?VLFq0FIrVObrCYG8AXEvDV7A0oYx6rSN849/X1sYtdpW/qcDLNnv9GrhaTJN?= =?us-ascii?Q?h5gnCcz/F5AlzrkJNN33p496DZ3pTY1axa/+CgB4zve/MZ+q8dnYoV+wjH0v?= =?us-ascii?Q?Aom6Dq0jBTqJrhqObZ+mI7KzQZ6PAsN0f460pY1geIS0rpFqJAF5W8sznuKe?= =?us-ascii?Q?G/fe3tdis1q7pqRGYsTCFssZzDMOtv8rFP+MYKpANw8Dv9kuUBz2l2FOCYxX?= =?us-ascii?Q?1PARzs4FoEfgjX4jThARlShLCCjhCPEmibmhArz5JizdCTH15F00Jiy+lVZt?= =?us-ascii?Q?iCQ3Ji26UL66KRaQHabWfvgjdHaDvgu7ufpNhC4wKdqL1VB5A67zhaRs1x43?= =?us-ascii?Q?EL8BBpzOlnRUOGOfbQBdHcy0AhKlXFhbYPbsmtIysIK9inWkQiX9GaCquO7z?= =?us-ascii?Q?9Eqn4Ig4QNCvYrU+V3EohO4bugPbGN/XqDl2WCkxMXJDaSI5V/Rk7sZR2lHm?= =?us-ascii?Q?tgSPeWj43VA6leWv4T4CUrYOdF7mxOR0gwHB9lyFk1unS45Qqky9bn+NOxQy?= =?us-ascii?Q?lG57CyVBADcnk68TVw1cs14qkB0vLUx3bICvltCIdjLV9M+EL4GUayapkAK1?= =?us-ascii?Q?hYSHoGNgDlozlLJ1KhECvlEo/Z0L1wbVgtft9WZt?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM6PR11MB2681.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 10bf62d3-d4bf-4612-776b-08dbc94152b1 X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Oct 2023 03:31:00.0124 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: KjUcIfrfxnQCWEX/SonpLMDXmKRM2b/8K4jhpmFo2hkOgXNRzKuUaVWgPuDiFYav15Hm+Z2cOJybfaymD0HcPA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR11MB6347 X-OriginatorOrg: intel.com Subject: Re: [FFmpeg-devel] [PATCH v1] avcodec/cbs: Keep ff_cbs_trace_syntax_element 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: > -----Original Message----- > From: Dai, Jianhui J > Sent: Tuesday, October 10, 2023 10:57 AM > To: ffmpeg-devel@ffmpeg.org > Subject: [PATCH v1] avcodec/cbs: Keep ff_cbs_trace_syntax_element > > Split ff_cbs_trace_syntax_element from ff_cbs_trace_read_log to decouple the > tracing from GetBitContext. This allows CBS implementations that do not have a > GetBitContext to directly use ff_cbs_trace_syntax_element to trace syntax > elements. > > Signed-off-by: Jianhui Dai > --- > libavcodec/cbs.c | 41 +++++++++++++++++++++++++-------------- > libavcodec/cbs_internal.h | 4 ++++ > 2 files changed, 30 insertions(+), 15 deletions(-) > > diff --git a/libavcodec/cbs.c b/libavcodec/cbs.c index cdd7adebeb..2f2cfcfb31 > 100644 > --- a/libavcodec/cbs.c > +++ b/libavcodec/cbs.c > @@ -498,26 +498,18 @@ void ff_cbs_trace_header(CodedBitstreamContext > *ctx, > av_log(ctx->log_ctx, ctx->trace_level, "%s\n", name); } > > -void ff_cbs_trace_read_log(void *trace_context, > - GetBitContext *gbc, int length, > - const char *str, const int *subscripts, > - int64_t value) > +void ff_cbs_trace_syntax_element(CodedBitstreamContext *ctx, int position, > + const char *str, const int *subscripts, > + const char *bits, int64_t value) > { > - CodedBitstreamContext *ctx = trace_context; > char name[256]; > - char bits[256]; > size_t name_len, bits_len; > int pad, subs, i, j, k, n; > - int position; > - > - av_assert0(value >= INT_MIN && value <= UINT32_MAX); > > - position = get_bits_count(gbc); > + if (!ctx->trace_enable) > + return; > > - av_assert0(length < 256); > - for (i = 0; i < length; i++) > - bits[i] = get_bits1(gbc) ? '1' : '0'; > - bits[length] = 0; > + av_assert0(value >= INT_MIN && value <= UINT32_MAX); > > subs = subscripts ? subscripts[0] : 0; > n = 0; > @@ -545,7 +537,7 @@ void ff_cbs_trace_read_log(void *trace_context, > av_assert0(n == subs); > > name_len = strlen(name); > - bits_len = length; > + bits_len = strlen(bits); > > if (name_len + bits_len > 60) > pad = bits_len + 2; > @@ -556,6 +548,25 @@ void ff_cbs_trace_read_log(void *trace_context, > position, name, pad, bits, value); } > > +void ff_cbs_trace_read_log(void *trace_context, > + GetBitContext *gbc, int length, > + const char *str, const int *subscripts, > + int64_t value) { > + CodedBitstreamContext *ctx = trace_context; > + char bits[256]; > + int position; > + > + position = get_bits_count(gbc); > + > + av_assert0(length < 256); > + for (int i = 0; i < length; i++) > + bits[i] = get_bits1(gbc) ? '1' : '0'; > + bits[length] = 0; > + > + ff_cbs_trace_syntax_element(ctx, position, str, subscripts, bits, > +value); } > + > void ff_cbs_trace_write_log(void *trace_context, > PutBitContext *pbc, int length, > const char *str, const int *subscripts, diff --git > a/libavcodec/cbs_internal.h b/libavcodec/cbs_internal.h index > 07220f1f3e..ff90ce467d 100644 > --- a/libavcodec/cbs_internal.h > +++ b/libavcodec/cbs_internal.h > @@ -158,6 +158,10 @@ typedef struct CodedBitstreamType { void > ff_cbs_trace_header(CodedBitstreamContext *ctx, > const char *name); > > +void ff_cbs_trace_syntax_element(CodedBitstreamContext *ctx, int position, > + const char *name, const int *subscripts, > + const char *bitstring, int64_t value); > + > > // Helper functions for read/write of common bitstream elements, including // > generation of trace output. The simple functions are equivalent to @Mark Thompson Could you please take a look if it's a valid change based on your last refactor? It's intended to use for the reviewing cbs_vp8 patch. > -- > 2.25.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".