From patchwork Sun Jan 30 06:27:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33924 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp1771284iov; Sat, 29 Jan 2022 22:32:03 -0800 (PST) X-Google-Smtp-Source: ABdhPJyX7jwGLK6sOk/iQ5OpvqH8XpS+34WfXG6jSJ0rMUZuoiU725Fth/ecCARDIWFvkb15aDrs X-Received: by 2002:a05:6402:2993:: with SMTP id eq19mr15333230edb.233.1643524323669; Sat, 29 Jan 2022 22:32:03 -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 d23si5537149edr.220.2022.01.29.22.32.03; Sat, 29 Jan 2022 22:32:03 -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=b9LDtjCo; 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 30B7268B25F; Sun, 30 Jan 2022 08:28:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2074.outbound.protection.outlook.com [40.92.90.74]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B230168B249 for ; Sun, 30 Jan 2022 08:28:52 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hFHxIjsANDNUcJoDPjruGghnlt8OvpJD1bTYYMF8ouNd+3bovvm4NuUS9zp043gPxiRwfZA/tDDla/bKFoJkWXffp2bNWYv6HsIf5cmSOpBsNc2Vargn+nm2egEHki2B2FHscYSBA1lrcqkME5BgkDjDlS5XeiUFCklZiNw9ycQZIPUsotpjt41DXL/KIxClx84Is4aWtg+bR/e5XFVjw5TFrC371Dj0rKTaJB73lLKRXZoD3X/TeH1F2ftCwcd2A7vu3AsBMhvD0VQ3gkJv0HevJ8O6OA5LG3VSF3bHqTInS2YbtFwZ/FecDoQp9Mo5Of3KatAkHaP0NM8LBsFiSA== 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=yeIkMW1pUV5pJnIXIxawPmq+Meb297qhzJskhSLrhxk=; b=FEPEc1WkBY7zoe2cwSBJfjv5yqfWBOdpzZQUNTry7+irHT0kNAPP1ts1QRAQuT9AMSPs++OU8LnYUIzPM54bQ1l0U/R+d00g2kTT/gDPqxuCJojlNXKJ6s5oYo2fFXB1U8tNsd68YxWlLGhhImcEs94dDoLJ/Ra8MnB1JEt6C++ma94lwYMuLTLYcS2Tmf5I6C28RSs9UFP/XySfDIYzYCIbU3e2QkIDx3Nj/jTiBSBnLFvDUCqUvD10OmRLm+/NF22BUdyOqC52D3NFiyfugcxUpUJcvIUJDoS2G6a1yuSZYmxGFTz9EilX7NjvsmmCduhVS0m3kGVvFauWS5OpsQ== 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=yeIkMW1pUV5pJnIXIxawPmq+Meb297qhzJskhSLrhxk=; b=b9LDtjCoVon1qej1UCZwNBJMLkmzBfJm3Ag/i0E3s4RdP08SUBCXZ4ZwgDfxaRQkzNb6KpK0Dv0+z8mImCLeqrM87njWHcRxFtOt6MIztmECFZCLBMv/haSv/1bHlVPM2Unl5PMou9kyN4rXJPP56ppFExU9eRmZpAJigJ+nVDseXYmdJzDELWZ+G0kuzLFTurEHfmdxi0H/IJSXfZyst4QeCM8/4xlVJ2Btt/WTIi2CzpCNiuYA+XZDyWF8sYIMcxKefGh01vMp7HO4c/2+kdHQCMsR1Bll6C+L30sNvIw72vbyaXPSwbpY7kEClH3B5S539cpOxfSyNC+QJ9loYA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by PAXPR03MB7666.eurprd03.prod.outlook.com (2603:10a6:102:202::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.20; Sun, 30 Jan 2022 06:28:51 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%6]) with mapi id 15.20.4930.021; Sun, 30 Jan 2022 06:28:51 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 30 Jan 2022 07:27:32 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [bc4YK+UHn32MkT1/pLIL0NulE1YsRFrD] X-ClientProxiedBy: AM6PR10CA0044.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:80::21) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220130062749.936489-23-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e4c13a6c-7e85-4c78-dded-08d9e3b9c83b X-MS-TrafficTypeDiagnostic: PAXPR03MB7666:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rOeNeFzFuuqjeJ903eFVOG/JsplvNpGGx34LRM6yqS1If9oTrPG/rnlH/NrhCYETiOMp7713hVwFLmPSDVYot4z9u8FEUc2kqb++PvFUnDoiAPzMxk4pqxGzFuDp2pCPi0VR1Cf+uXxvrjD7KHlhznDAoMpQb15hA85TBOfLAkNN1BksKST79SLkIkVBUDwQvCIadubpSkxX2GfP9MDEQuNM0EUKpmtayGcdJj+MhpdxFxAICBWREhPgZDAMNhFyZSgUTal1AcAKwgNlgoDmQbVfS3rvsTQOn+DH47dlb93aOfPOp5Er//N2idfBiqqY1RghLDGFtYWdFQH4TDt4XcHeIMIRsQUknOhBZxM5JmChtF6D7RWJe/Xsx3V0Hvk2/3ag7UQBNhl38PX+6iHLAGZvikqbj7QN2Tj00KGpiSulaCxHxoE84s2pz4bpXVwTupjwnHNcYMVGtuYjbu680ehkANdqhTR25Ppcr3IEdRGdpf22Ms7ATdaJpoYncI2q4wexkH98PjO/XVvnhDAQ8C0pjx1gR+cdUmzlzrAPLe2cKYgD9SQEAEgKnUauyHSj X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: CDJ7pD5Uhdi8bAyy7FdwP55VBORZEMcM1rWvvM3dtCINcIwtkGbhOsLHlfkccvb3TMAPL2j4G+9ptzEcLXxxwuKHjLVbjPa6cibV7e1cn/ndqUuKTy3IysSOCU+HTZtioVAnggTWCadzyVVUaGrUlqm42CHxIFPRnzh7ROVdfFAnZOkvfTJc17P9ForZaScV+DtO5zWvGZLS4xodYP/Wuwez7GjB0f8MeygnSwLiQ3jNZbjcaszznyMWcmwm/9Iz6O09iNW9kqdWf7W8/aWm08X+5is3PpwOU16Yei/9N1r4G4BOs/bHnpUZNPraHXOPGvbTt9BxwdPwZlipoe0N7RBHA/sxV99R50sf4/hF67mV6YOowYbr5kaDfe2dBb4ODgj8R+0HYKnNZsTw9Vi6tzvQtaYWdihO8UoJijTogXy1oWGovbnDSQLddw3QKeDzNux/aaYKYoMBXQpL19RYFROkpeMIyO4e8h8Oij7UsSrZ6pyEyccEBYuwvKQvSzmOJ4SlFo6PsvLk7ScNzMzwb3ag79IQT4MjJTea7SP20JgcftLjFlLAas+tjeo1VIAEPPoii42xHFLdG91oPgzuOoum8yDrKZqTc7N9Iufj8VQhBWhN1bN04ACRKKyF9N2TmF7lnj8UJLLUBO3VIfksb0HWevL2oLkZ0ExuaJFAJHctWQLDd5NDgUicfspPx4kYilBZ2cLtP8UjgW35YuRPI+Kv2JUsTJIYr+UuYMhSp4B+EF7V2pBUHeXhzqYcAcLO7P80YMpfayoqfZCiyiETgo7FmxGQugvBt27xume902vsNfRz+xmmfYIuauvldikSXoGUL0wR2HRg0vDnCxDxzihsHeWkV37iJFauinmtWXLrc+N3F2AwBK0cnvJBG8RVq4TXwKAlWN9nw8kODRSLxlmSRvJT/KJVV+B67aAHNi3c3Xg77QPXkH80mMhHJYh7yQSpkSjD6KP98icWUfI18A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e4c13a6c-7e85-4c78-dded-08d9e3b9c83b X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jan 2022 06:28:51.8238 (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: PAXPR03MB7666 Subject: [FFmpeg-devel] [PATCH 24/41] avcodec/mpegvideo: Move picture_in_gop_number to MPVMainEncContext 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: qvSfnmLGhdY+ Only ever used by the main encoding thread. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo.h | 1 - libavcodec/mpegvideo_enc.c | 14 +++++++------- libavcodec/mpegvideoenc.h | 1 + 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index c679b7e531..cab3abcc77 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -110,7 +110,6 @@ typedef struct MPVContext { int input_picture_number; ///< used to set pic->display_picture_number, should not be used for/by anything else int coded_picture_number; ///< used to set pic->coded_picture_number, should not be used for/by anything else int picture_number; //FIXME remove, unclear definition - int picture_in_gop_number; ///< 0-> first pic in gop, ... int mb_width, mb_height; ///< number of MBs horizontally & vertically int mb_stride; ///< mb_width+1 used for some arrays to allow simple addressing of left & top MBs without sig11 int b8_stride; ///< 2*mb_width+1 used for some 8x8 block arrays to allow simple addressing diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 5f3bc93da7..9477a02ae1 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -290,7 +290,7 @@ static void mpv_encode_defaults(MPVMainEncContext *m) s->fcode_tab = default_fcode_tab; s->input_picture_number = 0; - s->picture_in_gop_number = 0; + m->picture_in_gop_number = 0; } av_cold int ff_dct_encode_init(MPVEncContext *s) @@ -1379,7 +1379,7 @@ static int select_input_picture(MPVMainEncContext *m) /* 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 < m->gop_size && + if (m->picture_in_gop_number < m->gop_size && s->next_picture_ptr && skip_check(m, s->input_picture[0], s->next_picture_ptr)) { // FIXME check that the gop check above is +-1 correct @@ -1463,10 +1463,10 @@ static int select_input_picture(MPVMainEncContext *m) "warning, too many B-frames in a row\n"); } - if (s->picture_in_gop_number + b_frames >= m->gop_size) { + if (m->picture_in_gop_number + b_frames >= m->gop_size) { if ((s->mpv_flags & FF_MPV_FLAG_STRICT_GOP) && - m->gop_size > s->picture_in_gop_number) { - b_frames = m->gop_size - s->picture_in_gop_number - 1; + m->gop_size > m->picture_in_gop_number) { + b_frames = m->gop_size - m->picture_in_gop_number - 1; } else { if (s->avctx->flags & AV_CODEC_FLAG_CLOSED_GOP) b_frames = 0; @@ -1687,7 +1687,7 @@ int ff_mpv_encode_picture(AVCodecContext *avctx, AVPacket *pkt, s->vbv_ignore_qmax = 0; - s->picture_in_gop_number++; + m->picture_in_gop_number++; if (load_input_picture(m, pic_arg) < 0) return -1; @@ -3717,7 +3717,7 @@ static int encode_picture(MPVMainEncContext *m, int picture_number) s->current_picture.f->pict_type = s->pict_type; if (s->current_picture.f->key_frame) - s->picture_in_gop_number=0; + m->picture_in_gop_number=0; s->mb_x = s->mb_y = 0; s->last_bits= put_bits_count(&s->pb); diff --git a/libavcodec/mpegvideoenc.h b/libavcodec/mpegvideoenc.h index 1c101d01ac..3deee6d5fb 100644 --- a/libavcodec/mpegvideoenc.h +++ b/libavcodec/mpegvideoenc.h @@ -41,6 +41,7 @@ typedef struct MPVMainEncContext { int me_pre; ///< prepass for motion estimation int gop_size; + int picture_in_gop_number; ///< 0-> first pic in gop, ... /* bit rate control */ int64_t total_bits;