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 58037431F3 for ; Tue, 18 Jan 2022 10:35:25 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 13FDF68AFA4; Tue, 18 Jan 2022 12:35:23 +0200 (EET) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074066.outbound.protection.outlook.com [40.92.74.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E28B468AEB7 for ; Tue, 18 Jan 2022 12:35:16 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k0zDVsp+BUtUTuJ7cHQCORDwOH2b02/rQwpQi8r/7n+1IjndUvtrbidvV8QVBnDr6F4kt/QcBfxW2NlUF2XCMxDpo224fP9yPCwtbMI0X1qHqoKxqTqrbSxP8KIMltEjXXY2BK5aIzu7tmNMucLvdPlCq6QzQNY8LTdTMag1ble9Io/hHlt6dgk86iYwvOoYVaJ4O8c1oCq6S/ZL+aqn/ztysXxV37n4QiF0i3vQd/8YGjWttwPi0uA2kcFFV7YbIonEuoOPxcTjUP+Gmn/NEhVKhiYY9EFfgLB3s0/y6FwbVBx6yjX2jDLhv9miuqgM6HgPIULV1bp9+GaUeVRrUA== 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=fnynoR6T0Nhmkb7s7brS1gAp0C4fAgFF3Bez3RVLidc=; b=FA1MZonuoICwLTvfOCfRSTRrDdcGMEA3G1ApFUXod43raLAslOSukbZZubU845rxa9NtlcsHQgs1DdO4nGoW2WJRoDBj+2I886FC+evy9zq+gtJpOl3w9MYiyW8cSJp8xJPLOO4HpIRdewr05gkgIlHlTWLOk9uOjLUKTF6nEoMCjvY9+ITyLxf8Fu5Z5eMX7jzn8HvinPJ5+w0VH3nmhc7N1EG81n4QAYJGZA4gidUBAT6PGlsPcFFh49J8mMUilCy/XOpQbTxdaJXU/hjhT9zvqoc9Sj6H3ZLQDRkANj9ydvl6XS6ABcVcADOmugIQ1N4Uh3MrxwAhQJSjnApMVQ== 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=fnynoR6T0Nhmkb7s7brS1gAp0C4fAgFF3Bez3RVLidc=; b=RvotaLzAtwoiRH6DI8tkDQ9akRxC1+kxUth8KZY90Vdi1n4ZihyxNmqtI4B+IZOL49n18z9mtGuXEFO14/6/PVK9qW3Uu1vfSLoRseYCSkcHRYLT/nH6FBmmMYEDj40/v1Q37IzeJbxBeyz+zydydPQeBzKxbITqbBtXhVWijjjXu+Gk7VacHf7Gl4iE2cpNwjfs9plGZW6JaqZLABo848PS0bYCfMxT/lCx+U9Y8dzpyEF/2JL+ZsIogA3ToLJ2uR8UJvBKIsctbZZcBp2nH7lfsBBEruZyMDXgvdOkvTE6QULMQVWpsdRa9js+08eVH4XN7T1CTEXK2hnYb/e/qg== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by AS8PR03MB7367.eurprd03.prod.outlook.com (2603:10a6:20b:2ed::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.11; Tue, 18 Jan 2022 10:35:15 +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:35:15 +0000 Message-ID: Date: Tue, 18 Jan 2022 11:35:13 +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> <164250151234.23111.15082993172705566767@lain.red.khirnov.net> From: Andreas Rheinhardt In-Reply-To: <164250151234.23111.15082993172705566767@lain.red.khirnov.net> X-TMN: [USqNw8TpcN1fYT1ZFxQHcydcod0/q67b] X-ClientProxiedBy: AS8PR04CA0132.eurprd04.prod.outlook.com (2603:10a6:20b:127::17) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <0c0128a5-3ef5-ba7c-c7c9-38b3cfcc3e66@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d84c4cb8-e9da-42ae-76dc-08d9da6e36e8 X-MS-TrafficTypeDiagnostic: AS8PR03MB7367:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IoTif48De998/yYkGSPKpvkZCYcyfYhnlZ11K5EZplDLRJd7BVe3HhxLvjW1+0BtTfwBaqXNASmgtoCyVwR8SVhNa1F5jEZ/iROraaiGggmF9WXpzzaQ+m/rQtndTSoQUZHi9n8v1f84r3EDwFxW+hCz6052VE/Tf239T/87xJdKJEYuRh1bfW9g8q6jfYkgmRD5hok0HuXQfdq3V5onb0IjdKSmX2bvs1HuvaQlja5MmI2PHcUm6/Vi8AZhymmfS1gWthplt6NC9nAFazBm9ArBvm+I7DKxz8aCrT2T87O0+X6ZctSF0WTszgdAs+sTD3y3/5HC/xAKyphIrpBptFIJFugezjZzhJ3uRVjB2sPXyAfeH83a9tOj3rSpKkKOQZKemweQ+SqUXxlD+sMhxdatX9WVlghczXc3WnsJViVt0oKo8stpqykot+rdfmY0tsbBQZSVhyAaRqGSZMXJN9iiSFxg5w0gpI3WK5WvNGez7F983d6m1M9bi3VI/rl6TzUUGUbJZQPlm0jvj5sZW95OgyL9dX0VVOFiKAqlwhpbhlBalfy5XyotmFt1DgLHUTFoOHc+TgZKdW1f1JUbqA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?bktWK2h6UTNGaUg4NjFMTEdZbmsvYmFHOU01di9lRGlBbXVuZ3g3bWI2bzdP?= =?utf-8?B?THgyOWE3RFlRdHFDSC9QRFpnVWlyRFBGaklXTjZKZ1o1bGtWUXp3eWR3a1hB?= =?utf-8?B?Y1J6eWg0RUJnMnRQcUJSV1RkWnlobHNteGNNK1g4ZzZYMWVmblU2eUcyaHpD?= =?utf-8?B?Rk1zZm1xbXIrbUp3RzZKYUtNZzlldFplR2FScUZhcytGQnY5NnJuY1hhNXpn?= =?utf-8?B?WTFyWGZqUE9XYWtrMFhBNmZucUw1NTlRL3dkUVBUUGt1U3ZOckJrRGYvUTND?= =?utf-8?B?OC8rMUVjNWR0aS8yRVRVN1Bkb01NeHk0MVNNVzA2amxZSThsRVVqbFJlV2cr?= =?utf-8?B?QVI5bXZndnhTdUhvcUhmVXpBWm5SSTZNNXh1WU8yQTN5SURKaUZLWkxaUHVE?= =?utf-8?B?QXk3eVd3ZVlnMGpndnE2M2h2c0RhREx6aEpSaHE2ejBVSUxjbTUxOFA4Y1gx?= =?utf-8?B?NFNkSUEzRlFZdWlrc3RKREdmMnJRYThOYjhXMWV6QWtXQVkvbks0M1FjY05T?= =?utf-8?B?MDQ4TzJUYnJQNlBUanBPS09DR2hUQXRGVGpUOG92NnE0WjVJWjRxV3E3UTRB?= =?utf-8?B?eVRPcml1VWY3aDB4alVNb29BckhFTjhDL2VpNThKSlAxY3RWL1hJbkxORDdF?= =?utf-8?B?eGJNU3djTGkyamk1VEpySE5FNHVHaTJETFk2VU9BUm52ZEZQZ0NzOHdDWTE0?= =?utf-8?B?UHg0UTRURWlwMS9qM1FTYU5yZStteVN3ZkZrdmJFMk9pN2VUQ1M5Tm9xTzlH?= =?utf-8?B?SmdXMXZOLzJpcHdaRFBmUHVNUE9TMEkxd0hsRU53Z0dCOUpQaHZacDJsVFh4?= =?utf-8?B?UmFhbXIwUEVtWDRidnVwYUNwY21kbTR2S21VTzRiYjRDL2gvS3NmWGpvdWJz?= =?utf-8?B?aXgrZ0VqL0ZhSmUrUENvYzdzS2tSVEhObGs0R3RFTFNDZ3J4Z2Y2RlpHWElY?= =?utf-8?B?bzJEbDRtNEpNQmJkUnBVeEdtTmNrOFl1ajk0eS9GM3dHdWZYVHc0dTVzTFhX?= =?utf-8?B?R3ZhQzhlTTYyRFlXdkFNZnNOdDE4UGlDOXBTLy9laXBqYjJPTURzUDJiek03?= =?utf-8?B?L05xb2NtRGtyY2JUalhrWWhlY1RNclc5S1lBdmMwUHo4am5laWlLQWh6NUIw?= =?utf-8?B?ZldFdUY5QjRkTWZ2bTNhamlCZVVpeTc2VnlGVTI0TUxkYVFxZUZpRFpycUNz?= =?utf-8?B?c2hyQjVzdGMvVWJkejNiZHdVNDZjLzFHQStHVU1rVktlTUVLb0hFRENyVk9F?= =?utf-8?B?MXczcjd5aUFaNGwvT1ZXSUp1NERrcVNLcTVlcmgxL2JhcXExZz09?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d84c4cb8-e9da-42ae-76dc-08d9da6e36e8 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:35:15.4597 (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: AS8PR03MB7367 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-18 11:18:24) >> 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. > > Doesn't seem worth the trouble. git show -w is already just two lines. > And if you swapped the patches it would be only two lines for an ordinary git show; not because of git show functionality, but because the patch only touches two lines. - 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".