From patchwork Tue Jan 25 17:41:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33856 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp833769iov; Tue, 25 Jan 2022 09:44:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJyqPR/0tBkqNLlQX4IQxmVoJA7mupkl6PFB7mBXA9jXzs6Uex1cM/5FQCewQ8EflhWHEJJV X-Received: by 2002:a05:6402:1347:: with SMTP id y7mr21495628edw.208.1643132667796; Tue, 25 Jan 2022 09:44:27 -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 nb8si11876469ejc.941.2022.01.25.09.44.27; Tue, 25 Jan 2022 09:44:27 -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="ELKwB6N/"; 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 17E7068B10F; Tue, 25 Jan 2022 19:42:31 +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-oln040092068098.outbound.protection.outlook.com [40.92.68.98]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8989068B097 for ; Tue, 25 Jan 2022 19:42:24 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y09zk8+SNI4FHcEKv0LV9S4dNOxW0YtCFfCSD2WvbQQl/GhEcHv5OnqDILNWINBK0CJSw9bCwU9hGQsDKUuIMacUSZdgoiVR0DxcLX0HqINYqtb7fpE4rMy2BWXCqE6J4RygCowYohwgejl44FH0dzzQiifViXVIoCZsR+q7GRtzgKvZzoyBDOBTvLHazmk0VK7jbxSme5luxkfzV03OzPzGCuv5SOnxm5rmBQ0gfrNKDyuueH2ze8wwjgrOb+lCOE8FzJeKa5AuxYbuNEFl5Q0xX1kKmOjhtRJGDJ0paWujma/nMeZVr0nOGtADjvok9uucaHeNrjtN5NIS68PdmQ== 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=abw9que0TRdKS/1PU/LS0bblMc9gT3v0CdAH+kBgS6g=; b=ZFAcZEs3wx4Tg+AA/WU8qGYk+2Ekc4hkfq7+1pLdDK2QtUE2mytHTFgyBFffPV6AwjYjJLVwdby7e3HwKJIlJIBdSfbUn5oweYTjuZkOAoiroyWSlLjBdxd36ntNU47563X298NpjMPEM9PkLirBGQ20WKyKE+iJ0xqwfjaiskH6Ye5JfEygM5V/WCJ8/SE9Y/WxHWZDDg8brI93sa/27tlZSWjbU29XNMuUoV9Bha0EMEd5Z17+eNEwUZytzBsoVCOrDP87yg6kL3AGK0FR9c3mwSEvYP7K23c9IvlZ+e7FJotBLKsjTa6r/jvpZtFDzaYr5uz6tZwMqGV7EAHeXA== 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=abw9que0TRdKS/1PU/LS0bblMc9gT3v0CdAH+kBgS6g=; b=ELKwB6N/00w1c7S+A1XxeZfovDqC2oKr33aWsoCmCtLSlanXflDPd8ZezUoKXIvtnrEkFywd1FezHczWYI8tisVbXYrhP1qxu/psUHrL1txQewrXIuHPlCszzcAtZJ2A3tEdlSW6Y4YBuBBR0yKwXqnr/JyZIYA8f1dQepY6UVnP3s3yU9cyR6R7HwTy8soDIjStv6yYp/KNl8+J8t0rKKJpeWArPprXYdzSat5isXA4TC1a0ndFf/AmdrnjG6yg7bam9fF2YG7fZA8cJ365YvkRMyUw1yZvbECBYEDFdPSTC0jdH43P7Bh5CWlHjapvwYCcYTOOkGlOtx/vSCQVVQ== 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:23 +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:23 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 25 Jan 2022 18:41:42 +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: [AN4aiHweej5oeIXKctOXbs4dGDC1Y5nj] 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-14-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6c643d7f-ff83-4ce5-fc09-08d9e02a0b1a X-MS-TrafficTypeDiagnostic: DB7PR03MB3500:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /yE2I0e6RvoyWGJNXseVMMK46ydj4RSdLefm6qWH9KcvNgfzdD+coKPxppPPGAc7nqXsIERn+U/t215nS/G+8eUot+RfiSbCVsHAQ6s4YfgQcvG1a5qSSLpvaYu7jXOjdMh+WH/3UGArTebSBM+5ISRsbXVzO6Vexs8FGaQG3/qC9G4NXrZRFj7ZCWih5UBa4gsl7xR2vT1DvsRKbAw/o3vSer5ZaalGBXuscjKs9iZ/EDsEh4NX/82PDERRFlZ/faE9bGEOzNP+IonZyodosGgayz5ILVsajglLOz6lkDEFI5nT2v5Eq3AzJija/OyeAI6rVMXul5cCiKHlofV182ArD9u9pa4tw5zL5Gy85BdGmX6lSnjc+blyZjARs2zVy9C2XZpTdnAF4IBkKwYtonvU5PK0rNTo6uv+0beZXAXstNheTPPgeZnIQW1fHJO94E9vqIi/Z3MdLS61YSFng0uRf4tejCu+GdUQ8MQP+qEs2wi+/q3HNQwofLEPL6za5cBGN5kvFQlw9c2f6KmYtX0OXtha5OQr0fINohDKx/SxPyRAk48xqIHw/OSH/ijd X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: UH0HgLiWJ/4nKWAe/z38StJOWKNBj67vEMuLzhTDQYxpzd30JZhrvYPbkmDyCZkL/EJvHWyi34wZUFxyDr1aYJwe3zOEvAlwPElJuCIo7z90yA1QZBdHxzl/FQF2+4TtxsBIHBz8HKZC4M3voAVSlI3YdvltbE5OL+HnjxD1lCL003iuaLeQKOOXM1guklXWCTIQAc+jUx9X+WKACvbNu6feqlAsB+It0HDnVuGUD+w+3TAVHhXFV+K3k+rjgBpyq3r+vMQYGrDx60DrvtRWtJLIpcJ695XvIDQglmhFgC9cS84//FGcWD5T2a2/YVBlbEU5xoks2wkGotblVVT0/Lhp1NfQQaXtJTpSbJuxeiV9HCvgZ0Ayhrz5b+ouiHCh+dSAsiBbnXaow6hZukbKKbZNXS9PaHSyW+pWWajCmDHb36szYg+/+gXee3iNoE5gdIr8nmnULnySaCGTkDnOPWOGqO+UerD/2uh9eSdRmOZxBUqyVmob7ZEdruSmOQoppCzyiXdEMgfk/EES1W6H8SiHi7Um3XKRVcmJgzf1GzBc+a+f3APkANtvll1ceZGnL/l/CuulhULfZL78HL+g/kuix+mJOAN3jlC3hhOAg6/6vdpHxKJoB3GPfWEaLjAPEM6EP9sQWwWmokEPjAWqUo/Z5mHqS4sJWmClLadgE7cNBvjvWHWauzVA56O05BhkSHZm3GX0mO4ecXccnwN9JsFI4wM7pSd/QjHaBpj/K2Uexdq193a+mq+pnA8MncchYKj+KZISZBMxF3H5MrRi4VBRhYNUN5Mx3+GL19JbYaB9nBEAg0lKt4OS0RD29Lsi1Yv9wTmVXBnxiJ4/RUZpXdzH0nAAQ4WYvX9Y/8h5oSnnGsfVGl/JoqJE9cyfi+tIrVt97Hc6lpBY6U9EZLcIeX3ck0uYtcsTGVnvIJi5941+s2obgL9f30zHgZYHLIwphxSXWGZICIT984MkH7T+BA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6c643d7f-ff83-4ce5-fc09-08d9e02a0b1a 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:22.9983 (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 15/21] avcodec/mpegvideo: Move timecode_frame_start to Mpeg1Context 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: HH9IyQGe4hTF It is only used there and only by the main thread. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg12dec.c | 11 ++++++----- libavcodec/mpegvideo.h | 1 - 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index dbbf9bd819..0c5eddb7f1 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -75,6 +75,7 @@ typedef struct Mpeg1Context { int tmpgexs; int first_slice; int extradata_decoded; + int64_t timecode_frame_start; /*< GOP timecode frame start number, in non drop frame format */ } Mpeg1Context; #define MB_TYPE_ZERO_MV 0x20000000 @@ -2443,7 +2444,7 @@ static void mpeg_decode_gop(AVCodecContext *avctx, init_get_bits(&s->gb, buf, buf_size * 8); - tc = s-> timecode_frame_start = get_bits(&s->gb, 25); + tc = s1->timecode_frame_start = get_bits(&s->gb, 25); s1->closed_gop = get_bits1(&s->gb); /* broken_link indicates that after editing the @@ -2854,19 +2855,19 @@ static int mpeg_decode_frame(AVCodecContext *avctx, void *data, if (ret<0 || *got_output) { s2->current_picture_ptr = NULL; - if (s2->timecode_frame_start != -1 && *got_output) { + if (s->timecode_frame_start != -1 && *got_output) { char tcbuf[AV_TIMECODE_STR_SIZE]; AVFrameSideData *tcside = av_frame_new_side_data(picture, AV_FRAME_DATA_GOP_TIMECODE, sizeof(int64_t)); if (!tcside) return AVERROR(ENOMEM); - memcpy(tcside->data, &s2->timecode_frame_start, sizeof(int64_t)); + memcpy(tcside->data, &s->timecode_frame_start, sizeof(int64_t)); - av_timecode_make_mpeg_tc_string(tcbuf, s2->timecode_frame_start); + av_timecode_make_mpeg_tc_string(tcbuf, s->timecode_frame_start); av_dict_set(&picture->metadata, "timecode", tcbuf, 0); - s2->timecode_frame_start = -1; + s->timecode_frame_start = -1; } } diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index e093e8c04a..fd9d60b03e 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -443,7 +443,6 @@ typedef struct MpegEncContext { // picture structure defines are loaded from mpegutils.h int picture_structure; - int64_t timecode_frame_start; ///< GOP timecode frame start number, in non drop frame format int intra_dc_precision; int frame_pred_frame_dct; int top_field_first;