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 78F15487E1 for ; Mon, 18 Dec 2023 07:59:32 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 03A5568D1AA; Mon, 18 Dec 2023 09:59:29 +0200 (EET) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.9]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2323D68D036 for ; Mon, 18 Dec 2023 09:59:21 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1702886367; x=1734422367; h=from:to:subject:date:message-id: content-transfer-encoding:mime-version; bh=lnsm4XU9M1T84WmcYP1uFxUN/xbsuqK3zFB5W95JflM=; b=J4RaoQHhSDhZ4K941o3F4NZhFx4Klrf8e8/1y+reoO52LCSSD4PWNysj 4CBdqTgyjK76/VebFDCUv5hDswhT50PyHrYVdaK/+z62X4NICEsBWOymJ xGZS9OBzrlnIMYr50+ji3wrWODw0MTpKXYMc2HvbxnSqh18Pc++ixDaBC cLZ+BVUi9Z0VDNZ1xQ4jFRgHCwBARAVE6RikToiR2Ow9C4qhlV7E6aSc2 OUHGBQWcjImqQupHdgLbw/7pija94wa5fKgmYtM9TkxOBa6cjJQ79qH2t kF7OYpRitsCiqYQ3fxxRuK6GfhzY+SitAp6IRYJI4MlqKB2ZBAztbMXBd w==; X-IronPort-AV: E=McAfee;i="6600,9927,10927"; a="2321926" X-IronPort-AV: E=Sophos;i="6.04,284,1695711600"; d="scan'208";a="2321926" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmvoesa103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Dec 2023 23:59:20 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10927"; a="919170921" X-IronPort-AV: E=Sophos;i="6.04,284,1695711600"; d="scan'208";a="919170921" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by fmsmga001.fm.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 17 Dec 2023 23:59:19 -0800 Received: from orsmsx612.amr.corp.intel.com (10.22.229.25) by ORSMSX603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Sun, 17 Dec 2023 23:59:19 -0800 Received: from orsmsx603.amr.corp.intel.com (10.22.229.16) by ORSMSX612.amr.corp.intel.com (10.22.229.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Sun, 17 Dec 2023 23:59:18 -0800 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35 via Frontend Transport; Sun, 17 Dec 2023 23:59:18 -0800 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.100) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Sun, 17 Dec 2023 23:59:18 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mHSWfdP515+geJTHY8mz4rtUZ42yfNIwYdfHgA7kj5YndVb9G12ypW9Nw2YA7eyfz1DoTiuP/PS8CtBdk8Ctgl7HGa9TvLU9kkKB1KEgKiRKp6B0/UPLmkAyzWN4ek1UvoHn7TioWnwY8SnSu1Hq4A0XTtRiMdpXQnr3trnTyYSoc+mIfIRfNXGN3G+t7tCwIAYQA3Q5E/x2Jf+32F89WEAWT52cNgxlI5KDRafU2hdhATOMWeBUAkaOUedeCgFDUs+jqjS7d9DaYU7bcdurLdudB1uiP04dF/vTgE/K0qUCfUoYkESx1ShCkBlb5PPg9rBc/V/aOUnTf8aibkkZ9A== 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=uIOrKmXCnbfp+qDFgR1jqVF4MY+59Xww6CPLWmquPrE=; b=e+uPW/4azRu+80quT/P+6UOpDT8mPoH5/gxUofkSAtzLIIxGYWh1g3vnzwjnO5UpCfjmbZlJpH++Tm9IEi6LWtSXbQDUbKLNr5j4VpH2O1ZoZJxKCkTX3RFNGhoRwuVV04w2CBdYgws4BeR54B3IAQsVC3XyMcAQuYp6Dv6y2qZGjkJB/JjCoOPMihMo+Pfvo0Wska3fSPAOt2+6/bEsEAmiFBiePGUGydIYrcEGJTH2CBqqTjr9I55Zgs7ScIK1+0SjvMqO5xEYDqkpjGT5g2b9Lu2fEC6Hmyp+jqRoPx5jghGq4dPx/DZ+9EBN0Of3QqzkZsd0vsSsKT0N7hmaqw== 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 CH0PR11MB5282.namprd11.prod.outlook.com (2603:10b6:610:bd::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.37; Mon, 18 Dec 2023 07:59:17 +0000 Received: from DM6PR11MB2681.namprd11.prod.outlook.com ([fe80::4bd2:f337:5920:3d8]) by DM6PR11MB2681.namprd11.prod.outlook.com ([fe80::4bd2:f337:5920:3d8%5]) with mapi id 15.20.7091.034; Mon, 18 Dec 2023 07:59:17 +0000 From: "Dai, Jianhui J" To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v1] avcodec/cbs_vp8: Apply clang-format and fix typos. Thread-Index: AdoxhcxeNQS2E97AQz2E7BDZK0498w== Date: Mon, 18 Dec 2023 07:59:16 +0000 Message-ID: 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-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-ms-traffictypediagnostic: DM6PR11MB2681:EE_|CH0PR11MB5282:EE_ x-ms-office365-filtering-correlation-id: 412a3fb8-e170-4abc-4a88-08dbff9f3b93 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: lhw5XIkU7LLuFIY8DcjZbELiG29tkEWUDBd3ruKcyQbZ0SydotU/oDYPWY27q6vEKGLvTHS0S/dlsWQl1ZrrSPwZYm4Yp5dgVKNVzpKYhaPdIWz/oHjf+8UZ81l4NHW+zMRyQ708YevCDX/di0bjPcxRTV10qQDrcWJ/LocUOF/su2uzT4089WgrDau0kjui3ScSobq3gZEG5Ng/dWYorZ8DLiAFPvV5RwF1yOr3F5ghwivwX+sM0XbOPf81enwFTync9fUNOIS14NneLQRBkLxLeHnvvc1ZLvh1aM4QhU8Cu7CAtMP0rTTYgLtzCsuxiCoEdtQQfDOGiwPeP6oWKUmqIija4+zXdy795yO4d1ki0s43R7jl5okxN/ijUh8gSLi56C9gzqFXFhxJyfmNL1QcNzgb4iePfzcFORXClYMVlz3WY/zRTzadT/ta8ZlOVShCyHbt7rpqd+iYdqelnw6x9e8dO/WvVV4o42m/FFNopmI1t3v127j8nNjuKQ2PWrNANDlIFc00fuB0LKBEBOtNL/BEMjfrqHtS8Je7MKcRbaYQaOWqA7cKgm2YPVd2wa4vDsKOJO4iAerdUr5yw37aT5R3VDW0dmyGHHe+MkVdB/tZKHdCsVWRBriEdG0f 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)(136003)(39860400002)(376002)(396003)(366004)(346002)(230922051799003)(64100799003)(186009)(451199024)(1800799012)(55016003)(26005)(71200400001)(82960400001)(122000001)(33656002)(86362001)(38100700002)(38070700009)(83380400001)(52536014)(5660300002)(9686003)(6506007)(7696005)(8936002)(8676002)(66946007)(66556008)(76116006)(6916009)(316002)(66446008)(64756008)(66476007)(2906002)(41300700001)(19627235002)(478600001); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?U/uPwoE2kCzgiBcl8iXoms8nE416+VhaLNiPdWkv0qfRFRFdECzNeeSzGHyO?= =?us-ascii?Q?RZ0onN8Sr8U4/l9savdLp0YQV7qUVqx2Py1Ctp9elEtEid03CZlJ+g+1mLaI?= =?us-ascii?Q?zxX1gC26uqzmNxTKchRpTsacPTJ9l++BYDhs9oKJGRllvRO1J3cowJ90B6TC?= =?us-ascii?Q?DXc+mRvFLZpLPTzumZOKfPL1TCCvq2kMD883h8dWphKdfTeh/Wr/citfa7vD?= =?us-ascii?Q?FozMgG1jd0GmN9eRvvoCEPUMpHNnn7W4/GvlcV84IvM2MbYOmWUoL4wB71Ii?= =?us-ascii?Q?fRtfwD093wdxlZ6sV8oWoHgfhx0/c2SNrknnpuKZoALavNGZ0OZUHokd8BLd?= =?us-ascii?Q?IbFSRCw4JoBsRWnLiupdNP/XQwSdt05XjOz0JLa9MgCgQGOeiUY74mUqCijy?= =?us-ascii?Q?eQNgYFEYNnT9rPR/2xfzIITivUlVcjEEBjkSmmAjcRXVfKaLvkYaWTn5xi6q?= =?us-ascii?Q?/ibOnznGYrYWMrDUnJZpVebYQz8mH/lrpJFXuc+j5CATEuXTR3tF86g/AOlB?= =?us-ascii?Q?JturMKsT/7JeMsydvskWsCHiNNOAfHbOpQAx4gt/vSg2NMmEIa3RTPiAMN0g?= =?us-ascii?Q?bU4ZnblFpkQg+zg4J8AAjjyie2yhVt1LYW/WsybG9wrcdi9Y0cTN53dt7Vt9?= =?us-ascii?Q?0QoZUSQZlSRBuGMSqOPJsxXUuEC8SWfAPalDxiiaDLJsoe4Xm/BWDf074TvN?= =?us-ascii?Q?mzscxqg23Ka7GlMwqhf8Xi0k6iIArpnOhZjtqnE0HBm1VfdD49TLjRr0aqvs?= =?us-ascii?Q?9EzFN79ukPpN2ae+WMRu83+0hqqhARCFEnC/VmWqNsHstRL4iazlWV2WhB68?= =?us-ascii?Q?yEsrO/EVRo071sMqFUzta9wrqIYzzP4wPKPSDfiVbvaMg7+xVQGRJCxY/li7?= =?us-ascii?Q?mCmhS2vr1Fm/rR0ac6stAHReheD1OPTVdQWj3PJeG4kSETR9VMJe9tiewtAV?= =?us-ascii?Q?+zTala6RsqKo/izATJjld18SVMzbrBFhY5UWdpANlCyRWHMyKAb6yUG8zdgO?= =?us-ascii?Q?pzd5ED8HW/vJpMU0YztbDIArkVoQ9RskPQ94GsKCJPFnE15i3YVW6Q2Asbd4?= =?us-ascii?Q?E9IHny0JMXDMv6+JG1Lq8zd0yyLOyH3u0mOiChW+uYeMdM6jS7MfatV6WnrV?= =?us-ascii?Q?9+GX4KWxw8vo2v5g4EKhrzPi4EVLdNrNdP+0AzEFshWiF4/zxFACkOeYmyJi?= =?us-ascii?Q?g3mbjpXLMKGahCkVdQukpkcELBU1HekhD3icjBD8zhFaOW9mYt2PP7Qg3P9e?= =?us-ascii?Q?E2+WcmdtRVJTGfq3L5yOB7NzNLZCkl7TYvKLeZSZ8tzYJ/qGshv3tIbpm0zI?= =?us-ascii?Q?huYvNwQ4kHeYRP5uZOmEcTRoYRd2+MDg/h7ZLzQJnc850vTxG34ZOXQjmsKn?= =?us-ascii?Q?/hv+xawLuum2/+QSWZq3iw1t2ORhPkqHlL6LsOZ8Ls00WDkVb8MjpO5rja4n?= =?us-ascii?Q?hFcpXA7D5bBmBVjnlNgQQFu+6XudTI3SBKsc6vXYCcQjcTcCqsp1YZzvfgLH?= =?us-ascii?Q?dRVJYXvX3OCDlIv17hPW1PByLrUc50nN25WncgtHfCaBmAbwemTPwHPWF3zv?= =?us-ascii?Q?wcVxsb+vvQQhEatBX2mmQ78EH9JK2hcKn6aVLQAs?= 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: 412a3fb8-e170-4abc-4a88-08dbff9f3b93 X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Dec 2023 07:59:16.6832 (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: /KTFVm3OemRSVadfaMeBP4Nb/Og19gUvpHx6k0Nc3XFDI3YVcpEgDz+SLXpMoO6pz+2hTBGAJGOeMk0jAPHvZQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR11MB5282 X-OriginatorOrg: intel.com Subject: [FFmpeg-devel] [PATCH v1] 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: 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 | 54 ++++++++++++++++++++++++++++++-------------- 1 file changed, 37 insertions(+), 17 deletions(-) diff --git a/libavcodec/cbs_vp8.c b/libavcodec/cbs_vp8.c index 01d4b9cefe..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; + } + *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) { @@ -307,7 +327,7 @@ static int cbs_vp8_read_unit(CodedBitstreamContext *ctx, frame = unit->content; // Create GetBitContext for uncompressed header. - err = init_get_bits8_le(&gbc, unit->data, 8 * unit->data_size); + err = init_get_bits8_le(&gbc, unit->data, unit->data_size); if (err < 0) return err; @@ -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 const CodedBitstreamType ff_cbs_type_vp8 = { .codec_id = AV_CODEC_ID_VP8, -- 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".