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 8D3114AB0F for ; Wed, 12 Jun 2024 13:49:10 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7098D68D8FF; Wed, 12 Jun 2024 16:49:09 +0300 (EEST) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2086.outbound.protection.outlook.com [40.92.73.86]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 11C7368D6A0 for ; Wed, 12 Jun 2024 16:49:03 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nOzZLtONmJ/BXmboUjwd+o7hRHdv5Vxzwgg01W1ebNNigxmjIl+FLTS80KjzqQJcqOEBD265P2Jx2Ams/lrLA2Yp9TTGltfFBpcAbOTn+9vwzy+j9L9esHXjyCRzkmCgmtmirxFLralw/SXW0gkuyD7dRb8dHzM2As2LTib3z44svEWdk36EQvJBLtJzuoBdXYTVz02Ozfr8SqY5Mv7CXgFkY1RV+N6x8BmQfnFfMl2SfcgyJowGdgnuOnUk6jzcQBbKer7XTnhNmTdxLQ1wP5NwIR2+mrsjJrbt96EjA1JwBrJHuWsP28WZcddgpNAvRw3F42JkmCxTSn5FdLUS2g== 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=9bWb5cd4/jEpwi7kMDlIuM2tKAiz2fuZSztXK/YT34E=; b=mv54XqJYn6x4wJX0VqFaw0pP9kHpuq4X9GbsWa/ch1aD0YBkrrjrBOGs7OPJx7e+di251xX6bp4RSu/0222GGolB/o/wedycjkAIJ0omDt5GlZ2mTW24zpycu4RREBdjfs55UfX5gyvDFRP3UYBeXG8tYx6CYF9n4yBt+YpYXXCHkrgX3rjtTVw1jz56ipfXf1dNOp4zt1Y9I3/8m6Skh8zXhWWEil9UjUVn2vDeVxDL/GBwaDlNT7kk/fqoyNy/ie+hsI13+nD4vpTJm+9jc+c9watNqc4OcrMPvBVSiFUKnf0Tm1C0hTfIqWME+1Pq5sXdOIGX3gr1lX+WVeeYNA== 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=9bWb5cd4/jEpwi7kMDlIuM2tKAiz2fuZSztXK/YT34E=; b=hnG0YVeuaZcS8p1hrZxWJtQF4tS/jcM6d5mfUyWVkw6Ya+S6GSfk3C0f35PbsiK8hr7SpIUbwhJboBskAZXoIRhiK6Lb4sbcvKyLhsGoWlfnmBL1wxgWmSvRT4VPDCoTAxH7feIHm3acCWHmbDx4VvsTewfkZ2Q+VtrJTjpBlq//g+Ey+PebDliXpVkdB5S+4I3ROeSiKWpuXJMyA4Xeq5kWpNTbG1C30wIMPBZd+uuJ5dabKTpt8cJYOWeTFWj9JIJ+/iIn8OWKRoVTicyPI6bv8eIQLBMuHbxHsoLFP87dMoD1nCzbP4ADxfSXABpbNOlVRMBHASl69MQbRyOm+A== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0262.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:329::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.37; Wed, 12 Jun 2024 13:49:01 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%3]) with mapi id 15.20.7633.036; Wed, 12 Jun 2024 13:49:01 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jun 2024 15:47:58 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [HEqj27wuXSVm/Kg9eg7FtQybdSUXbyg624LotoQlr44=] X-ClientProxiedBy: ZR0P278CA0189.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240612134853.2102377-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0262:EE_ X-MS-Office365-Filtering-Correlation-Id: c77f9287-4aa9-414d-b521-08dc8ae66a22 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199020|440099020|3412199017|1710799020; X-Microsoft-Antispam-Message-Info: CXkianvWi1lkFJD+VE9jYh1Q2SzgZvqi4Lli5T/v0GFnLUbvX0nSGhdIOsOcJEc7OCWFc1NO8BQ3AmNuitNmESVcsD6wL8Yx7yDt8fzphaLNhgGlT4ajUWrWvUG0CN7rWYZmrIteN5rZe+AC3xBJRk5iOOnvkX85Z03FQJ4PTmnzVblHElTtNZTT2udikitCOIquM4lH62JJXJIRYp00zKSjk54zJkPVUuAROSbailuuc0FuZFi2kNYji2Zilql0eFZADlvGcIMnofQE2Q89fkGU3GOz8+/Q+NAua/Uo0GGeLpHiqo8dkjvvxxdjWhxBrgaSWXJCQR4ghqHtdjx41z/SKc3NHZrxouKiac2ELS1VGi7kVNmB+HAfkmsHvtb3wpBzCT8zrNMWQQ2gl0tbarnD33ZIwmwUObHGH6EBedtiwv6RdNEH28q+13wvsbVUFsxgUMsqvhx00oxp6ni4lzgTdw/o0vBTaywONV4Tb7VDYojQBUge8tuxaNjQv37e1VeaSwX/WITeax6zMafq91Lso2dsLPKggSIhZ2Xsw2zWEAxvwVr/BG0lMGLrUbzpy0PfdFemop9pEoM2ISesCSYLLYv+VvY74fo1NS1lFTwy9oa2WsWbYufVMeGRzauO X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?GJupVTJYkYCK9xCD6u319gkDvDazbmirjlqypqmhakslBnfNPmrTrBVxsABg?= =?us-ascii?Q?1bgLkm2BSKouZ971DdzlycHQARc9tSUz9Nyhu4xkOtdm7NEJ6Yemy+Pz3HvI?= =?us-ascii?Q?tI3+TGoRYruuOMAUD4PEk6hLaFLHk6hcihcIdzjG2rdzA/D+MlBtG7y0TGQ1?= =?us-ascii?Q?Zm5xBvuxgdudqqzUrtAXxOqkD9v9WBhbD39T/Px28Qj/9x06yhF44jgVeGcb?= =?us-ascii?Q?Cxl5OIwRw4uKPK0qnWB+LAGSjshQ55mN/pejESw0ldlco7jKZRr3jDp9ZVKV?= =?us-ascii?Q?5q7oex2J3lkEGKfBXwZPFZg5ZgvsIq2vL71hYcTUFiXApJYQ9ZFSslSx7TAG?= =?us-ascii?Q?xAvhmGS8m7DYAc4PF0j2tu5+lNd8Oox5LNKddlo6PVNOyDQ8QDs8bFNSbXqe?= =?us-ascii?Q?BjR9ZGl12aRkTn5KFm//uA1iclarUm4I55rEyf6zeHVKXRmgbq8jghpacz50?= =?us-ascii?Q?UNJc8hvJ/Qe5KPen63eQupjzbQ6R9pG3NcUnn+jv0CGKzVAm2cKzgOo6LX+1?= =?us-ascii?Q?U8P85ZMWSy8bLC+HGr4eKcZVf11nCxTzfYAMJZ3z5AZ03aLfqpfP+LbJfaqE?= =?us-ascii?Q?HqFxx+GdI4m7kd58/kzN4U4WOfhMHADCmJHexDmONDLIqSF2D/IMn0LKoqXq?= =?us-ascii?Q?j0qHxbiTxXLSV4VE4vqFgD+iTMzQ1o5jTdVuD2gOHwg4h3oZhIO4PlNFDsKM?= =?us-ascii?Q?aq6iNEDCpaIZQiXxmbtDBugMG6ODWaDpGeXq28nCVajnxzOKx4Kq6vzksPJd?= =?us-ascii?Q?KD0L9Zt5a82pti+BvkxbiOf4cPL4KgUm5MZbc+H08Pft91OsdKtxoJvQGY4I?= =?us-ascii?Q?XIbe9NFnrxSY78G9zhamC+euARngildEl+WgPc/zusQP1ivXlIvzqQEN8dui?= =?us-ascii?Q?ecLiqI0xpE+97R4It5ZcjgpPwFz9LeLGhSVZb7rmc6Lut/soIzj+h4VeqE20?= =?us-ascii?Q?2VCppwTin+Kix/ohaCbhSKvcPs3f3i3gJcL1QsppPXwZ3zG8vHfvBc8oMtn1?= =?us-ascii?Q?SqC37NWmrSNRjSQTogB6V6x5FD5J/YsPPBOR6V/+XOzbq7slzItKAK1r6RBG?= =?us-ascii?Q?FpumKqIHXlBmtNhIdlNQtcDUTWNZsvgSjrVLw0LHcCakwrxOK16mEXyJf+HE?= =?us-ascii?Q?SrUNxg3C1t2k/NwRKvP40DAu/If+KpiYp4JnsaolDdLqCT3DkVBOc14utrhW?= =?us-ascii?Q?pBF5yk8fcjfOX401hgrb+wGKF3P31BMRJRAdPkGlrJ3hc2EyR9vIb2Pf3GK/?= =?us-ascii?Q?xXinxeJ2kuhgbkU8Rz0w6vqx15Ix7UkbMc014XDfDQ=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c77f9287-4aa9-414d-b521-08dc8ae66a22 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jun 2024 13:49:00.9511 (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: AM8P250MB0262 Subject: [FFmpeg-devel] [PATCH 02/57] avcodec/mpegvideo_enc: Avoid branches for flipping no_rounding 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: Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index eda2305630..6ad5b0eb39 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -713,6 +713,7 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx) s->modified_quant = s->h263_aic; s->loop_filter = (avctx->flags & AV_CODEC_FLAG_LOOP_FILTER) ? 1 : 0; s->unrestricted_mv = s->obmc || s->loop_filter || s->umvplus; + s->flipflop_rounding = 1; /* /Fx */ /* These are just to be sure */ @@ -746,6 +747,7 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx) s->out_format = FMT_H263; s->h263_pred = 1; s->unrestricted_mv = 1; + s->flipflop_rounding = 1; s->low_delay = s->max_b_frames ? 0 : 1; avctx->delay = s->low_delay ? 0 : (s->max_b_frames + 1); break; @@ -1829,10 +1831,7 @@ vbv_retry: s->mb_skipped = 0; // done in frame_start() // done in encode_picture() so we must undo it if (s->pict_type == AV_PICTURE_TYPE_P) { - if (s->flipflop_rounding || - s->codec_id == AV_CODEC_ID_H263P || - s->codec_id == AV_CODEC_ID_MPEG4) - s->no_rounding ^= 1; + s->no_rounding ^= s->flipflop_rounding; } if (s->pict_type != AV_PICTURE_TYPE_B) { s->time_base = s->last_time_base; @@ -3576,8 +3575,7 @@ static int encode_picture(MpegEncContext *s, const AVPacket *pkt) if(s->pict_type==AV_PICTURE_TYPE_I){ s->no_rounding = s->msmpeg4_version >= MSMP4_V3; }else if(s->pict_type!=AV_PICTURE_TYPE_B){ - if(s->flipflop_rounding || s->codec_id == AV_CODEC_ID_H263P || s->codec_id == AV_CODEC_ID_MPEG4) - s->no_rounding ^= 1; + s->no_rounding ^= s->flipflop_rounding; } if (s->avctx->flags & AV_CODEC_FLAG_PASS2) { -- 2.40.1 _______________________________________________ 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".