From patchwork Tue Jan 25 17:41:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33847 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp832820iov; Tue, 25 Jan 2022 09:43:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJx+d3s07j8F6ceyDhYMOKdxEIROgsvRA6TZI1AYSgJQxWEiHjpuzXhxj33tBQpYVAwlAUpS X-Received: by 2002:a17:907:3f92:: with SMTP id hr18mr16911971ejc.508.1643132593026; Tue, 25 Jan 2022 09:43:13 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d30si9229012ejo.144.2022.01.25.09.43.11; Tue, 25 Jan 2022 09:43:13 -0800 (PST) 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=gMsjPeFQ; 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 BB8D568B0E4; Tue, 25 Jan 2022 19:42:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068072.outbound.protection.outlook.com [40.92.68.72]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3EC1E68B082 for ; Tue, 25 Jan 2022 19:42:20 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k4qQfZCN9IBGybEc+rQ6hovE9lTHNZyXDWhWm+J/LX7Gusmr48hwn7v5knifGAaqgy4AMf0xWOYY08WGJT0+V8b7T9sHMHppUn8IswQvoMpgyUzqeTanI0aoxpOwmDpHnUFJ2eevfaUtPFaW2+EdbbpiVNjIpn4rhJQkr5gBI7aJu03DtTvHEL6tca4XgnIuDVaEfI5WEY2imnkpbvdxfbDz5h5sGLcyrA72coExpjGt9HmN1M+ian6qIGm7cRqOwOIcMLUtrfHXrcr5Kq92swOkymuOYyiXHoAp8S3B2AdtP9Ajrq6N3+bAZESt32LyISivB91Tl/Wv3nfsxYslcw== 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=nb7FOCT36MCiwWduwMuSc378m/joLvvXSJOCxrqMp0o=; b=oE/2QLUOUyccKqb6HypRiYmy3Xkw58yEaH9xQmp6AAiehrtcwDpRdky27G5hN/m0gZ6Yb91/Q3QzsbsHnwfvpeSc57lPCNWWfwChUwfcOvk/QjZxfLYeR2/60fPHn5J0eg1xZdn00r/U9COXoSJlTLUrDEg4m2vYOxDRt3Np+VYVCtN1zpSNzrX3Oxj7Gq4vyvCXYinGEx0yMoXUlcBz44AdqxU1bKtlVjYmDwFetiphcZ3lsPu4Q0Dax50qDwUCHAHfQR4KBG+gRfosrWRGkmQXn+ifVzNPvy8em33EzFO/QWmfjZd3rrKPmsovLc3BY4y07kyQ1hOE+ZLYKek9AA== 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=nb7FOCT36MCiwWduwMuSc378m/joLvvXSJOCxrqMp0o=; b=gMsjPeFQUMJjQr+Y60sl5mYexFloOLU3kN+PIWIf73MI2sGiO56SwrHlzZlnfUaMNerszWqClpmJzua8Vp9YJ1uemeLwFNdhXHLsAKhs+GJ/aW5MUhWa7DlKxYy/ye0dYwdxRrVfrpVZfTivBBCBR2Cq0yjkf76cGx5Ew1kIsxwRqNAMwXta1FZr5ofMUc6sCssmF9JwkTIW7gNVwsV+GDIX0tTpuF2l8uc92c5cBk5JYTA9ToNkOyDrTOXhcpbyCR6XeqAzfuyVPH6YzmdzHmN7dTK2ipRsiHF7W32DD22Hdv0Vh+As2QjOqCLgGg0+45PCa3dAubY6eqMo/0/Lvw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by DB7PR03MB3500.eurprd03.prod.outlook.com (2603:10a6:5:8::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.12; Tue, 25 Jan 2022 17:42:11 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%4]) with mapi id 15.20.4930.015; Tue, 25 Jan 2022 17:42:11 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 25 Jan 2022 18:41:35 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220125174148.994967-1-andreas.rheinhardt@outlook.com> References: <20220125174148.994967-1-andreas.rheinhardt@outlook.com> X-TMN: [iNsTFV2pI7ppCJD2CM5WrJ6Xr9SpB/bn] X-ClientProxiedBy: AM6P193CA0061.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:8e::38) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220125174148.994967-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 16267dcb-2125-4349-2184-08d9e02a044d X-MS-TrafficTypeDiagnostic: DB7PR03MB3500:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UEMW7DLVb6arCcTt5KDxggSbU65PSCbZvQxBX0V3S7+7Y8nFPQgPRWNq0CtPtK6YmSbZaQgh9tcOOK6A1N7TtfAEYohGcC3H7mIDDHeZ3x2nwBmyDvWFvBy7NRcvaX0Hs4NB5XKVtDVOmF6RspqJIv7f1BLktz2JrSBZBiueRpMLal+zCIxR+q1SXPloiWr8RlolJF0wXdeqOpk75u7DgFqtTiI0FGg3v65KR0yCBf+5W9yC/GVTExrsHiHg5E3pfeoR5Mj7wADliAX30ultJobEXmCGzYjO/xn9R2iDVShm5SMSXYphKnjUyTVoivrmTrjLkp+gH8G0vIiWygRIF9Xqe/39s3tg23ajVSjIQ/gJG0nN9HAhK//hKeldGLliVsRCjJpFmzv5ndGVb3O64NoeShu/9Q885oskSeCwtTbfW4dnv0f0hA8LBXphqTljBXAS3YvAcp7MXsHqFM8dCZGXUm+me9CrMHFcsHx0hUDHo/GYat0DuOtMyknPwCkCl/4anrcRHBZttBzLo8M/Fz8z+6omMZx5yhqXqVJ+21hor0STQBeniGZ0ooQWfUw4 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: jSWHZP+ThA74r+SP08vpojI1S+RF58+eoaSF4sD1ptkGADYlOUl8ROjM3iM9BqwoMmGqRH6f8gnUgLtwZrjAE75DgnSh3Tmyjn1qElCu6oy5HwGkleXoRZuus8/iDk5jrFFi4JMgQDWPC3eSPoVJXtg2wlJUKJ0YHRAsyOUnI55LLUjrA0TWkop/knHaZ2Jg/huxJolZ4TuDQyfgDbRuYxotUlx6NwJx3JNgJAhehjf/YGOWofJqWsod/1kz7vA7bI2C9aLXt3Qerz/tmR/0HaAn6cCHNx0vG1uqTvPop2u7qhPte27hCAb+W9i7sTKPgZLU8GINghMfQOPxuStw+PXrWbNI/szcs5OhChlEwLyqEQWkdDtWjGuNRH9LB1GRrSktEZadNmZQBprx0bZwwuaKiF6BHJf5q/4CwOY0A4x96cjfZDBDBFfizeQjphnWrbLZvRotRp3zvUizU8U0dpNDKL1M8NnQaikcnc33mT5lulq0sQ3vmw/9JSPL8NoEgRFmAJDoLXQi8/lMVpKqmYsCuiP7cOd0zimRb4YnKc9rd2xI4PHeioZWc1UTrcyXg5iTSavtrtVPo45Fi3sLIWK5+oErQ0WmOnfICZUaTKBkE/PxlLTg0XwMM0GjPG2VmS/PgEz9CPZckOYCe3GcyaTkob6WBpdUevxW/3QnQ0VM11hrSremNPTNNXdYt5uk/zvN6hbIMYzwIe5IyMJMZoXPbvJesLabDB6J9VBLOVNHntpn38dEdLwavqRJvO+1IHJTV9QmmnrYsPVwDRHfF7JBDV8G3cTmQNIExqFdtIsO/W7940S1KLfOFLxBPebRsq3jmYepXb2qVqpbbDxYLM2fS0AX/Ffu0HDw9NHNns4N7cqwdhULboO+sAOxa5pDXQqcHMSr7DLIOf5Wu1WWttgpiW70LSziK1bVh1jPovbLs0qLs2U8T5A/fxn2gDj4KSZdgkLvsdka4VlxoudCfg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 16267dcb-2125-4349-2184-08d9e02a044d X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2022 17:42:11.5985 (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: DB7PR03MB3500 Subject: [FFmpeg-devel] [PATCH 08/21] avcodec/mpeg12enc: Return early if no Sequence Header is written 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: cj8HaqH6VABh Allows to avoid one level of indentation. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg12enc.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index a19100a42d..e30e41027c 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -264,16 +264,18 @@ static void mpeg1_encode_sequence_header(MpegEncContext *s) MPEG12EncContext *const mpeg12 = (MPEG12EncContext*)s; unsigned int vbv_buffer_size, fps, v; int i, constraint_parameter_flag; + AVRational framerate = ff_mpeg12_frame_rate_tab[s->frame_rate_index]; uint64_t time_code; int64_t best_aspect_error = INT64_MAX; AVRational aspect_ratio = s->avctx->sample_aspect_ratio; + int aspect_ratio_info; + + if (!s->current_picture.f->key_frame) + return; if (aspect_ratio.num == 0 || aspect_ratio.den == 0) aspect_ratio = (AVRational){1,1}; // pixel aspect 1.1 (VGA) - if (s->current_picture.f->key_frame) { - AVRational framerate = ff_mpeg12_frame_rate_tab[s->frame_rate_index]; - int aspect_ratio_info; /* MPEG-1 header repeated every GOP */ put_header(s, SEQ_START_CODE); @@ -414,7 +416,6 @@ static void mpeg1_encode_sequence_header(MpegEncContext *s) put_bits(&s->pb, 6, (uint32_t)((time_code % fps))); put_bits(&s->pb, 1, !!(s->avctx->flags & AV_CODEC_FLAG_CLOSED_GOP) || s->intra_only || !s->gop_picture_number); put_bits(&s->pb, 1, 0); // broken link - } } static inline void encode_mb_skip_run(MpegEncContext *s, int run)