From patchwork Mon Apr 29 21:14:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 48391 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1509:b0:1a9:af23:56c1 with SMTP id nq9csp2271819pzb; Mon, 29 Apr 2024 14:18:08 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXFOk7XLk93Jrjs23Vk4tf0tJvRRsKPm6IntqyFwlHhBbTi3WqFWC7qj6xE3L/RVXBJy/Xk5tZfL0FyBqCD8FjpG+fzgBkzg5QAaQ== X-Google-Smtp-Source: AGHT+IESpzwYNDu4ilSxGBK9zFuxtAuw+f4g8PASzumI60n8auUSQDHgyt4g6mBsT4TlQ1KjzozZ X-Received: by 2002:a05:6402:1c96:b0:572:51d0:3bb0 with SMTP id cy22-20020a0564021c9600b0057251d03bb0mr5547133edb.3.1714425488577; Mon, 29 Apr 2024 14:18:08 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z11-20020a50eb4b000000b00571bb7594d9si14376309edp.404.2024.04.29.14.18.08; Mon, 29 Apr 2024 14:18:08 -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=@outlook.com header.s=selector1 header.b=jxLkmnjm; arc=fail (body hash mismatch); 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 84CD268D594; Tue, 30 Apr 2024 00:16:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 C657768D56D 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=lt00MoN6T1Ojy+9OMRPX2q5Af9VsdBQHSW0Xk9lvIZ5dOyJ12ZyU+ziA1CJk7pt+0Or7tm41tzUbFVZ6bgxcKH7i40/A0ibRk7Mv1Mr08LZPuy1nl4OWt5ahU7d7axTGkFzTynAaidDFP+R/DfvDzSqkUqqh11Konw9sUoem/OKRl/CGJzGg5uOLLemFzRuwTMc9bFDbrWCtiMhipgUx0knBi5TW3jvpPjs1xVcKaXXiPoEn6v2f1xEiQLCGPl14LahMp642+p5croNR+InR9gFroeQpb1qWuUN6sWU/POBGWGCmyiFbI/c+z+amxljM5lOu5FyK28gLhWI31p6xLw== 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=hz5YMLVZzPLPC0aa1UGZ/g7vIzjYq8LS5WOOAuQDS0k=; b=eIuj3P68jHm0IGPd78IKrQGx33FejpPw05Wbx7z3FbdvMBBV0QvKEdBNn2t3CK0gJv6z5WJofcXhsrzHS/1YwxxpNVb0YHKp/1lfv+LCVpiOLLFaRHqm5TQ0y/pXo37hBf9ettCzt2O4lL1dfNixQnXvj2co3jUT7rcIZwCx8lTCfIDrrfB4DSa61O9RTEkg1PI5xFjZg+HlAbUbCnRI8t7JWNOe9efmkN0xg+mr+NE5Fsxuvui7Z8Qnb8xatdvWOXhXmpLBhHbSAZMpDP+3V5RZxV9REP+f8z76gxU5mKOlyZYxOJvgz9mKXmexJ4D+fpFBLnoi7pAlY8Gl09Lt0w== 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=hz5YMLVZzPLPC0aa1UGZ/g7vIzjYq8LS5WOOAuQDS0k=; b=jxLkmnjmLOJpjOWRUHIexBDnNOZDnROMLFdXVrzC5No1L410Bn4nabpsU/CFYIFy2g+3krAFokYDafRGAiAuwuG1+7Ne/9/+Uwud3LsDQHN7C8u1IO7Iz50Hc499O0ouZAdxfvH61RdvTFikdwjR4ZSCN+H8GE74rXiQeNBy3qglj+FvUmmqkXD8twIKzRq4giAJruwCIt2QUa+1fcyykCmXueC3DjyePft5n8jHFHHT7hun0bqyyH4gcMujpLPjVQfWu0s7Dy7fEtLlKlmENP9bp0zb11fxfuOb6y6NB83McMa7ImTHQxMpS9q/G71hQecSgIMuNbeoAYG6MnrEow== 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:05 +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:05 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 29 Apr 2024 23:14:15 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [UFDKpaF4BMcVqsri4GUOvuUce7mDZU2Oj/jzO7HoYho=] 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-20-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: 02891a9c-15af-4006-2500-08dc689194c0 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: ECnGqymnf7yGLRNPBf1cL7sBf9Ie+NFMPNv6h6ijTFWgyJWZO1hol+oHKvwxgsgqL20jTzIACXy7IfEGgHQt1M7ubZmFwNxcjJX6kEI7PttjcX/IzTMEFGldbVCotiT+DruGwJz5Mu0JxxmKGAW+fvpgEIsCYMxASXE+JVq2KyS+ToIhPq3079tNetV2BobaU6e4G7tzVDTiRqgXXZb1XuyN208KfRG/Xzp31Bl3FbsF7RI43SxhHh3wvwiRY1VDIEPY/RvPmqU2sy56LLwHEO4cqYoG3vadV+aWGaKvZe2rSteIpIgtH9D2L/3xunCpDaeNG3kj+0FUmB06uyrvLtO9A1gcvTZjsZU4Kol3dRPU8VLm0x7ETZAmZEMnj2yjPFUNMVuap2Z7XxntdYCNvfV16Enu5dFaqLk+vSe/o3BBAL7aSe4EdKh6aB/wvs7+H+hhMYhubeHgVctQlqcNr3dqvIgE22EAFJz55Smo8qAt7L4Qx6yVm2SYcrTWRjbDdV5tM3tIm5RqthVRXJBqpFHrVQXHInYe4yOQyi+EehqptEKUVLYGrTQNBlX5Jao7bEXs6jWwGm6DojDOsU76joCvIpiU4j7fQ3jNbSOPdkb9KBH9zNTzLcdoZf7xFX2P X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +6yzKEy+dQK806HicL/RVbMHcNyYBaJOa7DfV5uRYQsUYJSJdEf4iv8CgTVEW+r+zcWVS8nM3OM4rBLviu1Ah3E/Kn1AATnpsBDVcZZJFAVo4dBzT9zXbWj8ut8Ui/H/hV6nUZ/Fmfk75YE+jRvxNUH8+JLcjZsD6rsTaKSBMvFTamBiaOnbsELPITu38JnBN2fqPo/mtSWQUMfslCp6oZ6G5JdVoVjHfzfIowFAMqtGgpXsj4cNN5PZTSl0bmGyZWxyAWzPexJ51iudOKQoJfs0bEqR60UzeI5sFy/+pzIYHZSQ1O8rEpF7J+W3oHy6J9v7Nzgh5TYhKyWLq/sFndq8/jImd282ylLADjX+7La6T1VIWuZRpoh0HiUEwBnMWeSwwWIlIFfY23u9rfzSU86NGJIpv2KIRED57hfrcGEOMTvVlD1tjojWUCUGOjGniQsLosnJYuTBpI65PkIS2FEUrERaGPmW7kFA13TatGNsOGSSn68qrYtrpSxiHEn7rtlUfccU/9mYwV25MYF0/ByDa/u9zTrWS1FeTQ1/UXPSEsZklmBr+PZJeEKILNusJwdw0dgI3uFuX4mmSMn5djwhDiIqJpkJqBEZBEoXgE47btgdsapcVWEhuVM9qqm+KF1MgJIWDFC5JswzVfCXn0v6+KAXtdZMBIXccah7gRzO9y3VfRy0w9az5uxRX5wE6CkuldmrFw+A5pIm46hKKm4Hts9rL+iJR0h686IllSaMdAjkQGh0A3GIvho31Qz7hl93bkv+z+8pHJMvqjpxpe3WEixveOpVszoU5p+CHxa0yIopgY0mHgFoyQKIceZAgxMUZdNWkDqRn52SacIWhf6kRhixZxODXajzn+i0oy3A0rFUJn95YfbOmK/cTe0fRlD5KDyeMC+xjTGWafqJ9se/eD3rsHc23bGo7/t/CwHIZszW09Ps3SV+wmbVnKXBdASq26bJqnKs66/Wp8bpkOnIj0cpLIwHH4aQ6fEFBA8eXcvQoM0HmSIxdVVc8jHCy8PeSvYDG2tl8NW8l57+lS4TQkg2MKPO6IHB23Q5mkqhbf+r0om7e0gW9ShPHASlt3QY2NKn6VfVglKPrG/VYA2BmQaWvzd6FEY7PTj0Q6zsNswQpMw/yFIy0E8j/5SKRkz+lQ7N5Cm5zAHpGmSTbxYzXhnaUOgKw33oNnwxlszzYdz1T53GlRBxOMuYvk725OJ0CvPyKBPKk1p30UoSh6MBUVxDaqF0mI0iS1h2YRQSdJQNpLjbc2uqZlWosQyQKV9uS0S/+0eAt58v5KencA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 02891a9c-15af-4006-2500-08dc689194c0 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:05.6820 (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 34/57] avcodec/mpegvideo_enc: Return early when getting length of B frame chain 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: tYvH4oxkYhiB Possible now that this is a function of its own. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index c0b7769ccd..5b0a2edfa6 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1482,8 +1482,11 @@ static int set_bframe_chain_length(MpegEncContext *s) { int i; + /* Either nothing to do or can't do anything */ + if (s->reordered_input_picture[0] || !s->input_picture[0]) + return 0; + /* set next picture type & ordering */ - if (!s->reordered_input_picture[0] && s->input_picture[0]) { if (s->frame_skip_threshold || s->frame_skip_factor) { if (s->picture_in_gop_number < s->gop_size && s->next_pic.ptr && @@ -1599,7 +1602,6 @@ static int set_bframe_chain_length(MpegEncContext *s) s->coded_picture_number++; } } - } return 0; }