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 96510431E5 for ; Tue, 18 Jan 2022 10:18:34 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CC74F68B0D7; Tue, 18 Jan 2022 12:18:32 +0200 (EET) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073056.outbound.protection.outlook.com [40.92.73.56]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D650F68B0BE for ; Tue, 18 Jan 2022 12:18:26 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nV5rxBJqI8DAUEgJblGSwi/LDtcKlneRWzgUUlcZ0HAcio1Kmu6U+Hjljamc2gEHYUrnpUyqHnOrNLC9MBp/+UAk2XikNB1j1+tEARz8FKKXBXNVDTSnWhANblVOXGjREgkX9Mlw0a91X8BJk325fuqw9BW9+nuUk5ZugpVmMXjhTjih7m9zN4I1VH/CaTOC+rU6oVbagfV2rkIEaDkTieyL2OzCvSGVctWKu0FNLmziggGrxNwAqXJCysRihxVGmkIsf1Y9knFrGvdPjg9IxOGJ9MggXzz9s7PU22n0HNn5enpHQabO2tZDW3iN972PMEqo2R1Ep4E0bB6p9IuIKg== 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=2JKv12xU2yCtvoorYDXBnLdxoA8Ip1F3nzmmx6zPcHk=; b=Qs5kZU+t3W/AQs0itVmoZOmPq6ZIoLkrDK7Y1HAytC90GDIymAnThRX66cY85rILqoIYpkDMxU+/JYB83ecuYjCCfF+VGMHh0Iec5KnIiA2+Ar6+PktYpbwwg/Us9FvJ06NZ3eP9DLLMHce3lk46nVxjgGxXT6ZkWYmhZEykEPZ94xB1H0IqkcJcjRHg+SYT6D6gBk2VyOgdwUiHomuebxznsq6SmYggbMDk5g2Gp+qQ5Er5Okg69EJB4FzbG6T3BVFP4Yhpm6J2mTqKvtAZRh3dPRe8tXj/vNOMtOMspWhwjyqPBFHJalmtqmkWb5twBAPe7BsF1KiXmluWL6DIfg== 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=2JKv12xU2yCtvoorYDXBnLdxoA8Ip1F3nzmmx6zPcHk=; b=NBl88Esg40nd9/1BZa0WWuiARCU6DzTv8gamL8DKfrxzKOIEI1Mddr5WCxZxiLZMIWEhRH8jVOxv8KXoz+JAzoWf4Q04rgysbnfLTdpj/vmdLKGhL5Me+HfoFza88skgOWUq1L6SNvjiULGlZBEUevaVS5dEHs6F9uIdmmeWp3E0cf3UdWGKj7tHyXTwuQD360x3fR/M+htHLFh+6DfHCTusWN3lgIg+mBlQTIQrnI7OWqGmpNqJIKpIHqghY/qT3AqNMDpTLWayR7JKWhQt6ose8mQeIqvNw6/xgbo+nFvxcNUKyL7XmwleNpK3UeXFtqprK4L0n3YOtW986exkDw== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by AM0PR03MB4499.eurprd03.prod.outlook.com (2603:10a6:208:c4::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.10; Tue, 18 Jan 2022 10:18:25 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::bd94:8238:bf7f:ca2]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::bd94:8238:bf7f:ca2%5]) with mapi id 15.20.4888.014; Tue, 18 Jan 2022 10:18:25 +0000 Message-ID: Date: Tue, 18 Jan 2022 11:18:24 +0100 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20220111095830.31542-1-anton@khirnov.net> <20220111095830.31542-24-anton@khirnov.net> <164250101626.23111.15871136514402468182@lain.red.khirnov.net> From: Andreas Rheinhardt In-Reply-To: <164250101626.23111.15871136514402468182@lain.red.khirnov.net> X-TMN: [3gkei/dBY94gON2zcCIORIPmbwXV1ZXs] X-ClientProxiedBy: AS9PR06CA0142.eurprd06.prod.outlook.com (2603:10a6:20b:467::35) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 466c4ef4-bf8d-4e39-c393-08d9da6bdcdc X-MS-TrafficTypeDiagnostic: AM0PR03MB4499:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Z53LEtPanLnzJM92JGuZpSFwEhPdT3Jhlw8vzuum6eFnl0kK+q2AB4tTGhfOImHDKBpelNgRgBEgylLFgTC92LUgmmphSqaRlPdwuKqKCcz+0e2rRb4lvTC1C4QXN5rkNGVRW7gh/GNsRFdvHw2F3lMg5irV7GIFIkUhyq1sKiBnjQdBF0v+fks615QsrbK1BsPwwLm6MRny9iRjR5qc6ks+Fe8XW2vsmt0KDX+bw12P8m9KjAaNf1SSg4PtlRCYdk8AkTj+vA6lqS1iBJx52bGLiva3dmbsyIvvgNE2Cob4FWE8lsX76Pup+jmwyE2xN9K1tJGb+TY5uxAjithKBkNrC5ZMkla4XD6wbiUS2ywuDhRe1Z/+SWrVwSbIZUQFcH43wn/hbq5SKe1YK4ITse1Q+LOks/B/36iW3KiIvMTB3F/GPx57QYRaEkHDZrDf5geky8zioqJLjbSRt4e8appNurZD+2964F5SN8rxC0RnQxvnNe80wJuP+acs/wPWx9WEzGcbjD1pwxWxv3A1wbvTrDCwg2taOSW5LhdaWGwMbRnCt+iGGZn9o+eOBLV6LfthimMZ8Ik69JJfeqvKcA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?RloxMTlTaWxPMFlRb0tSbXJFTnBBYmNNeUlXNEtsWFpsWTAxeGlYeU11YUF0?= =?utf-8?B?ak1DNGVEQ1BEVEtMdy9KZ0pYajdjNTErRUl1MERidE50c2pROG9VWlMrdzhK?= =?utf-8?B?aCtHVkhDd3hJWFF4dmNFS1lQSUFkT3BuNk9pWklJK2JmZnNYTDRWN2RBSlBi?= =?utf-8?B?VzlSaE1BbHk3K3lZNUkvZnlaVTlFMnMxajliSVMzTXlwWGZNaVg0TEZzcFZi?= =?utf-8?B?YUd2Y3dhV2JiWEtqZitZeUppeFdzU2VHbVFPTmFsTjNaTzhvTWRVZE45alh0?= =?utf-8?B?eVlSV1F3RFV5WEJQd3hvRnVhV09DWjNwUmd4WVhUeXZEUVEvNk42ZFFLeXda?= =?utf-8?B?TTgvalRDeEREVHF0dlE5Wm83VzFHaXRZMjZXVGk1eGFTcTFDRWVYOG9NaXdt?= =?utf-8?B?S2p0UDg3RkdmTzZpdCtjaHhGclFzOVJ4MVlKQU5YUm0zNzRnRFFiODgxU21v?= =?utf-8?B?b1dpNDQ5RG5pY1V3YmVKMXZnNzBmZkoxaFExdzhyU3h6RFdFNGhhc01vM3oz?= =?utf-8?B?YVBvN2N6c0JKQ1pYckRMSEZuaXZVc2pTZmhTcDlSaldST2R1ZlJZYUZhSEt3?= =?utf-8?B?anQvMDAwZXVkVkJIOExTeUx4a2tEaXNESlZDQzh5bDJvTjkwMHBtN2FTcDhE?= =?utf-8?B?VTA0SWdmQk9qak9nanY3akR4NDg1VTRGWXNkelhBcUJDMVVlZzBBWnAyc2Vx?= =?utf-8?B?bnFMSmxuK2c4cnNkaGt6QXVTRjdjZnplVWtEU3Fybm9OajlrZHZHUFVpaFNn?= =?utf-8?B?ODArcFZrckpaMHVobEllTEJORGZnNWIxd290ZnR6WE93SkpWUlM1UHRWdXlD?= =?utf-8?B?dmZIVGlJQ1Npa0U4V0dKUnF2akxNZmRpaGU2UTRnUnlpUm1BU3Evb0l4SEwr?= =?utf-8?B?Z3c1QWY1R3hqUDQ3bnJ3ZUZxR09sUkxjMGRYMGh3bkdlbEczMXIrcE9UcW0x?= =?utf-8?B?SlRXZW1URTVsa3grbEhEaEpUYWFpelJsNS9ZZy9GSzFPT2RjVmhPcXFlWXNN?= =?utf-8?B?SEdyUGxqUlErNnYwY0w1c1dqeFk4ZEwxSVozV0ZCbTNkQUs2VVdEN2RlbnIy?= =?utf-8?B?MlplQnRJSnB1WkZWbGE0ZzM0eERQdHhBK0ZlemFGK0ZMcFV5R1lvdyszNHlh?= =?utf-8?B?NlV2bGlMdVhnWVMxaXNiZ1NEY0hPV0w4MzZQT05PdEF4K1k1RFYyVlJlVURN?= =?utf-8?B?RVZ5MHdON3pTbytoNFE3dVM2dzNsY2JJR1ozOEU1WlVvMUJzUzhjYzBuNXFu?= =?utf-8?B?c0t5UGhiY0NqNnRoelBKREtlaXYxSTdER1dIWnhqV01rYkVDQT09?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 466c4ef4-bf8d-4e39-c393-08d9da6bdcdc X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2022 10:18:25.4259 (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: AM0PR03MB4499 Subject: Re: [FFmpeg-devel] [PATCH 24/28] ffmpeg_mux: drop a useless check and reduce indentation 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: Anton Khirnov: > Quoting Andreas Rheinhardt (2022-01-13 11:54:59) >> Anton Khirnov: >>> do_video_stats() is only ever called for video. >>> --- >>> fftools/ffmpeg_mux.c | 42 ++++++++++++++++++++---------------------- >>> 1 file changed, 20 insertions(+), 22 deletions(-) >>> >>> diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c >>> index 76d9d4b9c4..8a64661c9c 100644 >>> --- a/fftools/ffmpeg_mux.c >>> +++ b/fftools/ffmpeg_mux.c >>> @@ -72,31 +72,29 @@ static void do_video_stats(OutputStream *ost, int frame_size) >>> } >>> >>> enc = ost->enc_ctx; >>> - if (enc->codec_type == AVMEDIA_TYPE_VIDEO) { >>> - frame_number = ost->st->nb_frames; >>> - if (vstats_version <= 1) { >>> - fprintf(vstats_file, "frame= %5d q= %2.1f ", frame_number, >>> - ost->quality / (float)FF_QP2LAMBDA); >>> - } else { >>> - fprintf(vstats_file, "out= %2d st= %2d frame= %5d q= %2.1f ", ost->file_index, ost->index, frame_number, >>> - ost->quality / (float)FF_QP2LAMBDA); >>> - } >>> + frame_number = ost->st->nb_frames; >>> + if (vstats_version <= 1) { >>> + fprintf(vstats_file, "frame= %5d q= %2.1f ", frame_number, >>> + ost->quality / (float)FF_QP2LAMBDA); >>> + } else { >>> + fprintf(vstats_file, "out= %2d st= %2d frame= %5d q= %2.1f ", ost->file_index, ost->index, frame_number, >>> + ost->quality / (float)FF_QP2LAMBDA); >>> + } >>> >>> - if (ost->error[0]>=0 && (enc->flags & AV_CODEC_FLAG_PSNR)) >>> - fprintf(vstats_file, "PSNR= %6.2f ", psnr(ost->error[0] / (enc->width * enc->height * 255.0 * 255.0))); >>> + if (ost->error[0]>=0 && (enc->flags & AV_CODEC_FLAG_PSNR)) >>> + fprintf(vstats_file, "PSNR= %6.2f ", psnr(ost->error[0] / (enc->width * enc->height * 255.0 * 255.0))); >>> >>> - fprintf(vstats_file,"f_size= %6d ", frame_size); >>> - /* compute pts value */ >>> - ti1 = av_stream_get_end_pts(ost->st) * av_q2d(ost->st->time_base); >>> - if (ti1 < 0.01) >>> - ti1 = 0.01; >>> + fprintf(vstats_file,"f_size= %6d ", frame_size); >>> + /* compute pts value */ >>> + ti1 = av_stream_get_end_pts(ost->st) * av_q2d(ost->st->time_base); >>> + if (ti1 < 0.01) >>> + ti1 = 0.01; >>> >>> - bitrate = (frame_size * 8) / av_q2d(enc->time_base) / 1000.0; >>> - avg_bitrate = (double)(ost->data_size * 8) / ti1 / 1000.0; >>> - fprintf(vstats_file, "s_size= %8.0fkB time= %0.3f br= %7.1fkbits/s avg_br= %7.1fkbits/s ", >>> - (double)ost->data_size / 1024, ti1, bitrate, avg_bitrate); >>> - fprintf(vstats_file, "type= %c\n", av_get_picture_type_char(ost->pict_type)); >>> - } >>> + bitrate = (frame_size * 8) / av_q2d(enc->time_base) / 1000.0; >>> + avg_bitrate = (double)(ost->data_size * 8) / ti1 / 1000.0; >>> + fprintf(vstats_file, "s_size= %8.0fkB time= %0.3f br= %7.1fkbits/s avg_br= %7.1fkbits/s ", >>> + (double)ost->data_size / 1024, ti1, bitrate, avg_bitrate); >>> + fprintf(vstats_file, "type= %c\n", av_get_picture_type_char(ost->pict_type)); >>> } >>> >>> static void close_all_output_streams(OutputStream *ost, OSTFinished this_stream, OSTFinished others) >>> >> >> LGTM to removing the check, but it would be better if you removed the >> check before moving the code to ffmpeg_mux.c and then fixed the >> indentation while moving the code to ffmpeg_mux.c. > > Better why? What's the point of essentially re-doing these commits and > dealing with rebase conflicts, just to get the same result in the end? > A smaller diff. - 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".