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 515264210F for ; Thu, 16 Dec 2021 11:18:20 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AAA6268AD0A; Thu, 16 Dec 2021 13:18:18 +0200 (EET) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2083.outbound.protection.outlook.com [40.92.90.83]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D85566806A3 for ; Thu, 16 Dec 2021 13:18:11 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Lo3O1ngWCybI6kmPIK9wECgwqZoKCGOKID+fEoGF1kKnml7abe1InrMWx4y4/+JIVusPnnGt0Yo3P+luuAp2gfn5NxTVaKPdj+o3AHDKtkShmYbqYbHYGEYwot/ND1gLAQmsLB+vL6Y45UMcrmNmi9f1J+O38ez8FFdGdbSaeF3XbZYroZZjDLUF4jDu9Tv4pdUKnYsWJL7ors9VWuGMkENb99u/kVhey5L6AikvpAN3gnoEAYI1lW326ucYY9S6y35lr/Sh2EQkIxOaCHgZUBiBtc/VLGCReGtfqLVBSKpsYujOdEWAVZvV5hoJT/ePEIWPxs8vTyMkijxuVtOMNw== 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=qba8q+Gqqq/BRfPLhzjt5t5EzTa59uyJkCJ+Zp7tBms=; b=PudZ/k3Mjj2W/ZsvBCQP2KElBUlNaaxhblX/Glmv1RC7J8CXnRyrvrugh41YcRUF89Ck8lUrC9PkRxNFvF34otdfwcw6cpLlqKDxvf8+LJj/eqrC7Dr/VTrtBa+xLxeitAf0AGQ04NEwinEAQsmaLTZ+hulGNS49HW7j2pHXsXIfJjot3acGexJzlKPDjXafpWFKed92KcnRrrDHWr1iBMOqom2GqKar91/jK6YnCtiv3AHLHud72lHqoVJfM3QS6d0ZNft9Mfu0huHyb/80DDgpznIVdzYHnsPvvU58NhCPgsAy3znxNgAlXV8bcVjUDD3Fgfy0UfqAemK2efx9cw== 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=qba8q+Gqqq/BRfPLhzjt5t5EzTa59uyJkCJ+Zp7tBms=; b=QHMIXpqIF3ltRKu3EDpDxYxvW6CTDhSUidGgJEVMwT46NdSYIQOOc2P2CNgSeOWOdLwdjbvCyJWzpdzMBhAj67jNQnpVMBUp+v0Ic1sM5z9Y7uB6v3I97C8Ki4dUaFwtJxzrdixLHYTtgYNkDpn7fx7wHIJBab+0HDAvEu08stYXg+0xM1E7v0dUwrD46I6ByChfe148RaXzwqw5BX5oMg7AYVJjseeQsbQDPnktX2xZ0R8rtjJMhCTbWP6nGQu7wJkcOoZi8C9Lj68LQtEkIJmOJ3mzOu2CZNim9HfXbzFdrSNwABcIFoen5AqqN1iMPvTaMNe75bh4EkgouObVZg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4375.eurprd03.prod.outlook.com (2603:10a6:20b:5::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.18; Thu, 16 Dec 2021 11:18:10 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%6]) with mapi id 15.20.4778.018; Thu, 16 Dec 2021 11:18:10 +0000 Message-ID: Date: Thu, 16 Dec 2021 12:18:09 +0100 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [Y7E+c5CjhAWJGYkcy+WulojjbpfV1+e9] X-ClientProxiedBy: AM6P192CA0054.EURP192.PROD.OUTLOOK.COM (2603:10a6:209:82::31) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <99c96971-993a-b29f-4104-6f5fa0bf42fb@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 99ccbdcb-416d-480a-293f-08d9c085be58 X-MS-TrafficTypeDiagnostic: AM6PR03MB4375:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ly7g6BByy5V5UJ9NNDgv/8LuRyWzLuxoB1JLAsRHAbnKGJWvGC71S9ZVWOvaDBY2MGJquNuTmhhVBzSJIzXIbg4W/SiENv4NgqpkvCYrR6C5K1qTBkkDuKv7M5PHlbri8XaUE6ymbGkvhE9LKbWUdU3suCRjYcqPrhXipPBs7hljOeDDWNR1ZXQuB5bHmSWAE8+LbYW6OkbLrPh1i/lNBOKkxRNYRJuTB63iyeVJxOZJ7wHnsVNtyHam35JT/2TnBNUN4AzTobhHUOIlog74Duex95u0nUL4qUxFBFp/T6IqycsFFArMunU6iamDiYHW8O3WBFXcKdttiN4w61rIAxUbczd8rLmF6W9RK3n9Yf+75xFT6WD9iSbMDSVVlDvzHwDSdOpnmLK4UNmamBRCSRmUozwuWPHSIbVflhKFIP+37lcd4YUzjdv6MzafBdOp4owI25mjmqAY9sOeDHOP/qctjW/kHoDkxXjDRoU7TY3I++YTK/iXFgNgVT3vDCZlGNLP8d+XRC3fEgFwNNhySWb0q1un7/jETTND7EIXXBlw8hrplU37hpXjS/403+A1CmKbPfAYr6qpgdVcER771w== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?cjB0SE9hRmtXcnViV2toZk5yYTFTREo0Y2Vydm8wSVNLbXVLanZwelFlcTdz?= =?utf-8?B?ZlY4QkFXQk41RjhDTXF2cW5OWWhTc1RoVDZsMHZiTzJ2ZDh3c1JwbkRhejVt?= =?utf-8?B?ZCtHdWhPaHJGUGZOSWhBUXJWdzk1UDRVNXQyemdSK2JOVUhHVXV2aERsWjVu?= =?utf-8?B?TVYrNFRyZCtGeHNla1RMV1lXRks0dWR4Y2VPQ2w4NlNUYXJ5NEhzRXVkblFt?= =?utf-8?B?STh1ZHF4YlhQNncva0pKVDdqallwaE9nK3VobU0ydFpvZ2FpSDJqZ0t0bUFt?= =?utf-8?B?VWdoT3lVZktrYmE3Z09JM1duOTdzRHJWSmZzbEplSGZxRHNHYUp3WDFPQWpx?= =?utf-8?B?aUpHZXNWUmZYNCtVVHJTZjJSak01QXIxdm1QMStJSnFjUjYvODk2dXdvbkc2?= =?utf-8?B?eGZRb2loNVhWSHArdWVNMUpHUFRDZ3U5TWxMaEJvaGIrRnJhdjlBR1ZmaXRF?= =?utf-8?B?dFhuR0R4M25kMUNKRCtvL2ZNN2pvbGlQQ1UvK0c1OFd2ckJkMDlhNHJBa0VC?= =?utf-8?B?U2NhODY3WWVIVTI0TE4vbndBeVkzZnJvQmhuZ1lnL0tSN1RvRUJ2Nm11WnRZ?= =?utf-8?B?cWxWZ0R4a055enM3dW80SnlGK3E2bHViNkNwUm96dlZoYlhwelBDVlRmVVJD?= =?utf-8?B?VEw5anJya05qdG5ueWovM05qM1liT1U1TGZoUkZNd3lkWHZsNk9OckJGVkRq?= =?utf-8?B?UlZWbldnL3p4emVCcjMwdXZRMzZmZTBGYmxiMEFSdlZZUStXS1lVck9HNFNk?= =?utf-8?B?NWFJYXBuVjMxc3FXUFhYcEhOQkJTWlM3NEtTTGZXUGRDb00xcEpVQ3BRRFBX?= =?utf-8?B?NHNUN0tLbEtzc1U3K2lCcXZaMXBJdXhydDRqbkdBZ3IrcGxJMnhDNTJER3Vt?= =?utf-8?B?K05pWThKaFFyMlpZQldlazZ4NElFTXZZcWhUM2JlMDVLbENWREkzWDFpMktq?= =?utf-8?B?SWNvUW9heTV5elhMNmNSS1MvbkNpMUJUMjZBWDNSdHo4V2hqb0FDMzNhUDVq?= =?utf-8?B?YXFrbTdxc1orcVNKRG1mc0xGanpMWEpremFzVEVxNnY5YjdpclRCYUtVTUtl?= =?utf-8?B?ODAyZmgvMGFIR1VyVXh1YlBaVGxZcE51Q3gvZzZpUkxhL2JOM1JGUm5FdkRL?= =?utf-8?B?aC9iNDBaTDdrM1pRRWN2Mkt6V1FXNWVmNkNZc00yMDhWUjNFR2lra3FwV0Jq?= =?utf-8?B?alNpb1FvQVhEdWtzSzh6bmtPUEVRZkl2ekNlQjd2R1REQU1Eem5lQTFUUHls?= =?utf-8?B?MjRQVUwycG5xZjlpUFg5bzdFZTExRzFUUU84QVdDMGxxanQvZz09?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 99ccbdcb-416d-480a-293f-08d9c085be58 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Dec 2021 11:18:10.8611 (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: AM6PR03MB4375 Subject: Re: [FFmpeg-devel] [PATCH 1/7] avcodec/mpegvideo: Move closed_gop 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 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: Andreas Rheinhardt: > Only used there and only by the main thread. > > Signed-off-by: Andreas Rheinhardt > --- > libavcodec/mpeg12dec.c | 8 +++++--- > libavcodec/mpegvideo.c | 1 - > libavcodec/mpegvideo.h | 1 - > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c > index 09b2902bca..672031b6db 100644 > --- a/libavcodec/mpeg12dec.c > +++ b/libavcodec/mpeg12dec.c > @@ -69,6 +69,7 @@ typedef struct Mpeg1Context { > int rc_buffer_size; > AVRational frame_rate_ext; /* MPEG-2 specific framerate modificator */ > int sync; /* Did we reach a sync point like a GOP/SEQ/KEYFrame? */ > + int closed_gop; > int tmpgexs; > int first_slice; > int extradata_decoded; > @@ -2449,7 +2450,7 @@ static void mpeg_decode_gop(AVCodecContext *avctx, > > tc = s-> timecode_frame_start = get_bits(&s->gb, 25); > > - s->closed_gop = get_bits1(&s->gb); > + s1->closed_gop = get_bits1(&s->gb); > /* broken_link indicates that after editing the > * reference frames of the first B-Frames after GOP I-Frame > * are missing (open gop) */ > @@ -2460,7 +2461,7 @@ static void mpeg_decode_gop(AVCodecContext *avctx, > av_timecode_make_mpeg_tc_string(tcbuf, tc); > av_log(s->avctx, AV_LOG_DEBUG, > "GOP (%s) closed_gop=%d broken_link=%d\n", > - tcbuf, s->closed_gop, broken_link); > + tcbuf, s1->closed_gop, broken_link); > } > } > > @@ -2694,7 +2695,7 @@ static int decode_chunks(AVCodecContext *avctx, AVFrame *picture, > /* Skip B-frames if we do not have reference frames and > * GOP is not closed. */ > if (s2->pict_type == AV_PICTURE_TYPE_B) { > - if (!s2->closed_gop) { > + if (!s->closed_gop) { > skip_frame = 1; > av_log(s2->avctx, AV_LOG_DEBUG, > "Skipping B slice due to open GOP\n"); > @@ -2882,6 +2883,7 @@ static void flush(AVCodecContext *avctx) > Mpeg1Context *s = avctx->priv_data; > > s->sync = 0; > + s->closed_gop = 0; > > ff_mpeg_flush(avctx); > } > diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c > index ba5b51955e..55399a7478 100644 > --- a/libavcodec/mpegvideo.c > +++ b/libavcodec/mpegvideo.c > @@ -2317,7 +2317,6 @@ void ff_mpeg_flush(AVCodecContext *avctx){ > ff_mpeg_unref_picture(s->avctx, &s->next_picture); > > s->mb_x= s->mb_y= 0; > - s->closed_gop= 0; > > #if FF_API_FLAG_TRUNCATED > s->parse_context.state= -1; > diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h > index e90669b776..85f02b1355 100644 > --- a/libavcodec/mpegvideo.h > +++ b/libavcodec/mpegvideo.h > @@ -198,7 +198,6 @@ typedef struct MpegEncContext { > int *lambda_table; > int adaptive_quant; ///< use adaptive quantization > int dquant; ///< qscale difference to prev qscale > - int closed_gop; ///< MPEG1/2 GOP is closed > int pict_type; ///< AV_PICTURE_TYPE_I, AV_PICTURE_TYPE_P, AV_PICTURE_TYPE_B, ... > int vbv_delay; > int last_pict_type; //FIXME removes > Will apply this patchset tonight unless there are objections. - Andreas _______________________________________________ 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".