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 095D84076B for ; Sun, 30 Jan 2022 06:32:38 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 17C7868B2A2; Sun, 30 Jan 2022 08:29:04 +0200 (EET) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2011.outbound.protection.outlook.com [40.92.90.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8C26768B205 for ; Sun, 30 Jan 2022 08:28:59 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RrTMgIXFVi3kiS60kRlzWTSFjGsDGZZlC7DpyabUCQ9Pd2E89Wx7/v7O9Pkx8ii2+GLpFOlUur9F1CDrhYRCqOMNVLMY+REhL5EpMKbzGXp9UEG8hxazV2OLXWRXmB57Mi+5fe2MZF4eFAdwgcsnyuCv6LXjOXuObV34UCi/t6Ruw2pQthGh6LHhNxxq+OerFshpzb3p8LX1NQXHs9FtJG08L9UUSxMA/jOnhRc02naOfiTwZ87OvzhuhLBRHKivIUbREVfilLzpJHu9CmGGJf7EFcR6J21W9Ntz5SFGu8liSUACm7XGUiZRpdvTcIsQkpdDs1oY1RnFj2roJFM3OQ== 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=Jw5IeDee9d3F8OUt4qMqZTCQtxlyoLG1rfxPsJ+iYDc=; b=WY7Uk5RTiefNIx6pf368BBRLjnN6ZSt+gLuF/5Mk+RAvsOyyYbiVsIyRJhRRA0oGLyF34oMLifz/b7JMoKux7mq+i99X4niCqaCHATwMSAQVrOzQYQAJxCq2rQQI8MbLDzzdAzwSX6pjotmyAzKzSX1mjl4d00Hid/nSd7Bu8kQEgVSVzgabfXc3xY5UZv2tpZ3LiVXrEshgyVeMMtS89YUIsfWXWcGdGOPugX1piJFVGEXfSOCXLUT9LvpL4u38qUW3GiE1bfxMvZl61Yk8QfvYaK2ZWbfDrxZgJJOdypyn4TUtzFLhmPka8STE7q+zFhDkrFU/yQloGKvAONljGA== 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=Jw5IeDee9d3F8OUt4qMqZTCQtxlyoLG1rfxPsJ+iYDc=; b=u1K7dMNxyT+PSUZ9WT8clN4tgtJquarx6WuRg0WPI3KB+lBLhH54v7Nbb2Bu5aNvpVhEXc1ZgYrsZph96SJWODhw1+/jWyr9MLnC6qutLCSy45267IxXDbaIL5AS8q9QrHvaKxS+Lf5JUV+sFw5N/bgA64iYOZEH/McMhdPoArK7sD1QcMlx/vbzEJSGehFm2RZfAhQP/3ibYksNPCx28cl+Jz7SKjwrUT9luZHSMCYhS9+aKo7gMwK7xk+UvAbc7OTRk+tbyK1DX3A8328xRhLPheEqjiYGFPvMa2q2KN7eirHl1mrQG3ws06XorkFqE8zV++g5gxxQQzfKmG5SaA== 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:58 +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:58 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 30 Jan 2022 07:27:36 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [WQfnYQVdTTDhbTPzMum+PUR/1eosXKQ0] 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-27-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 04503c65-1542-4fa1-b36f-08d9e3b9cc50 X-MS-TrafficTypeDiagnostic: PAXPR03MB7666:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6WTy5W5icpBW9PavvDj8+OsM7pvacIAZiWzsMFCJCpdG662kBS+St0rG/yXE6jT27O/VnbU3XPq7ERHoFeCszGLhRT4hrf8l3yxAvRFgZw1hCL7cfZiJ4goLBI6P6OkglPmnplF1ikWI9CJUD9e4JXj6T86VsNmzEddOhosDD+DVtcCSkgCG72G37xXZ0pGlwWJGPxPwa+UR3hW1cGb2CcJeqp+FAzeJMqupWfg92k8YVHKUhx4itmdggMMahYPrp6fzfG7WQo0kPoasX00rr2UXxhc/I9UJOVJX5Cn1yhkF6deYc62E1uqwD8NK+LJwp/O5DylppWF02bpwBZpRTWpm/pV44Fcmcx7Wv74y/dzZYB8buNPvwyb0RI62JwauIbPg34qTgrdUgbhDwF9xbNIg0+Bprhs7cWmrMkW9tQliGDxOR+59h+c7auiKGMPBbm2kdVFPS2e9rCII8m7fCY0SjSO2budcl8qX0zp98W2KNui9nfUSSTpVW7HSQyvm5haVznbzaZxi6jJJLyyNufZQGoMRnqyDC+FSrN2OhIs= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?84dzmxPKFey7DUWuRyc6CE5dLAJhuNSSMUwj0BZWWkGSnne/tWJH7aEvUyyp?= =?us-ascii?Q?FRY8EG8+O1q10cws0V76MaptiXPLy7k6yHaIL3bu8AO4Q44s+5GzMR56KvZM?= =?us-ascii?Q?S4rqMMiUHMoqlEKGX1rBn2UGELXCxDZI1MpkimDf4yW//c4rBOmVwCaA17jC?= =?us-ascii?Q?9OUY2bHiQy/JCt7euffgw7hzXuK1h/zXSBeHfRssQHowRNaaGPKFq1RY9mbR?= =?us-ascii?Q?ue89cosLHHSYIziWu8YF5nG2BivLbJFcBrammS67eGqlM/I8JfRtQUimPnz2?= =?us-ascii?Q?3vC716CwXpcSBSS6G9KhJqdWlWxo2F11Q+RgX8Zjei5kVBWIyF3X9xCne26w?= =?us-ascii?Q?utRySnxN9eo6P+CrzsN4BsaXhym+Ol2YWSD3BYcQmCAW7Zq2WQMtsDGsRTuy?= =?us-ascii?Q?/r76mdMsBJjLON3q/fVxPBgsI/OMYTUMq0KSKrAzm2towHDY5//rBskK/9gj?= =?us-ascii?Q?ITUDqr7pSSQkcbv8UBJDSqKgtdOFne9GR4zEiCMsj8MI85hk6pW9TYxNx2pY?= =?us-ascii?Q?iWBQko7S7DGZdvbcfsEwAL/toM7m0O+3RbNRatwShZXQ65TC9At7c73JGedu?= =?us-ascii?Q?LTMeGRGk/fRQp8nfl8KogdzHbqjiHC0cmcI7+BBqHXsMtHh3esYngZOje2cC?= =?us-ascii?Q?39pCE3NLzyCkpv6EoPf9L4sOZlx10xR+psRpbC/SIcH74xiOuLETrjWpr3tn?= =?us-ascii?Q?sN+VqAYL0PFG7kaVlt7wWrmNqhiq2HdSYuaLFLpLHCNWdINnxu66OvOrHZd3?= =?us-ascii?Q?ubulvnSfIvb4Lg4I4veWaUNK49B/UQPppSpX6Hj7J0TW/7R7U1irPUnpYTpC?= =?us-ascii?Q?mlP9NXCyXT1ri+LPT9VqE2zwXuj4rlDO2yP9mecqSWdZ+gSsf6W9wQ0RChL/?= =?us-ascii?Q?yTVSGfqOH5Mek1/ySRorw+pXcrV+oHG65xgTDpJBhLPse18S11sxSVFiSer5?= =?us-ascii?Q?y1UbG8KYxXfJzecAdjqjzA=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 04503c65-1542-4fa1-b36f-08d9e3b9cc50 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:58.7025 (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 28/41] avcodec/mpegvideo: Move last-pic information 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 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: last_pict_type, last_non_b_pict_type and last_lambda_for are only used by the encoder's main thread. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo.h | 3 --- libavcodec/mpegvideo_enc.c | 16 ++++++++-------- libavcodec/mpegvideoenc.h | 4 ++++ libavcodec/msmpeg4enc.c | 5 +++-- libavcodec/ratecontrol.c | 4 ++-- libavcodec/snowenc.c | 2 +- 6 files changed, 18 insertions(+), 16 deletions(-) diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index bb14304495..8b5916f68d 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -183,10 +183,7 @@ typedef struct MPVContext { int dquant; ///< qscale difference to prev qscale int pict_type; ///< AV_PICTURE_TYPE_I, AV_PICTURE_TYPE_P, AV_PICTURE_TYPE_B, ... int vbv_delay; - int last_pict_type; //FIXME removes - int last_non_b_pict_type; ///< used for MPEG-4 gmc B-frames & ratecontrol int droppable; - int last_lambda_for[5]; ///< last lambda for a specific pict type int skipdct; ///< skip dct and code zero residual /* motion compensation */ diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 71e751d88b..36e14efea2 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1238,9 +1238,9 @@ static int estimate_best_b_count(MPVMainEncContext *m) //emms_c(); //s->next_picture_ptr->quality; - p_lambda = s->last_lambda_for[AV_PICTURE_TYPE_P]; + p_lambda = m->last_lambda_for[AV_PICTURE_TYPE_P]; //p_lambda * FFABS(s->avctx->b_quant_factor) + s->avctx->b_quant_offset; - b_lambda = s->last_lambda_for[AV_PICTURE_TYPE_B]; + b_lambda = m->last_lambda_for[AV_PICTURE_TYPE_B]; if (!b_lambda) // FIXME we should do this somewhere else b_lambda = p_lambda; lambda2 = (b_lambda * b_lambda + (1 << FF_LAMBDA_SHIFT) / 2) >> @@ -1575,10 +1575,10 @@ static void frame_end(MPVMainEncContext *m) emms_c(); - s->last_pict_type = s->pict_type; - s->last_lambda_for [s->pict_type] = s->current_picture_ptr->f->quality; + m->last_pict_type = s->pict_type; + m->last_lambda_for [s->pict_type] = s->current_picture_ptr->f->quality; if (s->pict_type!= AV_PICTURE_TYPE_B) - s->last_non_b_pict_type = s->pict_type; + m->last_non_b_pict_type = s->pict_type; } static void update_noise_reduction(MPVMainEncContext *m) @@ -3525,9 +3525,9 @@ static int encode_picture(MPVMainEncContext *m, int picture_number) ff_get_2pass_fcode(m); } else if (!(s->avctx->flags & AV_CODEC_FLAG_QSCALE)) { if(s->pict_type==AV_PICTURE_TYPE_B) - s->lambda= s->last_lambda_for[s->pict_type]; + s->lambda = m->last_lambda_for[s->pict_type]; else - s->lambda= s->last_lambda_for[s->last_non_b_pict_type]; + s->lambda = m->last_lambda_for[m->last_non_b_pict_type]; update_qscale(s); } @@ -3553,7 +3553,7 @@ static int encode_picture(MPVMainEncContext *m, int picture_number) s->lambda = (s->lambda * m->me_penalty_compensation + 128) >> 8; s->lambda2 = (s->lambda2 * (int64_t) m->me_penalty_compensation + 128) >> 8; if (s->pict_type != AV_PICTURE_TYPE_B) { - if ((m->me_pre && s->last_non_b_pict_type == AV_PICTURE_TYPE_I) || + if ((m->me_pre && m->last_non_b_pict_type == AV_PICTURE_TYPE_I) || m->me_pre == 2) { s->avctx->execute(s->avctx, pre_estimate_motion_thread, &s->thread_context[0], NULL, context_count, sizeof(void*)); } diff --git a/libavcodec/mpegvideoenc.h b/libavcodec/mpegvideoenc.h index a06e208be8..8e6c45c0b6 100644 --- a/libavcodec/mpegvideoenc.h +++ b/libavcodec/mpegvideoenc.h @@ -56,6 +56,10 @@ typedef struct MPVMainEncContext { * a delay */ int64_t reordered_pts; + int last_pict_type; //FIXME remove + int last_non_b_pict_type; ///< used for MPEG-4 gmc B-frames & ratecontrol + int last_lambda_for[5]; ///< last lambda for a specific pict type + /* bit rate control */ int64_t total_bits; int frame_bits; ///< bits used for the current frame diff --git a/libavcodec/msmpeg4enc.c b/libavcodec/msmpeg4enc.c index 9ab7f9e146..d34de80192 100644 --- a/libavcodec/msmpeg4enc.c +++ b/libavcodec/msmpeg4enc.c @@ -153,7 +153,8 @@ av_cold void ff_msmpeg4_encode_init(MPVMainEncContext *m) static void find_best_tables(MSMPEG4EncContext *ms) { - MPVEncContext *const s = &ms->s.common; + MPVMainEncContext *const m = &ms->s; + MPVEncContext *const s = &m->common; int i; int best = 0, best_size = INT_MAX; int chroma_best = 0, best_chroma_size = INT_MAX; @@ -206,7 +207,7 @@ static void find_best_tables(MSMPEG4EncContext *ms) s->rl_table_index = best; s->rl_chroma_table_index= chroma_best; - if(s->pict_type != s->last_non_b_pict_type){ + if (s->pict_type != m->last_non_b_pict_type) { s->rl_table_index= 2; if(s->pict_type==AV_PICTURE_TYPE_I) s->rl_chroma_table_index= 1; diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c index 4e7bbe49a7..03466a1a43 100644 --- a/libavcodec/ratecontrol.c +++ b/libavcodec/ratecontrol.c @@ -901,10 +901,10 @@ float ff_rate_estimate_qscale(MPVMainEncContext *m, int dry_run) /* update predictors */ if (picture_number > 2 && !dry_run) { const int64_t last_var = - s->last_pict_type == AV_PICTURE_TYPE_I ? rcc->last_mb_var_sum + m->last_pict_type == AV_PICTURE_TYPE_I ? rcc->last_mb_var_sum : rcc->last_mc_mb_var_sum; av_assert1(m->frame_bits >= m->stuffing_bits); - update_predictor(&rcc->pred[s->last_pict_type], + update_predictor(&rcc->pred[m->last_pict_type], rcc->last_qscale, sqrt(last_var), m->frame_bits - m->stuffing_bits); diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index ebed90c729..6ff0491a77 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -1858,7 +1858,7 @@ redo_frame: return -1; if(avctx->flags&AV_CODEC_FLAG_PASS1) ff_write_pass1_stats(&s->m); - mpv->last_pict_type = mpv->pict_type; + s->m.last_pict_type = mpv->pict_type; emms_c(); -- 2.32.0 _______________________________________________ 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".