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 951C24A37F for ; Mon, 29 Apr 2024 21:17:57 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ED08B68D539; Tue, 30 Apr 2024 00:16:12 +0300 (EEST) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2093.outbound.protection.outlook.com [40.92.66.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AA74468D57A for ; Tue, 30 Apr 2024 00:16:09 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ngnQqC9Yb08nRECPLGCR7ZtArC89jxdi1T+UhOU7mq/PJpNQ81n8f6HFDYD0+cBF6vR7+39zAjv/Pyw5SKZBaQr9tj0USzNW32aiAwIqtzaegc3uMBU6MzQycvrgVL4XOVDsLemYGldaV3u1yEEeLEPqVxbTBAPpjsvwsPTodyJBWGKXdunuAEZkjKM8YHF1yt/BT0JSEjVGTuEEBQVCSVQ7PqbbALPFq9YAU+N8tn+qa9yhBr/TXiub6BNntq0JU9lTtXldLEttaHIM07HLBeFhxiP76tpvoJyeLWXNYkZJGe195PpIOryNCHACqvcW+jI8neE1w5p6BC2PDzw8pA== 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=ac/nuvUXaG4aQnZ6x+uJ3yF/+QFuQwi8HY5NVOstoJw=; b=BZo9sx2ud/BQDNaEqEhxHQYSokySNK11i0JHW5QUUZZ/s5LxrRjtMdoPng2skiqcJVcLXHGzJOGQDnMA/YrS2NgLfHdX2vFBs8QVCnF1pQy6X1+NuN0y7VnW+9auxsEqY7uNbiDbvK+/GbfIg3x69D6ujZIOlNmH0kGnZdvvNBgrwZFi5znORZJKA3J9GBZMmyZuj5LJwQ1jsd3HytqApYqjM39DEYSN7abD92HKJaV9Z+GUnsJw5gQnwPbA1Sj+8PP3mhe33rwa7z+rtlGnR83wIGCp3v5eu2V5WLxdoz1f7LcOniQCDkpPtzDXPUsNP2STX5YZSDIDf6RV/mAH2w== 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=ac/nuvUXaG4aQnZ6x+uJ3yF/+QFuQwi8HY5NVOstoJw=; b=d3/PJgI+QrlwYNRPeeH238W1LxVBA1MhwfD529Y3zHB2Dn7io+sh+LTlt3/mvJEQoOHb4Maa3QIEbhY9dC3jBPEIZLvripB47vNU+AtoVrARTemhwE7elmyayKlIjCwiDyGXfHf5yQ8xa0JZtLtWZiJtD1Nl8C0itop9gV64wTkKiVt8WnRUKEaxVVZRsx617zTLGBwMpx4Tybho/BEd140/4vaXQURxzJKJgTA8XuFj/Z/ynrvEfS6zrzEqexRU7HEeuEfdB4/dPLv+Y2UCgkQ8CSDz3FMyzQXBFGXjXz+afG3Z0Tvl6M/gF3flXnMombCmm1rbrEKLvg8CWQUXQg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by GVXP250MB1057.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:1b5::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7519.34; Mon, 29 Apr 2024 21:16:04 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::1f29:8206:b8c3:45bb]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::1f29:8206:b8c3:45bb%3]) with mapi id 15.20.7519.031; Mon, 29 Apr 2024 21:16:04 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 29 Apr 2024 23:14:14 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [6kjaDBFhI6qm1wDeMB6IJLXLk4+foqawVhehZ82e7+A=] X-ClientProxiedBy: ZR0P278CA0199.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:6a::21) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240429211438.3274834-19-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|GVXP250MB1057:EE_ X-MS-Office365-Filtering-Correlation-Id: 4cf512cb-d911-4ac3-47dc-08dc689193fd X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: RlasYR45KGyBaEkfbs/gBMR/OjJVeWdptRE6TPw3GTKtkCEnBTa3+QjFcYf2RGbgDqc9Rp7iH7oAUdhrTt1BUADAlhNC+3fQBr219m8zXRRb8KxXlZgSPpDnh5hbugtF/lHJxwv1GbU4QHGG8Go+p0qNr1W+kObkjmUppGE/yUcMU5B9JIAtPEyF2ivGjnz/3gXqPvAiUAnTE0abVUZLemJukSC7dP8y4FkKknKyJg1Mzf2RGMvxl+my3MriV1jnikIxn/612M/cmyv8JlqPTBzxwQ2ujBsS9QvFb5FfkXOXxooAJJzd2Ab3+U13AHKsdeGpofrDHslPYeTQXiBDE6ZdDG0LXwGjFrCC+1xlulkxDY4sdtb8UOKRZBrOtGmQSjheQLHcXSYA4Z8mRFIfXwUbyfj4xCJfYreb1xSrkdUeOSbqAlyoF2HvSfB7GyaWcRMQOEZjqnXQuvptDpKKdEDmRiUXsy0oOU3V+xKQb7JyUoE4bEQmokV9TUwa80x8ASSpA1Io21QbyGogH4Ydk3YGR+X5A/UL5VrFttXMfONnwb+5hnHsDRzxFG07JM2wZipBZ6A10ggVtHvzCDH7KTQqfgnUvSrdj6fooMJU9hUcTQu62+UaIc4WVHXurmqb X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?M/vy7RSkW2C3KkcECsj+3ADd1LmWOj4+7MJFZytMkXgjP+4w8yF/LdUCfiXm?= =?us-ascii?Q?hIDcIrmIg4swxmCUdBIrRKzpT6Ja6/9pJccwOt8RSvna2/dE9Md9Atfi1LO1?= =?us-ascii?Q?MMzSIftWNHfhSqniLOAJxPeP0dqon1lSQqBp8txMAMIpvZqxpssbFKAKWvVp?= =?us-ascii?Q?aoHl4jLCsudeZOG4xqms6N7x4foatz/aDa8mPga7bMSpORKpuSk8xM4kkyQ5?= =?us-ascii?Q?PMKPW7UXDgEm5aZ2hIH7QpKBoQ6POG/VbXprVe+BC5Xl/j/Qz/vJZSiSbgMN?= =?us-ascii?Q?htjEtaOaYE9rsqO7xA68A9F+gEmbSpVFPYaM6IsVvwl3raiFyrK8xsnc4D8W?= =?us-ascii?Q?CLJPgIUebyNPC8YoPs4vz2mxrZxFq08OOqJJ+umQHyTOYTOoJbGuSz+r5Yc0?= =?us-ascii?Q?ihW+fwCa/MokRIgjoP60+DR4qE06xqrHCGNk0vBAIpkA3OVMBKl4PqCLTJWn?= =?us-ascii?Q?V6IczeF2Xi82WMadkGeg2hUC/cNDbIMLEbyGFYZHWNtQHkHH2UJkYK/fPemW?= =?us-ascii?Q?Ybh0O8z0WHm8spGuEPU4HSQq7oFYpZlpkg4o8PeGr0uRPjS7z9XODMnWBewG?= =?us-ascii?Q?NfJTkMYVZ8MQNgeTmdeefdCU5dlq44TjLJ/cbK99awTVFC8dwFH7lUIEaqJy?= =?us-ascii?Q?zyy5WFsEwqJ5vY8mkzzvRv8fRJvtS1LJM5vlZMkm8Id/0SB4ZTZ03Z9rftj7?= =?us-ascii?Q?gCv/gKt4Yrp/4Rl7amTVQxmCprn2ZrprToU59CB4Zm8HhfdJ6csvBOaE3uKc?= =?us-ascii?Q?tsIeA1eg32oyVkoMnRAOwjMkg37UNjV6ogS8cQQev2w3UGNfR9nWixNUZfc7?= =?us-ascii?Q?Dbg+4LulgTF/PP+m21mVfkmiRcOh8nVWS4oQDicvZucOhqSh+NCsnfB39ZJI?= =?us-ascii?Q?0b0CjY5rFHsERDlgLhVz9uGVVFVEERasAavN6RIbJIKHA8Ke9gN5EGkPX+Nx?= =?us-ascii?Q?/HCSdspvgigCsGfkd71wtFJouVdIkyWXgs4HK1rb0b8KzhXlYUzLMO0ewQ5S?= =?us-ascii?Q?1cOb7OSIHzIRgC2B4zlXcXybmQnx9b2Gh1yj75nIKsqFJFgj2Za0oLWJEHn2?= =?us-ascii?Q?oMJ7d2BiAOJekIs8SOMhkGcMiFg3YIE/LwmRSjZOrXck+1pjrfgh5NgVFq6w?= =?us-ascii?Q?CelAj3lPhkkz2sdt+XLDaL1ZopiuxIzc51g676ZGwpwVAe4Hz4z3MGDXlvXe?= =?us-ascii?Q?jLXkNMX1vXhGiqF6yrQak3pjf/X/dUvrPpSW+AqXfBcgjHNELFpwIsvUnM/K?= =?us-ascii?Q?69s2YOKYpo/58s1S6BP9f701Jrcop1Y7afbh1nP66w=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4cf512cb-d911-4ac3-47dc-08dc689193fd X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2024 21:16:04.3661 (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: GVXP250MB1057 Subject: [FFmpeg-devel] [PATCH 33/57] avcodec/mpegvideo_enc: Factor setting length of B frame chain out 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: Andreas Rheinhardt 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: It already avoids a goto and will be useful in the future to be able to specify each functions tasks and obligations. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 066dca9ac5..c0b7769ccd 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1472,13 +1472,15 @@ fail: return best_b_count; } -static int select_input_picture(MpegEncContext *s) +/** + * Determines whether an input picture is discarded or not + * and if not determines the length of the next chain of B frames + * and puts these pictures (including the P frame) into + * reordered_input_picture. + */ +static int set_bframe_chain_length(MpegEncContext *s) { - int i, ret; - - for (int i = 1; i <= MAX_B_FRAMES; i++) - s->reordered_input_picture[i - 1] = s->reordered_input_picture[i]; - s->reordered_input_picture[MAX_B_FRAMES] = NULL; + int i; /* set next picture type & ordering */ if (!s->reordered_input_picture[0] && s->input_picture[0]) { @@ -1491,7 +1493,7 @@ static int select_input_picture(MpegEncContext *s) ff_vbv_update(s, 0); - goto no_output_pic; + return 0; } } @@ -1598,7 +1600,22 @@ static int select_input_picture(MpegEncContext *s) } } } -no_output_pic: + + return 0; +} + +static int select_input_picture(MpegEncContext *s) +{ + int ret; + + for (int i = 1; i <= MAX_B_FRAMES; i++) + s->reordered_input_picture[i - 1] = s->reordered_input_picture[i]; + s->reordered_input_picture[MAX_B_FRAMES] = NULL; + + ret = set_bframe_chain_length(s); + if (ret < 0) + return ret; + av_frame_unref(s->new_pic); if (s->reordered_input_picture[0]) { -- 2.40.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".