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 86C0D45473 for ; Sun, 30 Jul 2023 17:06:52 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B09D468C4ED; Sun, 30 Jul 2023 20:06:49 +0300 (EEST) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01olkn2037.outbound.protection.outlook.com [40.92.65.37]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 72AB068C424 for ; Sun, 30 Jul 2023 20:06:42 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TKsgJ5GgEUSs3Z76ALUiEyey1vy2WVlr+DtwzeY6gu3gN7QD7wJCzuZ0UHoFHFeFDpBtWgUgM9m4vUUZrBXktNXUm6USQa3h5YAGQ6jL9nHlUYDKwTDWFEdD4REiq7+PRyW5RSe1SvkqyxogOsiNxWPY4ZM9mKTnnYpj2dFqaDYb/Ro5i2m+h7AHzHoHFETxi6urS/tunB3KjysGkiv2ld1/Y0dxipye8uMsISBgpDedvafHqo38xJONiPf/rLM6J78sMByTTh7gaamjW2DmxHXl+OQd3rG7//7OLCaEs8/Nwe/3UdINIdIYL55QBZHEd0sC8KkGblIB6cS2K6N9Bg== 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=YXm5nkHzNnUCLGHJEcUDMzQMzTp94wH0gKzft5VomIY=; b=WRJj9SFt2PpO1es1qUYOXHaTlzyBvYbKjxpJhPzrV1rxMVxXMqbYAL5RJrw0KVxJAdKT13GfESTHmYiGFppi8nLDlorejfC0zbmXWIxn+r87biZbtuW8VNh+6CU1uPumDKF4aM5cQ8mgc+D6GJZgfN9wkHi3KvTFkLu1TqqJOiaOM2+MdJbmmiO7UnReOd5N0IRdLqJxANjAJmFZORma3gzpVRtbcDO/OeJLbYev7jnIRjWrWLMnanSEcg6EMqOG+J2203lEd+uUjvmbed9W17SCbcr3FZIG0Zq8s6qdOCvdOLKyrh9dEZvgItKDamnVHU8JMv3P4OM3lcZZ5parWA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YXm5nkHzNnUCLGHJEcUDMzQMzTp94wH0gKzft5VomIY=; b=RhB8vv7IewBh5DOd3+gggvw7y5yRPvIRMe0euak+w4DnV5oO6MbwaC2gjHXRtuzwpy9niFNTivYNlomAP3B3YZCYMD39TsI8wT2D/IYWhBoJhR0vvTl5IMhkbSXKv+wD51XsN1gIM6AcQkdZVAluk8o2EK1MvlUAQLdtdXOcJhcpEntu98/h2A+xn4NRBETjkJ2Y9Zf4IIDXSXdlM0HfJZIeMcHDT4W+TEqCqaz4bftJyq50ybfwEetgeNDag01vBTVP9VaE51ShsZ775UodMaJM8rsneVbHUYwZbdDMrk/tWNvAu3WVH4AEy23dXcdVPBLTXwdNXDowIBwPJrs/hQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0071.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.42; Sun, 30 Jul 2023 16:51:03 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4d3a:7ca6:cf28:9e8c]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4d3a:7ca6:cf28:9e8c%7]) with mapi id 15.20.6631.042; Sun, 30 Jul 2023 16:51:03 +0000 Message-ID: Date: Sun, 30 Jul 2023 18:52:11 +0200 To: ffmpeg-devel@ffmpeg.org References: Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: X-TMN: [tIuBcACVSY+IDhMgw8BLqICZPryFnvX2oMhd39UYln8=] X-ClientProxiedBy: ZR2P278CA0067.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:52::14) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <37d5b982-9632-1d31-5893-220251a6cbc8@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0071:EE_ X-MS-Office365-Filtering-Correlation-Id: fb9d2b08-92ee-4552-b600-08db911d2916 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fsvprXjsjxHdhTFNgETFcVJcwE6c3wbqRhkcp+L0b41n1Evg4glAQqo52eyAAUq/mVxZrWI1mX/K2BrxiYvJrOczVFIM64F3GAo1WF77tFx9CJxufewidctw/pT3R48n0X43JuNsweBLwXCqJlgRpGvf8qpcqCbq7/iliQl1E+rRONb9v+P6aepNEyUMd+ebTJdtVkOjTfSWROHqQLSBSbx2/THAoAdRzz0ji3czcFj7HyLzaTRJKMYdlvZiYF4Fh92EipQVJ1WRM6xGZvq5KTnHI+xIfruFLFJeOZn4Qf2E+8Am9y3HrnzPly1+g2Q48hMk0GtzqOrBqpuAb3eqF5MX+EHjIba4OwytpR591aW7LrHF95GTHanUHYAbw3oWA33oKWVePEQX3wpFbVo+CtXbypovxAq6vVML0xZFC6/Aer3uQMsADvqH0Itddskkzy8r3MLLyIskbV8bXiYgRqox1Ec7Q3gwRxSzGdgFV657A84+xiQaSFZrfPo+/Pee6A4N2hbhMAJuakXGqDI1n78RAz6ak+dItnNZ26NWa1a+NaArecSKvw9xiDDFmp0U X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?R1Z5STExV2tGMXRxOFdGNUNLNjV4NjRuaGRvV2RSRUQ4cFJybWMxWmxRbUxS?= =?utf-8?B?QWlGU3VPVEdtdGtmMG0wdi9DNlpSODZQK3M1cEs1NU5Ud2Z4bVRYQ0Nlb0NH?= =?utf-8?B?Vm11VXFaTExkR0NwYnBJRXkxQXFSbnNubTRVQXRIcWNPaFVmVTZ6SFdydUtF?= =?utf-8?B?RnNSa2NsRzhTQXdLN2RJSzlXb25kaXF4TTVWLzcvbE9rTUFJTTNuVFQwb3NM?= =?utf-8?B?NUR2ZmVNRHkvZEJCM3YyUTVYdHJUZTZwbFpnYWNBL2Fuc1ZNMEpFcmhDOTJ4?= =?utf-8?B?TS8ydGNYK05idjBoM3VLSzNQTXZWMVR4U0EwcXpkL3Z2eWYzcmtOb1JCSS9h?= =?utf-8?B?dTBoTEJVYUh5dElKVEVQVm8vckkwOGJLNVozYlpIODVuUlhhMFBEblBlM1E2?= =?utf-8?B?R1pzZ3ZPOVFvcEJzQnliUUg0ZUNpUEttWlc3VmRMSmNVNDJVVW5xak5UcmRV?= =?utf-8?B?WnZydnJ1aWlXMEJzMWJ0ZUZKTmdoODQzZkNTayszYjdUMXBPS25MNWM4Qmhv?= =?utf-8?B?WlBSeW5ZZEtmVk1aN2NPWGtGam9KenFIVDFHVUVSb2d2UFY3VndhOVdHS0lB?= =?utf-8?B?T2FTUkJBWmVmZEpmQnhJNzZqVVZjZmhDMlNIeXpBOTU2ZElUQ2RWdDJYVVhy?= =?utf-8?B?Tm8rQ3pHNENMdzh1TDR5VHhDdGtUSXUycUdFYU5SZGNLV0RCZXNqTTEvZE41?= =?utf-8?B?RGN2V1F4QmxzZzRlazZ4L2ZFZDZWRzBqcDNRdERZWDYyQ2ZNWUJFbnpRR0V2?= =?utf-8?B?RThKMjZxQ1JzUVBYNkEyZkJQVG9DbHJyK1l4U0hqTDNBOHZTdVdQUFRkRTlq?= =?utf-8?B?b005VFB1WDBUL1F6VHRtZjBxd3VwRFRvY0VvVTBnNmlyejhLaVdwbWlHaDRk?= =?utf-8?B?ZTNlZnYzekcvbUdJeXVpQ3dLeHFxSit4czJBMmxvZmxPcTJDWDJpSW5TTDQy?= =?utf-8?B?NGdGQ3dCakNaeHY5S205Nlk1OFFadUp5TlBDZ2tJM2U2UEVtSzNjSityNlU4?= =?utf-8?B?THdpQUpucFJXSDlSRTh6d1JGZGRqTDNuem52aVJ2aDRsVDFsNXNpam12Snl5?= =?utf-8?B?Tk9GM04yRnltUjY5WmMxWVAzaGtGWFUva2ZDNW1Dai9ESGZhcksyc3VJMHRm?= =?utf-8?B?M0UzR2g1Q2lLQmhHM3FwUFJzaW5TQjMrRWFqWkoyQ0t0dGd5NVB3THBOSE9G?= =?utf-8?B?dzJvbnoyTy9FcUNBSXNHWE45TTVUQ2pSSk9YYk5VNk5XSHFIS1oyQ1dhT0hl?= =?utf-8?B?RnFqZ2RtbzJkVGowNFV6VkdIeVJhd3RNVS9zZVpDNCsrUWZqQTNmNWVzclBp?= =?utf-8?B?akNFYTNUd3lQcVdBdzFBZGpnaUZXZEZ1R2ZyRDBhWG4rRkNwZVJZbXZzNE1K?= =?utf-8?B?Q29nMDhQTDFuZ3ViRTloL2JlOWdsZDdNZ3FJZTdBczdrUUREUzBkSnAveVdx?= =?utf-8?B?R1JQa1dNTGtqSDJ5ZGhlRUxPWldDZWhLUmJWa216UUo2MTQ3d0xmNlQrc1VB?= =?utf-8?B?R1FUU2ZZUXh1L0lMMTQreVRqSE1YcWdDSmJOU1RpSDY2NWROZmlpNTl2RTRS?= =?utf-8?B?UGJQS0JkRkloM1VoZHEwNE00NWdyOGNGNWlLTGFHTTE2Z3hWdGI2UGY2a3pp?= =?utf-8?B?VUZzUHVZa1ArWU8zV0RYODdMZlJHTUVkZFVNM0gvd1hZOVRxU1lrVGJIOWhU?= =?utf-8?Q?57eAnjJnZpjr65n8lRwb?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fb9d2b08-92ee-4552-b600-08db911d2916 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jul 2023 16:51:03.6747 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8P250MB0071 Subject: Re: [FFmpeg-devel] [PATCH 1/2] avcodec/cbs: Add specialization for ff_cbs_(read|write)_unsigned() 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: Andreas Rheinhardt: > These functions allow not only to read and write unsigned values, > but also to check ranges and to emit trace output which can be > beautified when processing arrays (indices like "[i]" are replaced > by their actual numbers). > > Yet lots of callers actually only need something simpler: > Their range is only implicitly restricted by the amount > of bits used and they are not part of arrays, hence don't > need this beautification. > > This commit adds specializations for these callers; > this is very beneficial size-wise (it reduced the size > of .text by 14928 bytes here), as a call is now cheaper. > > Signed-off-by: Andreas Rheinhardt > --- > libavcodec/cbs.c | 34 ++++++++++++++++++++++++++++++---- > libavcodec/cbs_av1.c | 28 +++++++++++++++++++--------- > libavcodec/cbs_h2645.c | 15 +++++++++++++-- > libavcodec/cbs_internal.h | 11 ++++++++++- > libavcodec/cbs_mpeg2.c | 15 +++++++++++++-- > libavcodec/cbs_vp9.c | 14 ++++++++++++-- > 6 files changed, 97 insertions(+), 20 deletions(-) > > diff --git a/libavcodec/cbs.c b/libavcodec/cbs.c > index e829caa0a0..8bd63aa831 100644 > --- a/libavcodec/cbs.c > +++ b/libavcodec/cbs.c > @@ -536,10 +536,13 @@ void ff_cbs_trace_syntax_element(CodedBitstreamContext *ctx, int position, > position, name, pad, bits, value); > } > > -int ff_cbs_read_unsigned(CodedBitstreamContext *ctx, GetBitContext *gbc, > - int width, const char *name, > - const int *subscripts, uint32_t *write_to, > - uint32_t range_min, uint32_t range_max) > +static av_always_inline int cbs_read_unsigned(CodedBitstreamContext *ctx, > + GetBitContext *gbc, > + int width, const char *name, > + const int *subscripts, > + uint32_t *write_to, > + uint32_t range_min, > + uint32_t range_max) > { > uint32_t value; > int position; > @@ -579,6 +582,22 @@ int ff_cbs_read_unsigned(CodedBitstreamContext *ctx, GetBitContext *gbc, > return 0; > } > > +int ff_cbs_read_unsigned(CodedBitstreamContext *ctx, GetBitContext *gbc, > + int width, const char *name, > + const int *subscripts, uint32_t *write_to, > + uint32_t range_min, uint32_t range_max) > +{ > + return cbs_read_unsigned(ctx, gbc, width, name, subscripts, > + write_to, range_min, range_max); > +} > + > +int ff_cbs_read_simple_unsigned(CodedBitstreamContext *ctx, GetBitContext *gbc, > + int width, const char *name, uint32_t *write_to) > +{ > + return cbs_read_unsigned(ctx, gbc, width, name, NULL, > + write_to, 0, UINT32_MAX); > +} > + > int ff_cbs_write_unsigned(CodedBitstreamContext *ctx, PutBitContext *pbc, > int width, const char *name, > const int *subscripts, uint32_t value, > @@ -615,6 +634,13 @@ int ff_cbs_write_unsigned(CodedBitstreamContext *ctx, PutBitContext *pbc, > return 0; > } > > +int ff_cbs_write_simple_unsigned(CodedBitstreamContext *ctx, PutBitContext *pbc, > + int width, const char *name, uint32_t value) > +{ > + return ff_cbs_write_unsigned(ctx, pbc, width, name, NULL, > + value, 0, MAX_UINT_BITS(width)); > +} > + > int ff_cbs_read_signed(CodedBitstreamContext *ctx, GetBitContext *gbc, > int width, const char *name, > const int *subscripts, int32_t *write_to, > diff --git a/libavcodec/cbs_av1.c b/libavcodec/cbs_av1.c > index 1229480567..114d8580b3 100644 > --- a/libavcodec/cbs_av1.c > +++ b/libavcodec/cbs_av1.c > @@ -412,9 +412,8 @@ static int cbs_av1_read_subexp(CodedBitstreamContext *ctx, GetBitContext *gbc, > } > > if (len < max_len) { > - err = ff_cbs_read_unsigned(ctx, gbc, range_bits, > - "subexp_bits", NULL, &value, > - 0, MAX_UINT_BITS(range_bits)); > + err = ff_cbs_read_simple_unsigned(ctx, gbc, range_bits, > + "subexp_bits", &value); > if (err < 0) > return err; > > @@ -476,10 +475,9 @@ static int cbs_av1_write_subexp(CodedBitstreamContext *ctx, PutBitContext *pbc, > return err; > > if (len < max_len) { > - err = ff_cbs_write_unsigned(ctx, pbc, range_bits, > - "subexp_bits", NULL, > - value - range_offset, > - 0, MAX_UINT_BITS(range_bits)); > + err = ff_cbs_write_simple_unsigned(ctx, pbc, range_bits, > + "subexp_bits", > + value - range_offset); > if (err < 0) > return err; > > @@ -546,8 +544,6 @@ static size_t cbs_av1_get_payload_bytes_left(GetBitContext *gbc) > > #define SUBSCRIPTS(subs, ...) (subs > 0 ? ((int[subs + 1]){ subs, __VA_ARGS__ }) : NULL) > > -#define fb(width, name) \ > - xf(width, name, current->name, 0, MAX_UINT_BITS(width), 0, ) > #define fc(width, name, range_min, range_max) \ > xf(width, name, current->name, range_min, range_max, 0, ) > #define flag(name) fb(1, name) > @@ -573,6 +569,13 @@ static size_t cbs_av1_get_payload_bytes_left(GetBitContext *gbc) > #define READWRITE read > #define RWContext GetBitContext > > +#define fb(width, name) do { \ > + uint32_t value; \ > + CHECK(ff_cbs_read_simple_unsigned(ctx, rw, width, \ > + #name, &value)); \ > + current->name = value; \ > + } while (0) > + > #define xf(width, name, var, range_min, range_max, subs, ...) do { \ > uint32_t value; \ > CHECK(ff_cbs_read_unsigned(ctx, rw, width, #name, \ > @@ -645,6 +648,7 @@ static size_t cbs_av1_get_payload_bytes_left(GetBitContext *gbc) > #undef READ > #undef READWRITE > #undef RWContext > +#undef fb > #undef xf > #undef xsu > #undef uvlc > @@ -661,6 +665,11 @@ static size_t cbs_av1_get_payload_bytes_left(GetBitContext *gbc) > #define READWRITE write > #define RWContext PutBitContext > > +#define fb(width, name) do { \ > + CHECK(ff_cbs_write_simple_unsigned(ctx, rw, width, #name, \ > + current->name)); \ > + } while (0) > + > #define xf(width, name, var, range_min, range_max, subs, ...) do { \ > CHECK(ff_cbs_write_unsigned(ctx, rw, width, #name, \ > SUBSCRIPTS(subs, __VA_ARGS__), \ > @@ -723,6 +732,7 @@ static size_t cbs_av1_get_payload_bytes_left(GetBitContext *gbc) > #undef WRITE > #undef READWRITE > #undef RWContext > +#undef fb > #undef xf > #undef xsu > #undef uvlc > diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c > index 10b3bcc70b..54f6da186b 100644 > --- a/libavcodec/cbs_h2645.c > +++ b/libavcodec/cbs_h2645.c > @@ -263,8 +263,6 @@ static int cbs_h265_payload_extension_present(GetBitContext *gbc, uint32_t paylo > > #define u(width, name, range_min, range_max) \ > xu(width, name, current->name, range_min, range_max, 0, ) > -#define ub(width, name) \ > - xu(width, name, current->name, 0, MAX_UINT_BITS(width), 0, ) > #define flag(name) ub(1, name) > #define ue(name, range_min, range_max) \ > xue(name, current->name, range_min, range_max, 0, ) > @@ -300,6 +298,12 @@ static int cbs_h265_payload_extension_present(GetBitContext *gbc, uint32_t paylo > #define READWRITE read > #define RWContext GetBitContext > > +#define ub(width, name) do { \ > + uint32_t value; \ > + CHECK(ff_cbs_read_simple_unsigned(ctx, rw, width, #name, \ > + &value)); \ > + current->name = value; \ > + } while (0) > #define xu(width, name, var, range_min, range_max, subs, ...) do { \ > uint32_t value; \ > CHECK(ff_cbs_read_unsigned(ctx, rw, width, #name, \ > @@ -374,6 +378,7 @@ static int cbs_h2645_read_more_rbsp_data(GetBitContext *gbc) > #undef READ > #undef READWRITE > #undef RWContext > +#undef ub > #undef xu > #undef xi > #undef xue > @@ -389,6 +394,11 @@ static int cbs_h2645_read_more_rbsp_data(GetBitContext *gbc) > #define READWRITE write > #define RWContext PutBitContext > > +#define ub(width, name) do { \ > + uint32_t value = current->name; \ > + CHECK(ff_cbs_write_simple_unsigned(ctx, rw, width, #name, \ > + value)); \ > + } while (0) > #define xu(width, name, var, range_min, range_max, subs, ...) do { \ > uint32_t value = var; \ > CHECK(ff_cbs_write_unsigned(ctx, rw, width, #name, \ > @@ -452,6 +462,7 @@ static int cbs_h2645_read_more_rbsp_data(GetBitContext *gbc) > #undef WRITE > #undef READWRITE > #undef RWContext > +#undef ub > #undef xu > #undef xi > #undef xue > diff --git a/libavcodec/cbs_internal.h b/libavcodec/cbs_internal.h > index f853086fa3..2838be6b9e 100644 > --- a/libavcodec/cbs_internal.h > +++ b/libavcodec/cbs_internal.h > @@ -147,18 +147,27 @@ void ff_cbs_trace_syntax_element(CodedBitstreamContext *ctx, int position, > > > // Helper functions for read/write of common bitstream elements, including > -// generation of trace output. > +// generation of trace output. The simple functions are equivalent to > +// their non-simple counterparts except that their range is unrestricted > +// (i.e. only limited by the amount of bits used) and they lack > +// the ability to use subscripts. > > int ff_cbs_read_unsigned(CodedBitstreamContext *ctx, GetBitContext *gbc, > int width, const char *name, > const int *subscripts, uint32_t *write_to, > uint32_t range_min, uint32_t range_max); > > +int ff_cbs_read_simple_unsigned(CodedBitstreamContext *ctx, GetBitContext *gbc, > + int width, const char *name, uint32_t *write_to); > + > int ff_cbs_write_unsigned(CodedBitstreamContext *ctx, PutBitContext *pbc, > int width, const char *name, > const int *subscripts, uint32_t value, > uint32_t range_min, uint32_t range_max); > > +int ff_cbs_write_simple_unsigned(CodedBitstreamContext *ctx, PutBitContext *pbc, > + int width, const char *name, uint32_t value); > + > int ff_cbs_read_signed(CodedBitstreamContext *ctx, GetBitContext *gbc, > int width, const char *name, > const int *subscripts, int32_t *write_to, > diff --git a/libavcodec/cbs_mpeg2.c b/libavcodec/cbs_mpeg2.c > index 33bd3e0998..df58b50bab 100644 > --- a/libavcodec/cbs_mpeg2.c > +++ b/libavcodec/cbs_mpeg2.c > @@ -40,8 +40,6 @@ > > #define SUBSCRIPTS(subs, ...) (subs > 0 ? ((int[subs + 1]){ subs, __VA_ARGS__ }) : NULL) > > -#define ui(width, name) \ > - xui(width, name, current->name, 0, MAX_UINT_BITS(width), 0, ) > #define uir(width, name) \ > xui(width, name, current->name, 1, MAX_UINT_BITS(width), 0, ) > #define uis(width, name, subs, ...) \ > @@ -65,6 +63,12 @@ > #define READWRITE read > #define RWContext GetBitContext > > +#define ui(width, name) do { \ > + uint32_t value; \ > + CHECK(ff_cbs_read_simple_unsigned(ctx, rw, width, #name, \ > + &value)); \ > + current->name = value; \ > + } while (0) > #define xuia(width, string, var, range_min, range_max, subs, ...) do { \ > uint32_t value; \ > CHECK(ff_cbs_read_unsigned(ctx, rw, width, string, \ > @@ -95,6 +99,7 @@ > #undef READ > #undef READWRITE > #undef RWContext > +#undef ui > #undef xuia > #undef xsi > #undef nextbits > @@ -105,6 +110,11 @@ > #define READWRITE write > #define RWContext PutBitContext > > +#define ui(width, name) do { \ > + CHECK(ff_cbs_write_simple_unsigned(ctx, rw, width, #name, \ > + current->name)); \ > + } while (0) > + > #define xuia(width, string, var, range_min, range_max, subs, ...) do { \ > CHECK(ff_cbs_write_unsigned(ctx, rw, width, string, \ > SUBSCRIPTS(subs, __VA_ARGS__), \ > @@ -134,6 +144,7 @@ > #undef WRITE > #undef READWRITE > #undef RWContext > +#undef ui > #undef xuia > #undef xsi > #undef nextbits > diff --git a/libavcodec/cbs_vp9.c b/libavcodec/cbs_vp9.c > index ae7f88a8a3..def2ae0d21 100644 > --- a/libavcodec/cbs_vp9.c > +++ b/libavcodec/cbs_vp9.c > @@ -251,8 +251,6 @@ static int cbs_vp9_write_le(CodedBitstreamContext *ctx, PutBitContext *pbc, > > #define SUBSCRIPTS(subs, ...) (subs > 0 ? ((int[subs + 1]){ subs, __VA_ARGS__ }) : NULL) > > -#define f(width, name) \ > - xf(width, name, current->name, 0, ) > #define s(width, name) \ > xs(width, name, current->name, 0, ) > #define fs(width, name, subs, ...) \ > @@ -264,6 +262,12 @@ static int cbs_vp9_write_le(CodedBitstreamContext *ctx, PutBitContext *pbc, > #define READWRITE read > #define RWContext GetBitContext > > +#define f(width, name) do { \ > + uint32_t value; \ > + CHECK(ff_cbs_read_simple_unsigned(ctx, rw, width, #name, \ > + &value)); \ > + current->name = value; \ > + } while (0) > #define xf(width, name, var, subs, ...) do { \ > uint32_t value; \ > CHECK(ff_cbs_read_unsigned(ctx, rw, width, #name, \ > @@ -329,6 +333,7 @@ static int cbs_vp9_write_le(CodedBitstreamContext *ctx, PutBitContext *pbc, > #undef READ > #undef READWRITE > #undef RWContext > +#undef f > #undef xf > #undef xs > #undef increment > @@ -344,6 +349,10 @@ static int cbs_vp9_write_le(CodedBitstreamContext *ctx, PutBitContext *pbc, > #define READWRITE write > #define RWContext PutBitContext > > +#define f(width, name) do { \ > + CHECK(ff_cbs_write_simple_unsigned(ctx, rw, width, #name, \ > + current->name)); \ > + } while (0) > #define xf(width, name, var, subs, ...) do { \ > CHECK(ff_cbs_write_unsigned(ctx, rw, width, #name, \ > SUBSCRIPTS(subs, __VA_ARGS__), \ > @@ -396,6 +405,7 @@ static int cbs_vp9_write_le(CodedBitstreamContext *ctx, PutBitContext *pbc, > #undef WRITE > #undef READWRITE > #undef RWContext > +#undef f > #undef xf > #undef xs > #undef increment Seems I also forgot to apply this. Will apply it tonight unless there are objections. - Andreas _______________________________________________ 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".