From patchwork Tue Jan 25 17:41:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33860 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp834618iov; Tue, 25 Jan 2022 09:45:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJysxCOf6VtwmrvY4IMUfcD3A4dsoq4YjPD1pE1TJWzPyCNKJuJAksiLu8bnc63EnfytsX5h X-Received: by 2002:aa7:c412:: with SMTP id j18mr12313130edq.393.1643132735244; Tue, 25 Jan 2022 09:45:35 -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 c10si9986287edj.97.2022.01.25.09.45.34; Tue, 25 Jan 2022 09:45:35 -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=dlxuGXfD; 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 C1EC368B1AF; Tue, 25 Jan 2022 19:42:40 +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-oln040092068014.outbound.protection.outlook.com [40.92.68.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 05E6E68B0F0 for ; Tue, 25 Jan 2022 19:42:35 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hEnEFWmV8y8rw8gzIyXBJMJAeUfDmOiE6Tpl8j7PcCxsoGD8X5MJ2q9VUZegsQdgK5efkt1wYmAzsHCl0PzgTHmqonAa4upeF9xwm0e0Py9Of6Lsu22s5huC1C1Nm1NWDOFkXb7kmg2ZUcUzCJp1wbdJdlcgYKU3PeDe5yQPPDiTdqVYU9A6W+u99gA4xZPb1VOEA6Ur/8cM2dJcb9Fd2WZ2tmvY/GzhjSFx/3Hpad6hyaUT0Y3ZZLt2Ydh5fOVu6AdX1g/HAVHmDswjlDk7rriZ0YqN0s6A5lsHMwDUaP9IY8T6zLeFA1UpQxOL8GEqdVBBmKCi08JWsGvMTAHjTg== 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=m7P+wQ/su6zm3u2PSKvhWr/LW0KdXrm8CL8wJ3b48l8=; b=SRNG0m5tn650X43q3C+Y8pPnWhGB+ZruKXS6UVNi0iMoouiQYdrzVfilhDIc4B8FpdPH11XVgpepK6ki/sxDBS5f0cDZ0/QLRKjnkFp696aBJFAfs6eEAJnk9dX98147TEZgd1txzABL0owI6Rrei75OhpMsQGrAKSC74cCRPbxqTvSkS0n1XRpillj8p76LXQIom8PwDSBrZ8gQV8OedJq/6TziC/5auOTqzGtV6T9AKXHwa5CWm8Y+WrCgi3xuux+2YbCD0ed+fd/E/yN+0sy6D6ImPZV7e9ugT02neVL0Iy3czUlFR7ALjF+mbHlwFaKUlkqypHAJtygYFroxHw== 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=m7P+wQ/su6zm3u2PSKvhWr/LW0KdXrm8CL8wJ3b48l8=; b=dlxuGXfDNBLS9fXRguosB5XfQb6RoEV1cDmdHP2mYpA+laRi8iBR4VBJhC74GaO5zFu+o/irR+1Co7RGAUoZTXfTapwOzw75nx1Q/ePSZ2Z8hNYFMz6xd5BpSPTPua/ndTTbXnqG9OoKvi/Njlu/6bHQjp31IGkgLqN0vEY6gx46SxALxx5aenXXvtYdtU0H3XRBl7qfKCEZM/FIeiKrZWL+0b+nn1cjkGpO0R22uPqwKDzSD/SKdlknQk3vpjkzyAoryJpmxyO5u6wYIIbi89O9IRa7/bkcoSXquJD2qsIz0ukmwMF6B6codI8Fpj734A1vX10apKz0n7HayJUFow== 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:33 +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:33 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 25 Jan 2022 18:41:48 +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: [utzLgiGj03lneSPNKfOtbpmjOQydKH1c] 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-20-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b6066708-0c71-4ca4-f9c3-08d9e02a1191 X-MS-TrafficTypeDiagnostic: DB7PR03MB3500:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JKhEyWsZulxtI93HSxHIzNladDpifkSGTu64ZjyOT6onQJpaUdiRCn+jQvvjoj/amJGHDXVJDIfYIeQKdUE1eY4T3DgZftvCyGtEo/S7EzxGM5nIdKuo/yxFXvTfttErU7bBKJpBFXTy+f7zKOiA1+ZVghUTlGomPkm9/lhRePEzwTLFGkb4P/X69TEgQJK2m6BeG8L7SQDVgpnEq5D6IYETQ16pz6AaD9drK9XoW7rIe03WJyN8GW4i9bL8zU6cHN0+0v0CcI2apWTWTky134xFZ5zASbMT8UPcFBVZPjCMe/bFt9V9Gy0sIpBfB10KRL5JY7z92ZKnY+tCznVuaq3qZLVwZwjjRZF7wnp2Rr+rMjZNRzyapliOiszaqlGT5MeAURZQbHB/+n0rdZ1KzStjGEqQtNeYh65uPeF7jphPSmSwPKbcOebaXGSjyB8hcZEpjDTaxuX+BeB1k/U5Mm1mMzi0Nr0fNqXmi+oiCPinZGIybwaUvdCR/nmDc7d55ABaRV8WdfAihHxwtsCtyGP48EpYT3ERrWAcOnbYeBnSN57aMgKP6FFHoIrezhBZ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: WVLg/3/i4f7mzQrD++q/EaAY1jdk3sAvDMTFKGXppoGnBQTFn6MfE0Pw3JaUvLgWa5Lz/QA4+NtI/X75mG/CjVR+JgpYpKAQBYP1CRZLVGhnvVW311CH5FfvyPsnA8QejV4dy2ij2OpKT3HCOoWKFBvFmmhV26N5uOEaDyPcrbVfmjfGMxc1wRI30qxPkmaokfAMOc6aZVp8lS9YqETbC5WscuDZ2NZk+2dQgQm4pwhG+ujoHARWgCJWTReII9O5tsVNX6s4eGxvtnnnWHOwc0e0SGrYdfSOqYyS6kF4WnXsJVbS8usyxLT2/7yjpofXxqdxC4nHNelTPMUadn88+Yap97MotzuRa7SrrtvI8oAMaWbpxuSvsQLy7mdMmXDcVpvzIjbDq4L0FD4ZCYDkvc4MLP3yh1lDAebvxinsuZZph81gOvguafdMTMWB9H+MbiXDr3T6msl7Jxm0iVimIFX/EnCPXxoltrTrQSQJ2m4yqI3PwiK8lKurFtT2oM8HBgALh9yinnGs/kdYNHMDQuoLm+ZsadW8zBcOxRggff7g1EFFqVxd3GTDkOtzh50xt8nHaRnmfmRCCUEMK/35lN+f56RHVlN2HbxTCltx3brnmiN1VO3mCDN5o0C0wAY6hBWfaUzoreSMz+0IaULZnHptGDzMehjyiL2FF/fJgNcBaibP5xMkXH5mrBV4sVuXS/HkHQHVNhAI7lbYrd+zBlztF27kxsK0GEhyN6tbz7sx6yWPPS8WG0gZIAnZyQIZDHfRiKIBMPWIgu2KpuR9wDBVii2iyI15CKo85bPdHnXKBjYUP/NtfGxDSleAz925iUnINE9ByhtTaW4VH/MmDEohowxYJrOQ/2wHCZiFb5DKcnBBaowKkFxnoGkJzIXjzitXHa3WIax05x8q6prMMU9L55RYca+jFIRjU7Ww0m4YXHptIt49uPGBnZvhaaunxUpvWs88VR2lV/B4OcGrUg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b6066708-0c71-4ca4-f9c3-08d9e02a1191 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:33.8456 (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 21/21] avcodec/mpegvideo: Move frame_rate_index to (Mpeg1|MPEG12Enc)Context 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: jrdpDNbb4cv8 Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg12dec.c | 15 ++++++++------- libavcodec/mpeg12enc.c | 11 ++++++----- libavcodec/mpegvideo.h | 1 - 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 0c5eddb7f1..4a7bd6d466 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -70,6 +70,7 @@ typedef struct Mpeg1Context { int save_width, save_height, save_progressive_seq; int rc_buffer_size; AVRational frame_rate_ext; /* MPEG-2 specific framerate modificator */ + unsigned frame_rate_index; int sync; /* Did we reach a sync point like a GOP/SEQ/KEYFrame? */ int closed_gop; int tmpgexs; @@ -1297,7 +1298,7 @@ static int mpeg_decode_postinit(AVCodecContext *avctx) if (avctx->codec_id == AV_CODEC_ID_MPEG1VIDEO) { // MPEG-1 fps - avctx->framerate = ff_mpeg12_frame_rate_tab[s->frame_rate_index]; + avctx->framerate = ff_mpeg12_frame_rate_tab[s1->frame_rate_index]; avctx->ticks_per_frame = 1; avctx->chroma_sample_location = AVCHROMA_LOC_CENTER; @@ -1305,8 +1306,8 @@ static int mpeg_decode_postinit(AVCodecContext *avctx) // MPEG-2 fps av_reduce(&s->avctx->framerate.num, &s->avctx->framerate.den, - ff_mpeg12_frame_rate_tab[s->frame_rate_index].num * s1->frame_rate_ext.num, - ff_mpeg12_frame_rate_tab[s->frame_rate_index].den * s1->frame_rate_ext.den, + ff_mpeg12_frame_rate_tab[s1->frame_rate_index].num * s1->frame_rate_ext.num, + ff_mpeg12_frame_rate_tab[s1->frame_rate_index].den * s1->frame_rate_ext.den, 1 << 30); avctx->ticks_per_frame = 2; @@ -2110,11 +2111,11 @@ static int mpeg1_decode_sequence(AVCodecContext *avctx, if (avctx->err_recognition & (AV_EF_BITSTREAM | AV_EF_COMPLIANT)) return AVERROR_INVALIDDATA; } - s->frame_rate_index = get_bits(&s->gb, 4); - if (s->frame_rate_index == 0 || s->frame_rate_index > 13) { + s1->frame_rate_index = get_bits(&s->gb, 4); + if (s1->frame_rate_index == 0 || s1->frame_rate_index > 13) { av_log(avctx, AV_LOG_WARNING, - "frame_rate_index %d is invalid\n", s->frame_rate_index); - s->frame_rate_index = 1; + "frame_rate_index %d is invalid\n", s1->frame_rate_index); + s1->frame_rate_index = 1; } s->bit_rate = get_bits(&s->gb, 18) * 400LL; if (check_marker(s->avctx, &s->gb, "in sequence header") == 0) { diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index eaab968425..ecb90d1a41 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -65,6 +65,7 @@ static uint32_t mpeg1_chr_dc_uni[512]; typedef struct MPEG12EncContext { MpegEncContext mpeg; AVRational frame_rate_ext; + unsigned frame_rate_index; int gop_picture_number; ///< index of the first picture of a GOP based on fake_pic_num @@ -144,7 +145,7 @@ static int find_frame_rate_index(MPEG12EncContext *mpeg12) || av_nearer_q(target, bestq, q) < 0 || ext.num==1 && ext.den==1 && av_nearer_q(target, bestq, q) == 0) { bestq = q; - s->frame_rate_index = i; + mpeg12->frame_rate_index = i; mpeg12->frame_rate_ext.num = ext.num; mpeg12->frame_rate_ext.den = ext.den; } @@ -233,14 +234,14 @@ static av_cold int encode_init(AVCodecContext *avctx) mpeg12->drop_frame_timecode = mpeg12->drop_frame_timecode || !!(avctx->flags2 & AV_CODEC_FLAG2_DROP_FRAME_TIMECODE); if (mpeg12->drop_frame_timecode) mpeg12->tc.flags |= AV_TIMECODE_FLAG_DROPFRAME; - if (mpeg12->drop_frame_timecode && s->frame_rate_index != 4) { + if (mpeg12->drop_frame_timecode && mpeg12->frame_rate_index != 4) { av_log(avctx, AV_LOG_ERROR, "Drop frame time code only allowed with 1001/30000 fps\n"); return AVERROR(EINVAL); } if (mpeg12->tc_opt_str) { - AVRational rate = ff_mpeg12_frame_rate_tab[s->frame_rate_index]; + AVRational rate = ff_mpeg12_frame_rate_tab[mpeg12->frame_rate_index]; int ret = av_timecode_init_from_string(&mpeg12->tc, rate, mpeg12->tc_opt_str, s); if (ret < 0) return ret; @@ -266,7 +267,7 @@ static void mpeg1_encode_sequence_header(MpegEncContext *s) MPEG12EncContext *const mpeg12 = (MPEG12EncContext*)s; unsigned int vbv_buffer_size, fps, v; int constraint_parameter_flag; - AVRational framerate = ff_mpeg12_frame_rate_tab[s->frame_rate_index]; + AVRational framerate = ff_mpeg12_frame_rate_tab[mpeg12->frame_rate_index]; uint64_t time_code; int64_t best_aspect_error = INT64_MAX; AVRational aspect_ratio = s->avctx->sample_aspect_ratio; @@ -300,7 +301,7 @@ static void mpeg1_encode_sequence_header(MpegEncContext *s) } put_bits(&s->pb, 4, aspect_ratio_info); - put_bits(&s->pb, 4, s->frame_rate_index); + put_bits(&s->pb, 4, mpeg12->frame_rate_index); if (s->avctx->rc_max_rate) { v = (s->avctx->rc_max_rate + 399) / 400; diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 9243edefce..0b76a460c9 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -201,7 +201,6 @@ typedef struct MpegEncContext { int last_pict_type; //FIXME removes int last_non_b_pict_type; ///< used for MPEG-4 gmc B-frames & ratecontrol int droppable; - int frame_rate_index; int last_lambda_for[5]; ///< last lambda for a specific pict type int skipdct; ///< skip dct and code zero residual