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 6B49943047 for ; Thu, 13 Jan 2022 10:55:10 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7038168B7E2; Thu, 13 Jan 2022 12:55:08 +0200 (EET) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2039.outbound.protection.outlook.com [40.92.91.39]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E41F968012B for ; Thu, 13 Jan 2022 12:55:01 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=h8grRl4g1JjyMD41FM6sO8vDEoH2KSXaz4bbM0yWiKgVrojL1SOSYgGSsd7v6Fp5klI5d6WPdx8mhE1TrGcppFFBYFF2jzytxeKT+WGPYkLX8MS7P+ugI6tcgxfhbzZLjuliBwkIUfLH/Aksvc0KY9HkBv2LignlwyKrssjpzgu0gHdR7IHSSoQZAZkc1Wnt6R7W/jaA017qTxweqXxFeBvl9ZkO2L98sP8u68pP8C0Q/pIprmES+52L+O/uu//DHnfg3e6P/hzN0oNnXmDHD/7jhzj+Lg2JQZq7mO0D+I1pBE6b/7zRCtIxJkI7YAhV/RTquJVnnVFPeEiEXecNCg== 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=s9OMoLKSJ49Mr38znZ0rR401cI4CLLt7M2woY26FkWM=; b=GELH1HThb65f4kRdZxA0FhH+EmDGFveQD99ousSS0n0/t3BfZDoHcy0TYcidAuSaKDZ2xuktlodp64u+TBw/r2EI34czXlXXjRddOS+BfIl6AViowSU2qhDe+lbya/VTqIiFRnG4mEYm+WJg8yE5iAzzVHzxI7zjwnG5wMU56BA1sJTno1J3DRdkxJBkQzVlTmH/UK7ZLKHN0D6gGE45NnRmM/nG9WhbDTV3iyJsCPp3RcltYEwYopaxcx355uTnMG4FmK78yH2ueMQe80a/CfqAVwWEnyDPhGLdAC4L7VbbR+AdaL6kgkujmHA2ZoVQe3+hb9/AVP2LAmNfEf+bcQ== 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=s9OMoLKSJ49Mr38znZ0rR401cI4CLLt7M2woY26FkWM=; b=ucxdH1driRodvwegj4qyizwmj7RVZQWi/yn3sByHmGlFClVQE3GRDxVu+D6HTWb53cqcg6SLnSlSp5l7x0SATJABmPMTj08ratm4C3pbvd1DNF4aKFjeWvpIpqCr68BmaTtX3ijCwYskt8sAcalxXlaWMBLFXu8z+5YEr/0QRMjTdr2P3kI0dVMRqJljA8lrCZBfo37XPBaXb+L4r5Co2NF9O/i2XDtnqQMdEJoCX+OqyRHlxwc5BMZX/mnwLHkqb+jIWYyU6oQ24A7905OooNAboHPGJaMLnrVZ5rgW4pFxm+xyDAgqYpfsM1tt1ptNJc3jf+6wmZUiJFekkvC9QQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by DBBPR03MB7033.eurprd03.prod.outlook.com (2603:10a6:10:204::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.10; Thu, 13 Jan 2022 10:55:00 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4888.010; Thu, 13 Jan 2022 10:55:00 +0000 Message-ID: Date: Thu, 13 Jan 2022 11:54:59 +0100 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20220111095830.31542-1-anton@khirnov.net> <20220111095830.31542-24-anton@khirnov.net> From: Andreas Rheinhardt In-Reply-To: <20220111095830.31542-24-anton@khirnov.net> X-TMN: [E1yJw0Rhdd6dhG97AtdSQPXvek6ckwdx] X-ClientProxiedBy: AM0PR06CA0105.eurprd06.prod.outlook.com (2603:10a6:208:fa::46) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <80134d30-49ce-f224-73f2-1e0e69766be0@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4709aa0a-b788-4596-d4a2-08d9d6832543 X-MS-TrafficTypeDiagnostic: DBBPR03MB7033:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3nT7YUxSNkmDhC+OJt+fxKAQXAHpF+vpG8B89ghXIXIsJ2LFn7PMJgVQV7F2cZnMsIZbF9CnDSuudhiM3RW1leYDao7dpOXBIwzlUBl6NU3sGL3NTyWJiNg0NCASGe4qYQvzFZKhRvdL+o1J+at8X9TaRkXSTh7mzQR5ueaL5Hz5NYQGrgRckxw6yM+Yb3BqCU4aLiPc8A7H/DpIGiTKv79unb4MPghLfUfXZd0//RvoyjMVO9hSlC2sJEDyhr8L2v+ir3MPummQaQw8AKeKAhxfGMUYm+ml4BAKo8Hux3yWWsSWPZWOEJd44/faTRQulvErz/Tml6O344PdWiDpW3WJf0NgskDTVQnXQQymL9KzkV9fUCS8gQJSsIWW53CRGbEBy/F1XY/RVMC/g5z+kFShUcE7gDZorI/ytn2B1RxdxO5OL+IuXB4dCgo/StcLyonfhCJGCvStXap+8xrXFzkk3lSsCjwtu2HbNBJxIAxNxq286xZgGSpFq8MTP+1BWH/sEqrJjyId04kM4jBN8+lVS7rVvcH2NTUYjoEa5A2P4NCXitcWKcmf1GDyW0hqeXoEpTKODKjDwuy9qW0Iew== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?L2VFdlQxdVk4TFlBcGNSdG52R2xybTBMZlczRGZXWjJDNC9jY2RMWVFPL3BX?= =?utf-8?B?WnlKU0JTOXpqOHZUdzhHRmxDMm9HaE95M1BRWUNhb3ZPeEZkWng0TkZlbXp2?= =?utf-8?B?dlduVlpXUEFUOEIrd0JQUGw3UlBSRDFtTkJVQUwzVkxEaXdkd0ZJT2V2OXU2?= =?utf-8?B?ajZmdmxvc1phTTYrc2RjemlvTmgxYVgxUnJnUnliZ01hOHdvUW0vdU4yc05o?= =?utf-8?B?VHFsRCtZa3VoT3hDV1YzOUg5L0xRV2VQa1lOV2ppTmpqQXlWL1kvTGJ5UXdk?= =?utf-8?B?ek9HUU8xY0lDM1AvZFR5M2JLSUYvTXRORkJLc1E4NHpGd1hjdE5HTWZsdnFy?= =?utf-8?B?VmpZaHB4TCtrTGhMWDI4RzJLRHp1QnFJVWVuSGErVitHMXNUVExPSFBTUVp6?= =?utf-8?B?bEM0NmluRytuWXZPZ093dDB6TFlPaFdnckxaSVdwOXZ5N1NpaTl5V01uTkIy?= =?utf-8?B?U3J5RVJ3cEpjZS9zMGcwSkk2b1Q5TUdlYWpaVGE1aDV4OHkxVDRKU1VzR2k5?= =?utf-8?B?VjllK1A0Ny9pVFErZlhNOHVyZjFDUkJIQml0eDh2MEN5VWk0em9lS2VMVDNs?= =?utf-8?B?ak4zeG9US09OVnl0M2FBcVJvOWtYUE85Y1hBU05UZ3g5TUh0THRWOEtHVUpQ?= =?utf-8?B?R1NBTEFxWW44NGhMMWRKQzBwejJ3S21RMFB4YzNMcDUwYithb1VpTnhpYnli?= =?utf-8?B?VmNmM3NRcHZ2eTNTUjA1ZkJVUzhMeEYwdTA2bmFySDN1WHdsRkI5enc4QTA3?= =?utf-8?B?RE81THQ4OUt6T3FQN3ZZQnhwWXV6VFRpQnZmdVY1TjFmR21YelU3UnVuaEhk?= =?utf-8?B?LzVHYmNGRitJRHNSSThXL3Z5eDZGT2UrRlk4RW85RVJGdnpUdVpreHd3akEy?= =?utf-8?B?SlcvSkUyZlV5UDZYaXNDelF2MnlCdVh0K0FwcXhSUnduSFYxN2dSdElXVVYw?= =?utf-8?B?dERwN2JVUUZmdTROQWVUUkxKUVJEcHpNNC9sRm1Cd2t6c2lJeU05aDU1eERq?= =?utf-8?B?amtCS3lORGx2aUpWSHNOWXhvaXcyY3orRWNMa2xibzI1SXNMZnlvU0hoQ0Mz?= =?utf-8?B?UDVUN1ZIMUpVV1B6dVI3UzNLOC9BTS9tbUVvRlpsTXRrUGl0RGhzaHQ3ZEJZ?= =?utf-8?B?NUdFWStUSGxsaWlRUTNyK1JzQzljZ1Z6TVN0WEdJdHZxdldQcEVkdkhoN1pX?= =?utf-8?B?MkwwcW1JaDhrd1I1MDEwdGpYQ2VRaDFnU01ZZFZwYUVkcEsvOWpCN0U3c1Zp?= =?utf-8?B?czZDdmQzWUxUNjdnUWFvVGdTS3hEQXdwSlpsVHRURlpmNHl1dz09?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4709aa0a-b788-4596-d4a2-08d9d6832543 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jan 2022 10:55:00.5772 (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: DBBPR03MB7033 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: > 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. - 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".