From patchwork Wed May 17 21:23:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 41697 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:ba91:b0:105:feb:71f2 with SMTP id fb17csp1202490pzb; Wed, 17 May 2023 06:24:30 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5+1bENmQ2StNPmyzeHk1uEQFzSRHv6sEidUlt6B5GEUP6pRfBqT1/s4EX73Ed4DwWn09zX X-Received: by 2002:aa7:c405:0:b0:50d:1e11:eb9 with SMTP id j5-20020aa7c405000000b0050d1e110eb9mr2353740edq.1.1684329870005; Wed, 17 May 2023 06:24:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684329869; cv=none; d=google.com; s=arc-20160816; b=twlOrBKj2iUxxWLXWVZfptatzJ6bTZQpwhs/L98OLXEAbDVOiPHvQnjLN5O946YwGC etPP9zcVztmZZVOECrq393Cw1Khw+wBrBm8FPxtb7mcK3x+9TjkjYVV4PmQ4Xo+U/sGA fZMxPPg9W1/GcxRQq3jxJfKh/gNeLOkphLny/vyE2Rcbpj/fuxtkChllRDDPPHu7UcM7 ZDkJ+oyl68EFACoMAbqeJaMoGA+xhqXV6/XJFhToyqR/QxN1Aw1spkRJpv9ruCIZ17qF V8bkBDdthckBOfd6vtU96l0E+n8CmavMdAdtA6gZkvOInljlOosQBVUGK5utzGZda0tq MdMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=4ls3UUcaOjYAe4ZIzSThUPGoE+HFejiZaHh4AuifDTU=; b=HOJb9AtBUWF3J3qrD14rZIOn5gpEzRuCDttIs/yFqy5a1doNytC1spQaK6siSyPW+r jfvrlWgR/vB+4pBSue8POmGBe7HTg9L9IgsWfbtg/u786rGFp0oa8zJuaNSTVxYNFRJo SWbXkYMVv9jJZhEa44fp61FBgre2RCh6O5SQqx5AgNsu2JH35mOa66Pp/s2Fq/umGvcc CZdkAg6JEh6Au2b8sHFm1LaKuxeMS8DDiGl7fYC6+JMyoPp9rIlnozFEofcbU1uNytTM igvptJ0tzUemIr1I3D46GzsE7R7g5RxHIX3juu+PT0jDblpFzj1aAT68y1x/YdMnPshp a4yA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=M+F7+5xs; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f22-20020aa7d856000000b0050d83c66852si15047289eds.330.2023.05.17.06.24.29; Wed, 17 May 2023 06:24:29 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=M+F7+5xs; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3BEBD68C0C1; Wed, 17 May 2023 16:23:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-251-53.mail.qq.com (out203-205-251-53.mail.qq.com [203.205.251.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2D10968C081 for ; Wed, 17 May 2023 16:23:48 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1684329821; bh=Xuts4c8yij6gKNPHQzw2GjsbbK04Ui3JPLdYBqf+itE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=M+F7+5xs6sXP482lTb9jzey4W90kxAQSpRUo5VUcB5DSpNwkc4KxJgL+D6Ckep50L Xk2X3aSNfW0NKMkKSYQu6EV/Wh0G6xpQR4HXoZ6HpGWW6fT8XjkpycP9X64errT2mh 4p/bSmBmdAYmnto/tQKyOYvcnHkdZ7geSWxeVUKk= Received: from localhost.localdomain ([119.147.10.197]) by newxmesmtplogicsvrszb6-0.qq.com (NewEsmtp) with SMTP id 5E5A2C20; Wed, 17 May 2023 21:23:37 +0800 X-QQ-mid: xmsmtpt1684329820t4raacx1o Message-ID: X-QQ-XMAILINFO: MyWLjIMK70OKisJaZF0B3emOgnhdtIJ7bZKMcsuUnQKo7ATpTVGA2f8z5ar1GW v+miBIPzMqUL8t3K7jxJUBpCB74DyB4jalfh3/tl5HUI7CIJY6wY4yagnxE1DaWBk/Cfm3ujiUuE joYyhYq3MrFom1og2KolyLP5stfaB3vl9ZQyAKI7mlXJL4yFcjdR5x7ocFzkx7gEsgN+t3so2Scr YAcdhJep4YFZq8PExXbHioCtjCf5ubhpj5n1O0aimD1bH4hCgLuTKywfTGSxFCQ/j0pfW39VZiTW Z7J+rzIGQnrEgz4bfB5svdQ9EiabC71nJNU6TJcHysQYdQ3y/Q2MoHdCqJIVr3vrg0S3sns7xCD4 NT5q1V4vp8cGlMm3IpWiCVihFi0F3E84i3RyBMKmuAXo9kAZKxZPmpZ+NwuUrw3BNf2KO/ky9c+h TS5zaNgOBZq3g48HV2TsCcrG//geV3lclFLqol/7Lb/zXWVO/9RsMgHPV/olHefKvdzv0UpbxSCb phezFOc0pl4pyfqJCvffjmtrhTKwF6C+4IrU9S6lkz5YsKcn8ImjsRQp90ZMPTZXmTPps+oEm9xV n8jdem9ESvgYgBmG5BdF89fwRJYCwnBu2pnVankeRJb6qPLEu5HOYrXZjC8qGb4Yko6Iwao3DZuX n6ihmEMGYJ1bev3x9y43Cbw2QKh9d0Cu5KbMHxLHJCDkxm8VZS5PglSI+ewBilaktRAihaTGPwCk BoJo6Gle6XGEhcYrgQM+MUAchvVZgjhMXfUjAZuQHpadCWIxNgyhll35ZIrU1qaY7+IgDonMijkB TBBp/ocpxyhggnJTHPiCk1J+Qqx7nvlSbtjz1gXbr5fo+F7ZFIEk+DsFF5nTC/jROq2wVLWBrBQw VWwT20H4or8Xsw94FO7kaWfFO0XXd2zmz+Rz0kGSTzc6o+Se78UPDMRSmdWlvaZi8AloBXS4n29l 370Dse2VdyTxyATDj2ukMnWXgwLzIyE49oSTD0v/I0mygHpAykicm8rtaN7EVribTYKBkYUaGTdz EwzycLqem5SJNJHDCr From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Thu, 18 May 2023 05:23:42 +0800 X-OQ-MSGID: <20230517212343.1874354-5-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230517212343.1874354-1-quinkblack@foxmail.com> References: <20230517212343.1874354-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/6] avcodec/filter_units_bsf: reindent after previous commit 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 Cc: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Nw1oYOa036bF From: Zhao Zhili --- libavcodec/filter_units_bsf.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/libavcodec/filter_units_bsf.c b/libavcodec/filter_units_bsf.c index e4c2cadbd5..9336753148 100644 --- a/libavcodec/filter_units_bsf.c +++ b/libavcodec/filter_units_bsf.c @@ -122,15 +122,15 @@ static int filter_units_filter(AVBSFContext *bsf, AVPacket *pkt) ff_cbs_discard_units(ctx->cbc, frag, ctx->discard, ctx->discard_flags); if (ctx->mode != NOOP) { - for (i = frag->nb_units - 1; i >= 0; i--) { - for (j = 0; j < ctx->nb_types; j++) { - if (frag->units[i].type == ctx->type_list[j]) - break; + for (i = frag->nb_units - 1; i >= 0; i--) { + for (j = 0; j < ctx->nb_types; j++) { + if (frag->units[i].type == ctx->type_list[j]) + break; + } + if (ctx->mode == REMOVE ? j < ctx->nb_types + : j >= ctx->nb_types) + ff_cbs_delete_unit(frag, i); } - if (ctx->mode == REMOVE ? j < ctx->nb_types - : j >= ctx->nb_types) - ff_cbs_delete_unit(frag, i); - } } if (frag->nb_units == 0) { @@ -189,9 +189,9 @@ static int filter_units_init(AVBSFContext *bsf) return err; if (ctx->discard == AVDISCARD_NONE) { - // Don't actually decompose anything, we only want the unit data. - ctx->cbc->decompose_unit_types = ctx->type_list; - ctx->cbc->nb_decompose_unit_types = 0; + // Don't actually decompose anything, we only want the unit data. + ctx->cbc->decompose_unit_types = ctx->type_list; + ctx->cbc->nb_decompose_unit_types = 0; } if (bsf->par_in->extradata) {