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 04E7746C2E for ; Thu, 4 Jan 2024 21:31:51 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0BF4268CCB4; Thu, 4 Jan 2024 23:31:50 +0200 (EET) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2065.outbound.protection.outlook.com [40.92.90.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 99ACE68CAD4 for ; Thu, 4 Jan 2024 23:31:43 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Rxm6NmKNdwfeaEyojj++CQ+27sgDCac4XyhruhszM0IYCwh0XEM32CGY7WzHTBzrXS1woeCVzvy6wiy1xFeeE9V3Iagx+pKtuxaBaQjWVIoBjTtoJV8kM76o9ezVpfRnix+3FMKLjRiOOR1PAzsh0f4IomkD4iYNUovoL47dYkmxz3nU+M81xVTzCw+jqYUB7JYP2JKBQdrUnHMHVTAdbTStHxS+e2RoyLe6bIr4zf/4Zy80EXOrxYBORbUSGW8UmJnVB1PRgyJtbK5X3FFkNIOCH0xN4VS9nZeDiO0MPwiTV+aSCnQ55A/0opvkAqpCM8OxUdt2dncF/R3cSd2YqQ== 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=vwDXEJit6IQYUv1ZZb2nr77siVhK9FbJ0ziocFRXSBk=; b=IbenCoMFaawmcDqxULT5PE8ScLOSkvzt0FBssmNU8xZB+5L6EO4NwVH5OBTPX0Syir/hf3/coUftLzUopy31Hh9rt013snWeyzY88TsK4r38JkUT9tsY8/qhvF8X887c2emrZZYEyNFUqdywePnWpb3Mqy4ssGJkGOcUg1PHSaRn/0VoZ6VxFLsCM1xsTPRfUSvKcs5ZoHZZUkhaImXcXbV1Z9J0CRSmXk4dca4CNa7BzzABU6htoWC0vdge0BlIJ3T/Xdc28qyLYCGa6GBG4PP/qtoCeMuTBQWTTRSXhfA4uh67RDZZE4FM7DtNb+Dahv1/e4XuuVE5X5XflAjOrg== 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=vwDXEJit6IQYUv1ZZb2nr77siVhK9FbJ0ziocFRXSBk=; b=pf50BI/sMUMtfOCq/pebXvptzvZmEmQF58FxdPG0HYvbw0P8eI3Z9x5GH9OfyWkiU5VzHQwVAIg2TcENSICZLmR3XNCySsXQrjN0nYeUTNzgHyRblHjw6rQgeksYylagd/27DsIcPquiwExebcD917c6zdIK7UHy0bC7gBV12hFyWLqRh/UjhdjZldiSErBg0+tj5F/7F5+Q6i57sK5bNLropxPf2rRuOp5rjcet5XR6vQM13yyH9kSZXsGJjyl16kHjIOLxtMdkLb4QknPRsLSOHkji4DYbWVbfeX+YMipPuZaWEyZ0zEFasKIABrRO1r/imaRRwJMFI4S25RFlEw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0214.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:325::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7159.16; Thu, 4 Jan 2024 21:31:41 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7159.013; Thu, 4 Jan 2024 21:31:41 +0000 Message-ID: Date: Thu, 4 Jan 2024 22:33:13 +0100 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: X-TMN: [NpC3fEjjk0rlnirIfHE4AuFPiSjm7Vn2clNy0GDkX1E=] X-ClientProxiedBy: ZR0P278CA0062.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:21::13) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0214:EE_ X-MS-Office365-Filtering-Correlation-Id: a9c827ad-2db9-4683-bd50-08dc0d6c8aae X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gtkIhjCr2jzm0vYtX3bWGF6o65iNDqhUoMB1LQ3DEB0VsEm+ZXeC0au5t7JI+aXB6TM0dwD+PUhYwBh1tBdEnNYyvip0CWOPDEILNT0N1mWI960n7QQPpmXO/syUUtO5gzV+11kdLUpNvW9ELqe1TiL5O8DeecpEXp5Qlsm+NInm8XqGPMFSgauf3wMuvGPFIh4XCFBn5k2UYB3MXYurCZFkC3XSdznza5/ILAJsOgF14SJOU24eLKYzgzgn/qe52jQI22KihxkwHp7XotJWfi/cejnl4JidjhePJUcDI0ZtWfABdFE9gQNZxqveNXjd58B9PhTXqZgis/ZljJrsLVkY2tPbYaXmkAug+/dUYe7Zf0tcZN/MdPGGEEiYcnPK0D5ESc7zK5GQfG2jwo0HhPCp8NjfknnnOkYCY6Rerpma5JqdBacPlH8AF+z0op7X54sK+aTNLuy/fLH0L0pvXU9foORvzsUc1XWF1bLQdfF6/dDjbOQfck/GJ5ZFecbxQiCSJN5Nid3hqxaMxvxPKjbJVtrhlfYPH0paLxrtA2Q9iHcBBwOZI4bd8UON2Swn X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?OWEyNVlCTUdIL1N4NjRKSC8vYlZ6ZkQ1RzN1NnlPVEExeEJpenhFM1NXbjFr?= =?utf-8?B?MTlSMnFxeUpsSlJ3NW50RWlPM1VGb2llRTExT0NaRDZqM2JIOE9raHhLSnZC?= =?utf-8?B?WUdqWC84RzFpZGsvWHdqRThlbmlReGJpc09mZ1pEeFl2c0t1UGFTc2NNTVdq?= =?utf-8?B?VjR6c1pSYnlPY01YOWVpaU4zUkduQXlSR3Zmb0M1YnJvZGMxNG02Y2h3UEJ3?= =?utf-8?B?aEsyWS81ZURFQTEwZi82VjZIMkJFSXJGQXgrbUdUMG9sQ01BU1JFUG5MdW1L?= =?utf-8?B?bzM1UXlGb3lNbi9LVTlmWTB2R1I4NVpCOGpWYjdGdVgwa2FDeE1UbEYrKzBt?= =?utf-8?B?ZjhoRngwRWVwN3MzQ1FmdlZiZTQ3TWlCVFVML1lPZ3EwY2ROOVdMNllsVURy?= =?utf-8?B?V2sxcDhNd0FLazJDYkhmNHlvbDJ5NG01TiszTGE4RzZzakdTRlF2ZHFGRE5o?= =?utf-8?B?MGxrKzFaSlMrK0MrMFYya0R1RDVIditxd25wbGVnTHdXRHhkaDhUbDdZU3VJ?= =?utf-8?B?NWE1RWpYalZXMWZITGhGZk9CV2hDMmRxQ3ZuQXNoVWVXaHZzcjdmSm16SlIy?= =?utf-8?B?bTk0OFdCWktKd25vRmkraXYwbTM4bGk5SStHSnM4dkhpRmlBZ001aUhmYmhx?= =?utf-8?B?a2RuTXQ2VFppUWlSVFZaQUlrSWg4OUMrK3dDaWVQU0lEdmE5RjBtNWloM09w?= =?utf-8?B?OG9WUFAzb2lETklKZU1teVFVNmYrWW1QcElHdWkxZE43Q0FMNGxDZzcrRmc2?= =?utf-8?B?cms2aHYwLzdmM0Q5b2xOM2tpWGVYSkpyaTN6NGdRd2NJK0wzeTRkSmhmeURu?= =?utf-8?B?RkNtL1hJTnVYT0VDaGZXaEJoSFk0aWIreng1OTB3MjRkNXV1cWtUc1JhNHBK?= =?utf-8?B?SU5JMXhJa2lOR2VadjBNSG1HdjdvcnJROERndGlSckZ1V3lmZXJQOWZ6eENq?= =?utf-8?B?Qk9UM0hSeitwODNJaEU2dmVBMWlmS2kra2RoNFRNcWpPeTZ4T21aRGIvbHU4?= =?utf-8?B?bWhEekhBNXNmVm0vWjRadUVlQ2hHMTlEVVRXT2l6VS8xOXBUWTRDOURsTUgw?= =?utf-8?B?QXlQMEhMVTJtZ2NNcnE5U25FZ1hraEJyN2hQdVVlcHhPVDlleHFDNW8wN0dX?= =?utf-8?B?eW9BN1BTRDBNVjJQVkozQjRUYkNxWjJkWVZ4TEFMUVZTZ1ZrWmR4ZUl6dVBZ?= =?utf-8?B?TnVwOUlWbGJ2eDRRM0phOGJibjQwbFBOK1F3SmVGaXE0TmJjT2dQeDZVVW56?= =?utf-8?B?a096dE9vMHZNbkZpNWNJMGQ4UnZMd1hJOXFqTHVrU1lnaFFkNGZNWjduZzFY?= =?utf-8?B?K3VXRlRwUTVOZHk4ODdDQkkxZVkzQ3hDK091bFFZK3hlbXljcG9CUUF4d09N?= =?utf-8?B?bUtxdmJhUlFKeFRUdU15STNmTjkrUkFMWFQzUWxTL3FtdDd1NEFxUnI1WWpI?= =?utf-8?B?L1g0eU5tWWZ6R1NLSnVHMkl1MGxCeW82L1ZHMFh0QnJqSGxEQXdPOXJqVUll?= =?utf-8?B?UndPaGpaUHZMVXl5bmtNOUljVExPTHdBZWd6ekhKY3ZYaFh3ejRCbUVpUzhQ?= =?utf-8?B?QUJXMmtzZkhzUHdOc0xLNWxHTEZDQXFxL3ZGNFRyaFNjZzAvRTFWMzR6ejFm?= =?utf-8?B?dllLTnhHZmZEMDd0byt3MDdMS3JMa1hPakhWaExlbzE0RXhLT2hobnVtOGpH?= =?utf-8?Q?XEwu0hPJtcS511NShKmG?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a9c827ad-2db9-4683-bd50-08dc0d6c8aae X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jan 2024 21:31:41.7507 (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: AM8P250MB0214 Subject: Re: [FFmpeg-devel] [PATCH v2] avcodec/cbs_vp8: Apply clang-format and fix typos. 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: Dai, Jianhui J: > This commit applies clang-format to the source and fixes typos. > > TETS: ffmpeg -i fate-suite/vp8-test-vectors-r1/* -vcodec copy -bsf:v > trace_headers -f null - > > Signed-off-by: Jianhui Dai > --- > libavcodec/cbs_vp8.c | 52 ++++++++++++++++++++++++++++++-------------- > 1 file changed, 36 insertions(+), 16 deletions(-) > > diff --git a/libavcodec/cbs_vp8.c b/libavcodec/cbs_vp8.c > index 065156c248..5e6468d1b4 100644 > --- a/libavcodec/cbs_vp8.c > +++ b/libavcodec/cbs_vp8.c > @@ -33,22 +33,22 @@ extern const uint8_t ff_vp8_token_update_probs[4][8][3][11]; > typedef struct CBSVP8BoolDecoder { > GetBitContext *gbc; > > - uint8_t value; > uint8_t range; > > - uint8_t count; // Store the number of bits in the `value` buffer. > - > + uint8_t value; > + // Store the number of bits in the `value` buffer. > + uint8_t count; > } CBSVP8BoolDecoder; > > -static int cbs_vp8_bool_decoder_init(CBSVP8BoolDecoder *decoder, GetBitContext *gbc) > +static int cbs_vp8_bool_decoder_init(CBSVP8BoolDecoder *decoder, > + GetBitContext *gbc) > { > av_assert0(decoder); > av_assert0(gbc); > > decoder->gbc = gbc; > - decoder->value = 0; > decoder->range = 255; > - > + decoder->value = 0; > decoder->count = 0; > > return 0; > @@ -60,7 +60,7 @@ static bool cbs_vp8_bool_decoder_fill_value(CBSVP8BoolDecoder *decoder) > > av_assert0(decoder->count <= 8); > if (decoder->count == 8) { > - return true; > + return true; > } > > if (get_bits_left(decoder->gbc) >= bits) { > @@ -141,7 +141,7 @@ static int cbs_vp8_bool_decoder_read_unsigned( > } > > if (trace_enable) { > - CBS_TRACE_READ_END(); > + CBS_TRACE_READ_END(); > } > > *write_to = value; > @@ -181,9 +181,11 @@ static int cbs_vp8_bool_decoder_read_signed( > return 0; > } > > -static int cbs_vp8_read_unsigned_le(CodedBitstreamContext *ctx, GetBitContext *gbc, > - int width, const char *name, > - const int *subscripts, uint32_t *write_to) > +static int cbs_vp8_read_unsigned_le(CodedBitstreamContext *ctx, > + GetBitContext *gbc, int width, > + const char *name, const int *subscripts, > + uint32_t *write_to, uint32_t range_min, > + uint32_t range_max) > { > int32_t value; > > @@ -200,6 +202,14 @@ static int cbs_vp8_read_unsigned_le(CodedBitstreamContext *ctx, GetBitContext *g > > CBS_TRACE_READ_END(); > > + if (value < range_min || value > range_max) { > + av_log(ctx->log_ctx, AV_LOG_ERROR, > + "%s out of range: " > + "%" PRIu32 ", but must be in [%" PRIu32 ",%" PRIu32 "].\n", > + name, value, range_min, range_max); > + return AVERROR_INVALIDDATA; > + } > + This is something completely different than what the commit message says this patch does. > *write_to = value; > return 0; > } > @@ -246,15 +256,16 @@ static int cbs_vp8_read_unsigned_le(CodedBitstreamContext *ctx, GetBitContext *g > do { \ > uint32_t value; \ > CHECK(cbs_vp8_read_unsigned_le(ctx, rw, width, #name, \ > - SUBSCRIPTS(subs, __VA_ARGS__), &value)); \ > + SUBSCRIPTS(subs, __VA_ARGS__), &value, \ > + 0, MAX_UINT_BITS(width))); \ > current->name = value; \ > } while (0) > > #define fixed(width, name, value) \ > do { \ > uint32_t fixed_value; \ > - CHECK(ff_cbs_read_unsigned(ctx, rw, width, #name, 0, &fixed_value, \ > - value, value)); \ > + CHECK(cbs_vp8_read_unsigned_le(ctx, rw, width, #name, 0, &fixed_value, \ > + value, value)); \ > } while (0) > > #define bc_unsigned_subs(width, prob, enable_trace, name, subs, ...) \ > @@ -277,6 +288,15 @@ static int cbs_vp8_read_unsigned_le(CodedBitstreamContext *ctx, GetBitContext *g > > #include "cbs_vp8_syntax_template.c" > > +#undef READ > +#undef READWRITE > +#undef RWContext > +#undef CBSVP8BoolCodingRW > +#undef xf > +#undef fixed > +#undef bc_unsigned_subs > +#undef bc_signed_subs > + > static int cbs_vp8_split_fragment(CodedBitstreamContext *ctx, > CodedBitstreamFragment *frag, int header) > { > @@ -328,8 +348,7 @@ static int cbs_vp8_read_unit(CodedBitstreamContext *ctx, > return err; > > pos = get_bits_count(&gbc); > - pos /= 8; > - av_assert0(pos <= unit->data_size); > + av_assert0(pos <= unit->data_size * 8); > > frame->data_ref = av_buffer_ref(unit->data_ref); > if (!frame->data_ref) > @@ -363,6 +382,7 @@ static const CodedBitstreamUnitTypeDescriptor cbs_vp8_unit_types[] = { > CBS_UNIT_TYPE_END_OF_LIST, > }; > > +// clang-format off Such comments do not belong in our codebase. > const CodedBitstreamType ff_cbs_type_vp8 = { > .codec_id = AV_CODEC_ID_VP8, > _______________________________________________ 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".