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 8D91B48807 for ; Mon, 18 Dec 2023 11:11:29 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1BBF668D1E6; Mon, 18 Dec 2023 13:11:26 +0200 (EET) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C001368D0B6 for ; Mon, 18 Dec 2023 13:11:19 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1702897885; x=1734433885; h=from:to:subject:date:message-id:references:in-reply-to: content-transfer-encoding:mime-version; bh=vlRkfb+H8hBmUspqe54PaxsTCUPLIdQe1COY8RWztfs=; b=Dnlf0aMWAxSHMFtNWiYs/b17wnFeVS5RBtJw0LNjv7e5OsZKc1o4tlN0 1+vgRVyhI+uA+vyAFHjVEdoO+GBWF8QU2qToupl0QRQ119bmc06dkBsC3 +QxnHECmiTjNGNxxgq/MhJDMdQmyg+3ZN3XLWRsARIG0tyWeSrj5xVk8N oxy1qP3Fu/r4No+78zcPBKGJq0kN9PInxvpq7Cu7Q1R8XFEgMtkVC2dDJ idFO+KcpTfnMu4/DIZYoR0zzXU5Qf7Prbu5kFcU2lRN5JlmP50C12i44Q RrkW/Jq+O4GErU89ZigxSRTrq+/1fTWDXbDv3CFj3vk+HVQXaR8mphMHh g==; X-IronPort-AV: E=McAfee;i="6600,9927,10927"; a="385913924" X-IronPort-AV: E=Sophos;i="6.04,285,1695711600"; d="scan'208";a="385913924" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Dec 2023 03:11:17 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10927"; a="893777860" X-IronPort-AV: E=Sophos;i="6.04,285,1695711600"; d="scan'208";a="893777860" Received: from orsmsx602.amr.corp.intel.com ([10.22.229.15]) by fmsmga002.fm.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 18 Dec 2023 03:11:17 -0800 Received: from orsmsx612.amr.corp.intel.com (10.22.229.25) by ORSMSX602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Mon, 18 Dec 2023 03:11:16 -0800 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) 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 via Frontend Transport; Mon, 18 Dec 2023 03:11:16 -0800 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (104.47.58.169) 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; Mon, 18 Dec 2023 03:11:15 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SuNBo2WImBx67WpV5JvwQs4HBSLQy8vxhuSAX3E7CwcfW7BGEHdgMdCi6LsWElUdok0vJ2xN0Y4J9vv//ysO1eHkw8HolnDmVbv2CG9jYmcaS7P/1VkhRHbYQHYmUIs02yxvuJGM56NpEYnIWp8anjEuorf/kEJ6QftGnYUTnu9e5XO+13G9UEMMEWWESl/QUGYTXf7gA/EG5g/SurlqVfymPaC58vOfLO5jCppv7ZxhnLyvtdIPdTDWfUi3XDJBFxDQY0Lt4Z18KRRswxgNYDBA0gzwcNZig1bIAU+IW1RoOd1z3sSr+tUD/BdcVuhtLxlPs3+XzdmMM0cxcTkspg== 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=8Tpo3JCJaDa0y+nzS7dS5SZWNvXTCxpEDFwOc12XWt4=; b=JNIKBemVEtsFxudxtT2m4BkgDwHXCwF1f3hLBHe/RzDtXyK3eu8YD9BghOHo9AtTN5/XANiBTsZGF34kFvnON5sWH143uWS6gRb9yuRlfwxd+gRef4VJ+5qdIx5+oNeuOHYIgPQ25MFOFyxYSaq+CyfrnyjYRwFG78qotvk8JxpKLp8/eKMs4TmVTPRlugv49KvgawVz+yU8b5hwkTkQbxGn4UudtDOl+mWtZvArkXc+juR/6Q17P+J5aBESixE3RtkqRUbx9HFd+dTpkayKYuGCzsdqQf5qXCYPxyfbK8rbs3Kvk0ehQCsCFqI1xdHZw1V+lLyHtbHewsnzAQ3ZZg== 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 BL1PR11MB5953.namprd11.prod.outlook.com (2603:10b6:208:384::12) 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 11:11:13 +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 11:11:13 +0000 From: "Dai, Jianhui J" To: FFmpeg development discussions and patches Thread-Topic: [PATCH v1] avcodec/cbs_vp8: Apply clang-format and fix typos. Thread-Index: AdoxhcxeNQS2E97AQz2E7BDZK0498wAHNRug Date: Mon, 18 Dec 2023 11:11:12 +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_|BL1PR11MB5953:EE_ x-ms-office365-filtering-correlation-id: 2a71cdcc-f921-4329-b6b3-08dbffba0bea x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: UBXMulkM191eWvMlzvJ+FPcHgpnCPg5arz8iidJCSVLxw+HlhcwnTl4dPXi4AMNncRzeku+55YegObobRM3fajsh7OjUpooTznP13p2VVFSbgARSmP9CfLANu7yKC4p2xIanMRDmMSjSATKiQR9XBLl+Oe/ztX6Heh7gVWlcrtmrCHZ+6ZdP3VFxoXwoAcpQT1MdrHoSSnJ3wEI3uHSJuKwy7FuBTAiEdP9mAchRdLiQOjLxBIYz25yA6g0h2wVYhpErEY4v97ZvBbWLZJzWeTgCekdey3VwHMmhPJz5mUU9Fa3cIIFfQI9XbPvVQdpqWLfOw7uXhoeO4WHAJSjIIFdQwWVpJgluU0td+ezcJjyMxS8GbDvkStpZyCGExNgicWSSsMl8y+po2+iOB4WtfCty8Dk1Hrv7pwNKSDvYipDdyM/KnRoJMN5irprB9FTCbV1qnsVOGyQzD+NuTqepIkXfwHzg1KlN/g/SK62uSkyI+7nZTZsl8Z9cF6uV6q9scedYWy+WuuqL2Wg92905rCXUswTlLuN5q2teLbP9RtmWnKkbw3MLpDSye0lfff+iugCCEsRjIYlJkYLjHkwo9ZqJ0Kk09l7XUN/CEdYa8qg= 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)(39860400002)(346002)(376002)(366004)(396003)(136003)(230922051799003)(451199024)(1800799012)(64100799003)(186009)(2940100002)(71200400001)(19627235002)(53546011)(6506007)(9686003)(7696005)(26005)(83380400001)(5660300002)(478600001)(2906002)(8676002)(8936002)(41300700001)(64756008)(66446008)(52536014)(76116006)(66476007)(66556008)(66946007)(316002)(6916009)(966005)(122000001)(82960400001)(38100700002)(38070700009)(33656002)(86362001)(66899024)(55016003); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?+I/gMk6XclhH04JHi2gMo1dt95fmNXt5ooUUnkTpmjxc3AfCMzXH3JApOOC0?= =?us-ascii?Q?17sp8Mp34Z3NcJJcpa54mn/HuupCLO3bvgcZI6m52wC0VgkrM3IksMGkmn0/?= =?us-ascii?Q?w59leFMPRbv1/OZLxvls5U/t95hs9TJBrsSGAOG9C1GK0iOZ8ZL3pCvgT+x0?= =?us-ascii?Q?zQXf54vw4dpZULs8uwRpVL9+UTeIdoqRHfN1ElXOr6QfRiJdNv1yVy0LqNqW?= =?us-ascii?Q?U36rGnbIuBMeoo5ejmAz6UPlKRIwIyXVj6/ksKL9gUwTR1wJXaaZLdMgA7G3?= =?us-ascii?Q?OaMLF7iq/eI9Es6yTfqI7pEK5rklmQzMGmU0ZOBgUzuD+DwskPLBfpgIul6x?= =?us-ascii?Q?qQWuq03FYJN5zOLe0wwohBUqwSs2jR6kn+hjLgWcsW6LbJYomnlY6UMjMJ1W?= =?us-ascii?Q?4qGyaEqtqV8169dT0pg634FvMidsOVXhuD4yVua0QV6oQ+CWjqpjMECCmTuz?= =?us-ascii?Q?vgmT/kU99uKUFY5MtZ8AMVU2qSksimlhbQU9IYImOfbVm8KWQnF0xYlXgM1u?= =?us-ascii?Q?tsgJyQStL4W4dqLjKXxrgo/dm8mQGdXfhaDEJHnwUI3HidcpIybWGzZ1//78?= =?us-ascii?Q?rBLEiMJxODh/BQhZ48HNREwCpV41ylx+c178OLUvoWFdx/6ToRoVUQAOfHs9?= =?us-ascii?Q?one/dllkLJ1qS+MUT23hWCISFo3aWL7IwM2d5rv6qW+h7eQ1wyQLIOM9VTnD?= =?us-ascii?Q?3aIwGGauywo/t5Zz30xOWCBqMQ1/9Ph4BO5QVcx/mA/eYTTWt7+PrK1Rd9CN?= =?us-ascii?Q?14r8s6tyv36/cX2flC6Wa1cp0LkDL5sml5YOnFSHOL3DHPnbBCBgIer/FTa2?= =?us-ascii?Q?k7TOWbjltnsOZtV4MvFzshXV+Qg0e6Thzo6Gbge2uP6SNPTrctvGgiIpLr6R?= =?us-ascii?Q?//J3UHDyeLfY56AQpNEwXiU3fLwuDOmUcprNohyBIqEUWE/AI3z1f/Dvm1f6?= =?us-ascii?Q?Hb+0/RclSG6xMsE+GoaoPxJQLW89dCxTZ2fKbh6SboiWbFCmip5WQHtytpai?= =?us-ascii?Q?tS9Z1je5h+t1WykQcXViTJDmwdsjj3WWvptV+MM/NzwtMS/QQTj1UC5/hdm0?= =?us-ascii?Q?tk/10L5MKBWCAZISO1qyhSZGMALfvi1YYu37RMhs9iq/uIgOb3mTjLy1+pcN?= =?us-ascii?Q?8qqwOtcJ5iIJL2rKmQVsGzjxyXWktgGzHcr9paQoeZ4QmFinQE1eG4tyliAa?= =?us-ascii?Q?Lz8SO3I3eVvXIUcRY7rdb8WMounlfL//x2aK7i8+n0bxAGlgoaaW7zQehBcU?= =?us-ascii?Q?AeVVZybG7aPJNkJvR37tdjL3mxBNz/v6s06cnqhFd/6pp2BeIBi+mA1WGEdS?= =?us-ascii?Q?aRTYNBiT5FbdWjIjfq5+CJUSz94wwJV586i1sqcvOqdmBUwc5hLdyIuHm1Dp?= =?us-ascii?Q?Rj/BYLex11nfQyopIl7qbzXuP6hA6YIXPX5M7ZostqroQvv8CikTfceArdsP?= =?us-ascii?Q?9vzAa3i1zZCeht93OFzuN4PZqNM9+Rxqt6qrvLdDxJ22Ve4hIJ7UhVGVI3Qu?= =?us-ascii?Q?tiSKQl9BxFmhwi9wbD8+YLV6D55sNcNjF8AQOWuVDjg9p0Y+FuNw4FFVDFEx?= =?us-ascii?Q?kl5shEeD2e1B0kqhSlpAyLBUTNtPH7Y9gh1vVB/B?= 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: 2a71cdcc-f921-4329-b6b3-08dbffba0bea X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Dec 2023 11:11:13.1788 (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: LJhZTZq3ekByechhXIvnUfVsk2ZrYlv8BTqqIMwrj8sN7uu9c1MwfiGz6xAjyKPeASuQk2SQ0dT1jiYj6tLB5w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR11MB5953 X-OriginatorOrg: intel.com Subject: Re: [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: > -----Original Message----- > From: ffmpeg-devel On Behalf Of Dai, > Jianhui J > Sent: Monday, December 18, 2023 3:59 PM > To: ffmpeg-devel@ffmpeg.org > Subject: [FFmpeg-devel] [PATCH v1] avcodec/cbs_vp8: Apply clang-format and > fix typos. > > 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, > Just realize that some of the typos were already fixed on latest source. Will update new patchset on latest source. > -- > 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". _______________________________________________ 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".