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 57E364204A for ; Fri, 24 Jun 2022 09:50:56 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3072C68B6D6; Fri, 24 Jun 2022 12:50:54 +0300 (EEST) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2024.outbound.protection.outlook.com [40.92.90.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E7C1068B6AA for ; Fri, 24 Jun 2022 12:50:46 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RxI7Au0UHkRYG7nsYiZMV7pVRNebn4JPjl2Mg4z3Pb49gX4vf3cxrRL6lsT2ZOWaGf4im7N4VV1gYWZKVvHb+weRMrjLNZR+XxFX2g7mYMFRwyrJXpwO3IaaMU8+lN79Fyz4q1mHryUeHnajwhT070LNSoSc7JlLidokTZfhp+FBCaSbuqZWWEwrxul4yy5i6ChYut2pbuwEC46uDGdYqZwIDJv+hoi/j75MpBjWH/iW9ThaNRlD3NKGPdydIPdr4InWzPU78BQkY069Y4sscrmBAUVZWOIKuj8XQRDLVvOAsoSoIPoH4GHjWVoc7S7P35dnRtlg9xGTrZQhau0lhw== 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=CGIQ3WYEKBGOCImEZb1oCi/NBVel19/JfexBvUWr2co=; b=QP/kOB3l0SlTShDwF8YHAbNEgkYuFdFz4oohlw8sexKYYmDVTdRNPvPZaD2yznGDKHz8twvrgEoi13mgx3/GUUEfZzEupKwAF1lUgmFZOfGCN6xbMgr5emt1K5/USe6tswwG7/y63HfeQwssPRw7hgA8WjI9Mr2DEH7vcxzLLCZbF9tQ0pYTiY/kVMdCsTq0cOMz4jJKiL8dzZRqUC9MKBg0wXLuAvXpeWnJghfGm8paxlUL5zZ31t1aL6IFdgDzEb/BFSNhFQty0i3RnXIN8iZ8bLjvBnqmrXWo04dsozQGC2v0zCHA9hoIXppFxQ367VRF9om8OFY0F6HBxlxHhA== 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=CGIQ3WYEKBGOCImEZb1oCi/NBVel19/JfexBvUWr2co=; b=kwbU/QKSRUxN0m8cXI/uNUGYJqZ6lgMOL0bqxXVGqe468Nx/aISE1fIDbBNVrh/ODhwAXNe/ftaXddUkP5MZnXLuT2KNwZnu67UAQbyPBqKdmnntu1QIimaJWVYWHoju/wT+EuPzgVc+4KYmKdFjcL2APEKwaPdXi9jgIOhwVLsul/kdLnYXhBaHPlKRlxhOyliXCOpqw7k7B6Qre9x28ZBS8WEIf1hrjXoGQip6+hJ60RTNskQOdgxQS9XRi09xrHEzMibR7AWZeVqoLg9n1KABZPO1M/C2u/NHfhmFhMo00L9cFxNjX/eUKzXQ6j4ltyktCLBt1pIZBCxfDqz3eQ== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DB8PR01MB5803.eurprd01.prod.exchangelabs.com (2603:10a6:10:10f::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.15; Fri, 24 Jun 2022 09:50:44 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c%10]) with mapi id 15.20.5353.022; Fri, 24 Jun 2022 09:50:38 +0000 Message-ID: Date: Fri, 24 Jun 2022 11:50:36 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [JUYZLpStzRw2FH6PfZqBXAdvt03Z5lCV] X-ClientProxiedBy: ZRAP278CA0002.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::12) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cf184bcc-51a0-41f9-671d-08da55c6fdf5 X-MS-TrafficTypeDiagnostic: DB8PR01MB5803:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QADPwj0EO6rtwWtWs1PsCuuGze1NN4gqFmAfcNCAPL93kw9rxynMM55p85ConOsrmWMEs70tXTsL+QkcGzyzYey3k5AsVI24dlqVArUmfrxuEsZfhAWztPydC1ckTMJSfpqhzWV9ri7vouTQtar7oih8ECvZ6fC5h3oUdk4Vi4P1ADPcwvT3AwjgtjB4+wGC5Z3QxSEfHiv6HqZuU6UwOTlNq9VwZFdiEWn+j5+iK6bL69q1b36xqU3S4iudm/XZzRUfMZEg2SuTeA1q5Rc+Z86z1rXFzsEAFPJNv+tXSUQTOOP995Lz9InxLleDuu+c4G0Vn6CtrdlI+gC4bAo+IJcFLjWLjvg/xEebZ5uChREP2z1xZbI9wTgK1UEIlYMDfvrMPhwUxgx8p2pxsanoLM1mu139jLOIpUh93oJBuaraEcW02vgrs10t5RpHIKrA2v9ao+sEnLNBbOgx5dXm2pPu0S/Wde65r0jiLdCjBiktqsuKP9Eep7IuiG1VCDgimNx++fCR2mE14l/jhvc7FnPzlI9pMUcHMrv8ONvPl+aDDvp2MQP1CgEUJCUItzsNbDGE+KOw0Y5Wha0TV167UqFFwloI4cMPyH6tvhj2/D1hJSTusR2V3QJj4oMYP6T6yIEE8wczDnQtvMHW++Jf0g== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?M3lmdWtERUtYYWNiWGZJUFdEWE5OWUtZcGdmWkRyRzdmMkdwb3VpeFh4YXc2?= =?utf-8?B?VktDbFBEdm1zWXh0ejVSNk52Um1HanhOKzlpQVdQSGhyM05VT0s4VnJ3TDRH?= =?utf-8?B?d3Y5Skk5NmF2MEYvT2M0N1Y0QXl3TjhWQjRnUGxZaENwZlZyQnJrL21wMDk0?= =?utf-8?B?TG9RcGI3aVlIWU00QWozcVBsVW9kUXl4L01Qb25CTE1jOFRHWmZnTjFNZFhr?= =?utf-8?B?Q3pNN0hUTEo4L0t2akViem5Zek5zOVB5NTNGMS81RDZnOFhqOVlOcGlBd0R5?= =?utf-8?B?S3NVZlk0ZE50c044U09aOFlKbFRGdkRBODJCTHNLbXcya281UnFTbzdGa1p3?= =?utf-8?B?VWk4ZEFyTlpMNlo3cTBkOFAxYThsYjZ5SkdBUktRWWFOR3hUd0VqUzh5SzJh?= =?utf-8?B?eEFFanhNNUtvRW9ZaDVvN3FLSGpnc1lJOE54K1FuQXBKQ2loMVNZZDFnNWE4?= =?utf-8?B?eldkdGRQanRPdERJaUdhWDBKS29pQjZFZ0kwV2dJR25pY0JsaGlJUjBsRlYv?= =?utf-8?B?RUloeDdoTTFsRi9SRnU0aGJIbEdvNnZvT2djZmVYVy94dUt5b2pCVko5Z204?= =?utf-8?B?TGZpaFBtc1ZlbTlyNy9jWjByRno0d2tkWWM1NEwrbTBSemYyTW5yZ2JtQUFo?= =?utf-8?B?NU05ZWFPRWtNTTNwM05NZTZ4N0pOSW42cDAwNlBTR3dYZHN1akJBNUJIZjVw?= =?utf-8?B?WDJjRU1xcit3WmdIdTRwS3o0UEpIeWdsRmo0YjcxditFY1dBWjkvb0RDUEU2?= =?utf-8?B?M3dKbnB6RUI0SmpYcjJNdFB0MGVGK09aaVNaWnNSQ0NidzZIUjN6V05UVHY2?= =?utf-8?B?ZStURnh1MHIyYkNlOW9veTZrZzVsU3d6MTFCM1FJcWV4RmhzQVh6bEpPYjRw?= =?utf-8?B?OWp2bHV0Slo3ZnpjekFlUDRzUTc2K1lINUVLMmRwZ2djaGlQeXphd3FzVEUx?= =?utf-8?B?V01ScjE4cTgyNlEwQ0J5VTdxcE9KelVXelVoVGtHWGxHSjhCdzQwNzVCNXR0?= =?utf-8?B?SmE4V1lsZlYzNm9kbFdCTVlORC8va1ZvQzAyZDhNZDI2THphNlVEdlFHNjg1?= =?utf-8?B?N2JHYmpIcjduODc3N282aEx3UWdSRm1EdzdJUmUyYW5sNVBDQTFIazlTZDl0?= =?utf-8?B?V1FlL0luekNZR1NXMkQxUC9VR1pGdkladStFKzhCRnZDdXA4MDZFbHVzK1Nq?= =?utf-8?B?YTd3ZFRVRzJBQmVXWjJLMEtYQWw5NEVmcURoOEk3c2N3VkU2UUNwbitzVEh0?= =?utf-8?B?OWdtRDRuT1pEREtieHRCNXJhQXc3R0ZaSGE2ZE5kUWNpQXAyZWQxSXdIVjJr?= =?utf-8?B?T29jSTlObTBOZ29hbGVzWFJpMEFOWlVKemV3QlgwWGVENWEvVDc3TFk2MGJh?= =?utf-8?B?NWtvMEN4dVpZb1F4UlhVNzlYUHlZVGQ5T0Q2aDN4S1QyN2JoMGRQc2ljd2JQ?= =?utf-8?B?ZXBjQzFSZExyeUp4L0xodU1PRzRwRkZKdkkwNkEvaVg2RTZPU21ZUzFkK0VB?= =?utf-8?B?RjhqbU9UUmpXQnIzVk9pYnRISTFDWnlobGZiZ3NvL1YrOThwaFRmbTVIRC9x?= =?utf-8?B?bTByeCtoOHllRDBDbXM2cisxWHR2eE9qaEFKT2l6bWM4TjFOdmlscStvSTJm?= =?utf-8?B?Z09CaHArVTNPeEVzcDhlNGpUNEhTcGh2ZzY5RXdoQi9hYlM5MVNDSWNoTExt?= =?utf-8?B?dVVYUnJaeTdMRFVYNEU5cjZhalMxS1libUdGNENGTVVPYk5GeWRxNStrbFdC?= =?utf-8?Q?lqLIypiLrD3TqpZ5Hc=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: cf184bcc-51a0-41f9-671d-08da55c6fdf5 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jun 2022 09:50:38.1762 (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: DB8PR01MB5803 Subject: Re: [FFmpeg-devel] [PATCH 1/3] avcodec/hcadec: Don't use GetBit-API for byte-aligned reads 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: > Signed-off-by: Andreas Rheinhardt > --- > libavcodec/hcadec.c | 80 ++++++++++++++++++++++----------------------- > 1 file changed, 39 insertions(+), 41 deletions(-) > > diff --git a/libavcodec/hcadec.c b/libavcodec/hcadec.c > index 4e84942bb9..73ff62139d 100644 > --- a/libavcodec/hcadec.c > +++ b/libavcodec/hcadec.c > @@ -23,6 +23,7 @@ > #include "libavutil/tx.h" > > #include "avcodec.h" > +#include "bytestream.h" > #include "codec_internal.h" > #include "get_bits.h" > #include "internal.h" > @@ -106,7 +107,7 @@ static inline unsigned ceil2(unsigned a, unsigned b) > static av_cold int decode_init(AVCodecContext *avctx) > { > HCAContext *c = avctx->priv_data; > - GetBitContext *gb = &c->gb; > + GetByteContext gb0, *const gb = &gb0; > int8_t r[16] = { 0 }; > float scale = 1.f / 8.f; > unsigned b, chunk; > @@ -118,41 +119,42 @@ static av_cold int decode_init(AVCodecContext *avctx) > if (avctx->ch_layout.nb_channels <= 0 || avctx->ch_layout.nb_channels > 16) > return AVERROR(EINVAL); > > - ret = init_get_bits8(gb, avctx->extradata, avctx->extradata_size); > - if (ret < 0) > - return ret; > - skip_bits_long(gb, 32); > - version = get_bits(gb, 16); > - skip_bits_long(gb, 16); > + if (avctx->extradata_size < 36) > + return AVERROR_INVALIDDATA; > + bytestream2_init(gb, avctx->extradata, avctx->extradata_size); > + > + bytestream2_skipu(gb, 4); > + version = bytestream2_get_be16(gb); > + bytestream2_skipu(gb, 2); > > c->ath_type = version >= 0x200 ? 0 : 1; > > - if (get_bits_long(gb, 32) != MKBETAG('f', 'm', 't', 0)) > + if (bytestream2_get_be32u(gb) != MKBETAG('f', 'm', 't', 0)) > return AVERROR_INVALIDDATA; > - skip_bits_long(gb, 32); > - skip_bits_long(gb, 32); > - skip_bits_long(gb, 32); > + bytestream2_skipu(gb, 4); > + bytestream2_skipu(gb, 4); > + bytestream2_skipu(gb, 4); > > - chunk = get_bits_long(gb, 32); > + chunk = bytestream2_get_be32u(gb); > if (chunk == MKBETAG('c', 'o', 'm', 'p')) { > - skip_bits_long(gb, 16); > - skip_bits_long(gb, 8); > - skip_bits_long(gb, 8); > - c->track_count = get_bits(gb, 8); > - c->channel_config = get_bits(gb, 8); > - c->total_band_count = get_bits(gb, 8); > - c->base_band_count = get_bits(gb, 8); > - c->stereo_band_count = get_bits(gb, 8); > - c->bands_per_hfr_group = get_bits(gb, 8); > + bytestream2_skipu(gb, 2); > + bytestream2_skipu(gb, 1); > + bytestream2_skipu(gb, 1); > + c->track_count = bytestream2_get_byteu(gb); > + c->channel_config = bytestream2_get_byteu(gb); > + c->total_band_count = bytestream2_get_byteu(gb); > + c->base_band_count = bytestream2_get_byteu(gb); > + c->stereo_band_count = bytestream2_get_byte (gb); > + c->bands_per_hfr_group = bytestream2_get_byte (gb); > } else if (chunk == MKBETAG('d', 'e', 'c', 0)) { > - skip_bits_long(gb, 16); > - skip_bits_long(gb, 8); > - skip_bits_long(gb, 8); > - c->total_band_count = get_bits(gb, 8) + 1; > - c->base_band_count = get_bits(gb, 8) + 1; > - c->track_count = get_bits(gb, 4); > - c->channel_config = get_bits(gb, 4); > - if (!get_bits(gb, 8)) > + bytestream2_skipu(gb, 2); > + bytestream2_skipu(gb, 1); > + bytestream2_skipu(gb, 1); > + c->total_band_count = bytestream2_get_byteu(gb) + 1; > + c->base_band_count = bytestream2_get_byteu(gb) + 1; > + c->track_count = bytestream2_peek_byteu(gb) >> 4; > + c->channel_config = bytestream2_get_byteu(gb) & 0xF; > + if (!bytestream2_get_byteu(gb)) > c->base_band_count = c->total_band_count; > c->stereo_band_count = c->total_band_count - c->base_band_count; > c->bands_per_hfr_group = 0; > @@ -163,24 +165,20 @@ static av_cold int decode_init(AVCodecContext *avctx) > return AVERROR_INVALIDDATA; > > > - while (get_bits_left(gb) >= 32) { > - chunk = get_bits_long(gb, 32); > + while (bytestream2_get_bytes_left(gb) >= 4) { > + chunk = bytestream2_get_be32u(gb); > if (chunk == MKBETAG('v', 'b', 'r', 0)) { > - skip_bits_long(gb, 16); > - skip_bits_long(gb, 16); > + bytestream2_skip(gb, 2 + 2); > } else if (chunk == MKBETAG('a', 't', 'h', 0)) { > - c->ath_type = get_bits(gb, 16); > + c->ath_type = bytestream2_get_be16(gb); > } else if (chunk == MKBETAG('r', 'v', 'a', 0)) { > - skip_bits_long(gb, 32); > + bytestream2_skip(gb, 4); > } else if (chunk == MKBETAG('c', 'o', 'm', 'm')) { > - skip_bits_long(gb, get_bits(gb, 8) * 8); > + bytestream2_skip(gb, bytestream2_get_byte(gb) * 8); > } else if (chunk == MKBETAG('c', 'i', 'p', 'h')) { > - skip_bits_long(gb, 16); > + bytestream2_skip(gb, 2); > } else if (chunk == MKBETAG('l', 'o', 'o', 'p')) { > - skip_bits_long(gb, 32); > - skip_bits_long(gb, 32); > - skip_bits_long(gb, 16); > - skip_bits_long(gb, 16); > + bytestream2_skip(gb, 4 + 4 + 2 + 2); > } else if (chunk == MKBETAG('p', 'a', 'd', 0)) { > break; > } else { Will apply this patchset later today 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".