From patchwork Sat Dec 25 06:06:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32908 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp8686123iog; Fri, 24 Dec 2021 22:07:05 -0800 (PST) X-Google-Smtp-Source: ABdhPJzWc+kDYop/6NdY2KVYurlr+GoalCvr4c6ychhaRGzYWXSnB6CqCcyaf+I3IRFIyCkOVF+6 X-Received: by 2002:a17:907:7f9e:: with SMTP id qk30mr7234010ejc.238.1640412424845; Fri, 24 Dec 2021 22:07:04 -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 i10si4267755edx.463.2021.12.24.22.06.44; Fri, 24 Dec 2021 22:07:04 -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=qKGCv+XZ; 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 A374E68B0A9; Sat, 25 Dec 2021 08:06:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2105.outbound.protection.outlook.com [40.92.91.105]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3E65768AF00 for ; Sat, 25 Dec 2021 08:06:31 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=apek8V+y0/qLckBaYJptQ3hcSWoZLlRzsyqs3/I/DGp1owZcY9tGG2D0pO5O2oQY2GrfrLdXGKC7L2w5MBerR7oOPyXUQQ8hF7vtLbZ6K7N44e3f3tNKFxDAsjX/kiKMV5D3wyz0hkQGgl4P8l/NIiAOlzd4zmVIgxY5gIdetcfrJtvotoVjDTOWKEeJkktiBjkUudTO/fZNgRAGIRgouILRRJ7iO/+ZvK3cDCYxHmHpz/b+Ygeg4KbTIxwgvuDeHTEe9TIsu6yZd6ipWZPcGw8PBVji04+9NTtfQA8d2VxoIKN7u4RP/Gr+mf+V8KsvQtbHPnIb/bEaajTpjiDUjw== 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=1P2Temmq1LD5SQTmf5R1ksfjZMTch0AtwOHkSQ0CGG0=; b=nxnGJ726mYIQ9nPFBuT0W/L35iECWfQXr0ybFgLxb/m88RqSVVcY8TPfEe4aK0urR70amXVEIGnewvKF0StvYFs7D9NcUvj1LFhwPRbn0zrkG8jlkSfczsM7Ex+u1s/gcKxR5Zl+PgF58lbnmrfcP2iuqTd2tcOoX7xoOIf3irO+OY6yLRGyPY3cQ0kzRR7fuOzq9kCs9UWIhmNPnIabMJFqrXXPj7IhLhqEI1d8NcHyXC+FEToBBWfpQaVjBPd0q4aOlVtduEOHKfyLzWefXeb5kxGuY1Y5dqBl6gx10USMbHlbk0Bx5VNowk8dI/yJxfkfs/Sa6RZQHK7aVZp3/w== 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=1P2Temmq1LD5SQTmf5R1ksfjZMTch0AtwOHkSQ0CGG0=; b=qKGCv+XZiNq1Krh2WihYDspGkBM9vRn52YWS5DX+LqdWGJmA3diOxyB3bsdBMHGIjhHmonUIUwKXLjP6Z3niqxRQhNNVdBYO+k0gXCYkzIDRJ7/Q1r1IDZy8ip2iazt4PmOi0R3TPPdMW0rBIGn+EcWQCEAsiKrhqEAAwffHg9Y13Gpaixh/VLnUlkHsVdkjOP6ow+9KonCuelnYeCAU/jJaiW55JNOzfZMoazI8YWJ5+TIdtLvhIPMadZwf1C8AeDk1dcOm3fYCgF+eya7wvXitBLNaP2Y9AvdhW50xvAWLuxlsHZX9M/zZUhj1DDbJm7oWhyDxISn1MKiYFxkkqQ== Received: from DBAPR03MB6664.eurprd03.prod.outlook.com (2603:10a6:10:17d::22) by DBBPR03MB5445.eurprd03.prod.outlook.com (2603:10a6:10:dc::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4823.18; Sat, 25 Dec 2021 06:06:30 +0000 Received: from DBAPR03MB6664.eurprd03.prod.outlook.com ([fe80::8c52:d93a:8d07:9f77]) by DBAPR03MB6664.eurprd03.prod.outlook.com ([fe80::8c52:d93a:8d07:9f77%6]) with mapi id 15.20.4823.021; Sat, 25 Dec 2021 06:06:30 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 Dec 2021 07:06:13 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [dWMNv2QsTq+tW9mFx64cDa3Cf5XnztQK] X-ClientProxiedBy: AM3PR05CA0135.eurprd05.prod.outlook.com (2603:10a6:207:3::13) To DBAPR03MB6664.eurprd03.prod.outlook.com (2603:10a6:10:17d::22) X-Microsoft-Original-Message-ID: <20211225060614.2345147-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3affb2ae-c846-40d6-71d3-08d9c76cb19c X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR3EehW4kxQzdNcP2D/mG1JPWEVVi+qcp9vt2rpLnj9R86tma4zLgf5WM/ECoE5E5JUmvb9wwQr4GV97e+UpgsEdW2WzrGgCKW5wRjVNWbwaPD0TwYHND5RMcYH10MWeiIWCZEc3G+9L7W99/nZ6eciLsHPiVPaRPnvE//4bQOVh9Edl9juS05ge0xcrYs/oBU6OexWxzqD0Nksnku/5xSxpLCpS0JaFRmuAUIiAkNQuI3FKdkI2BzwGV9i8F5gFe8ZHTPnvJK9c9LA29TLlS4nfebIvD1EkGaeq7YN8UYBWiYzhfDWoAn+RtXxkxTPlV9L9hEzvavHBvPMq45FpWMHKoo++5M+XfvRqFMrUHBWehE/X1HUSIvvBel+K6W3MXnwsJmVmC7srDABR+ZbDA8eVUmIpVhXm2cQkd5LUQ96JQpIHQjpnpMc+ejdBby5ua9hxzisQME2JUCNMEauwnRyF65wtdREOBnD747GWQqm643BfCG4medDAHVmfGygzd0tSjl8kmnb1VP5DsZ+Mg0VupCWldzZJyBUX8VfPMmuzXU8DVa8UndEgIciCq70P9qFc/PDFUxgVgWdHrk3DbatjJVaosEsllY3PgT/DFAyXVesV0Ff0GgkFysl+QzS7ULdyq3qSdlXI4VfmLP7AO69NYvkkiaSKLsyFbtVCf90K2Z5YFMJG5nAmq4YIvBHNW8Is8KObe4GcHrxEkOOCNSF8u2imkQsJsv1uX/xyrVo/vtV8MmgMLFvC/zvmvm3Z9c= X-MS-TrafficTypeDiagnostic: DBBPR03MB5445:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tWapMtJ/sXEOHKKKU0dQ1X+exe67nAlh8GX1f7BmEXtp4gGcnk+jiDLQZllpvwa+gvfajyHYY4r8VX/7/N5lyoFH/c71ouSLRZ85Pd149IUF7VGDnv4t2djT3yaqIBa79XKuOwytf/m4sCBktnNuHANiN6onrj5SeMRb68M1gB+CwmL+voTmWJdQqLt8U/nsk9VyGDSvZohPwqltUMxwZcnE90+a5dt2WZO5s4b0eTjmXT04UcnQalBVmVpanXbqCfFLHmpGrp4HwLTIygPr0qJO37iY0J9SaQtzlVcJREtTXUEGrNPQgEG6/Xb+0sqXYS48QNkcDePpIqt8Mtf/EgjDvN/zK3BwvIIPe03L1NMXzLi4mMrFWjyJZjvu56ceHdoBaS34xACppMev0faGzMkj88cLazb79wjHMnvhvljIPap9bPUvwLaidkFKQtZOnvk5uY/16j7s7MTELei2TvP1BixxzqG7aL2qQP3FOhZT3XSF+wnyYPHINt0UdyYJ9fVp/+K5MO46gOY+8/NMH0CHnIPfvr9pazuAaMKkaNA6DMMfmVw5vYXenK9xOAlhxaroPScwnqc4YxWqtHyMXA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ObFDw58U2Wb0bBfXuYfkSOtYcAW3+7bP150MojybXzAhrNs8v3+IMyuwhSZOPurtxtciFOaHKCly2o12HcA2r5LgPTdItqjC7C5lwjednqG6wA1nYij3G/cFgWfiaoinijXWaFNqeiEjzaQfY5uAXzaGkqwWYSq9b9eHS1EXEMAfUvx2umAXkvd5TufGUr5CpibxBSmCBXXpwiCSir5NbU6aqZf00fMW8zfjYSZ249n0+9zDdEmp2tjGSfaXbe0JKrbplEsbPX5FaW2VVUTdJ2hxaDpGlsT0iiLnamK+pL0qmoqK2Q+cp1wacIvrqkxzXsDc/fTzS0SOaP+UpvaTQChwto8WAvxLzqdoEf9ww3dNY2rpZ41McULRSqSg0xXN0jpZvSngzyPiWIQSClvd+k3vx2X0P7Cy/H9TznEZ4nw309h2umX96SkSPngleVag+iTem/ghOlF+HU5fwX12Uq4Z7voc50U1DZHF5OX4QOcyg8Q3LHT+NffF527pMwml3kQOBSHQMvMcLrrt6Xgfb5aNeHoaTuGaWtcFnJT77+QuEY2lhakfXQRpeutfj4Ge/G/hW5Vy1l58BBO8cjmxyzBPgna5UUHx0qXzvsr7/lmS7rNIT3mTI3yK/xl6si2Tm2J4kqRE1ihEyFY0kd0yjCX0jaset1QWc2igACAAzAIoc7JcDvzXC3gBEuK5n1znTpPr827JjXq+yHYUngc7UutSGMzgnJZkOLEmKQYVuY0WhiJbqfzaeVwVsp1u28FQ87RowyjYXsjrGUfzYL2MiOagq58L2ci9/KlPR5P1bPAuoOsPviifc+zZ5SDaymLtJshdHSFE2OwvPzE5C50BEShNkp/aNWlIn8cBuR4BUpheqQF84Hey+oq/oxQS0e86IOPFAbD9tf5kq9d75EL+bUc6VSi1WfXB7heUBsoaPXYDJ7es6O1OJISha/qZWqdS74GK9K07Zm4FbEQKyE8ovw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3affb2ae-c846-40d6-71d3-08d9c76cb19c X-MS-Exchange-CrossTenant-AuthSource: DBAPR03MB6664.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Dec 2021 06:06:30.1582 (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: DBBPR03MB5445 Subject: [FFmpeg-devel] [PATCH 38/39] avcodec/mpeg12enc: Partially inline whether codec is MPEG-1 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: S/9E/lGSAWKX MPEG-1 only supports 4:2:0, so one can optimize away the checks for whether one encodes MPEG-1 in codepaths that encode 4:2:2. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg12enc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index 1437ac421c..97d497d619 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -776,6 +776,8 @@ static av_always_inline void mpeg1_encode_mb_internal(MpegEncContext *s, int mb_block_count, int chroma_y_shift) { +/* MPEG-1 is always 420. */ +#define IS_MPEG1(s) (chroma_y_shift == 1 && (s)->codec_id == AV_CODEC_ID_MPEG1VIDEO) int i, cbp; const int mb_x = s->mb_x; const int mb_y = s->mb_y; @@ -789,7 +791,7 @@ static av_always_inline void mpeg1_encode_mb_internal(MpegEncContext *s, if (cbp == 0 && !first_mb && s->mv_type == MV_TYPE_16X16 && (mb_x != s->mb_width - 1 || - (mb_y != s->end_mb_y - 1 && s->codec_id == AV_CODEC_ID_MPEG1VIDEO)) && + (mb_y != s->end_mb_y - 1 && IS_MPEG1(s))) && ((s->pict_type == AV_PICTURE_TYPE_P && (motion_x | motion_y) == 0) || (s->pict_type == AV_PICTURE_TYPE_B && s->mv_dir == s->last_mv_dir && (((s->mv_dir & MV_DIR_FORWARD)