From patchwork Sun Jan 30 06:27:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33909 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp1769906iov; Sat, 29 Jan 2022 22:28:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJwQqMjENAzqhLrH+O4ymYSagc/kPWfSwsRpQpJ0hZO3AiCZTuSSIW4TwyQ5bvWWX5LQY2ha X-Received: by 2002:a05:6402:254d:: with SMTP id l13mr3094526edb.77.1643524138190; Sat, 29 Jan 2022 22:28:58 -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 13si5535422ejr.618.2022.01.29.22.28.57; Sat, 29 Jan 2022 22:28:58 -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="K1J/napY"; 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 8D85768B13D; Sun, 30 Jan 2022 08:28:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074062.outbound.protection.outlook.com [40.92.74.62]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DF76668B0D6 for ; Sun, 30 Jan 2022 08:28:21 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EduBULUAXdGFrarfhDyehqD/4DFV7jdsgp+C9HdMtQDLJoL2JC2gJP97oq3PpeCfIpfT8T/w+3EBIBdODxbdJFLvt6Is2qrNIcriaVPhMu1fGjd2u6Y750dcJU7vK2r0NtMK+1Yn+ciCdEnTKU1DYlJodeAbaH9cZjBZsB33QWS29EbKwyBQNrxWe3r7ildW0f5Bnjxn/VVIcJ+Ulqgdcpaw/H9yqVtP9zu4RwU8MkMa2lnYlVN6JPQpAwjog5Sq7TbFqvniuORTEBulgZkFux72h6Yt5KPic4bNXyjE5uSGHlBFpKll0eGZk0XOv0mBQQcEMw9fMibRLCSrbECycw== 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=20MP1lkTdB2JK8t6YQGNUsWJ/Yr/gOHFre6v3qTRfiw=; b=Kx7nlyX727tHGO6QU7xjZmXj0xqp7WRQI942869Y9/ScnwbDj/J8ObzqY8ZcQvORAnDt6LuZPixilAY0FF/8n6U4r3czUx2HstqVkJDRr00ZrA/0fR1LzCI+dtjpungEVLUdS44yFCww6dNnPIWRmFKI3zWbI0UmkaNB5p4zMwnvG8U7Arwc/Lwpxzgtf8xh8lG6fHRRoKU9zZpYY4EW/mvhho99QcUgg9rRvD3QYOctymj/eqnkRVfmUUFBt2ZKbWVx0j9boV19RCnsDeyP1LKfSZ+176UM2XUvAkCKUvBOGoPBYVk6h+td8EXmD32a8orjxb6Zaf5pSNeCFwjnzQ== 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=20MP1lkTdB2JK8t6YQGNUsWJ/Yr/gOHFre6v3qTRfiw=; b=K1J/napYLuOhI0WSGOnwL2aHlozlj+uAK70mahVrW9iPVeuZZzU2NfN2FGpN5V/0uRG2zJlxgmlxKLi0T7gxBY6CPp4DDBnUlNCtCjvwLiAiV/1E6OfkgwLKffpFZUxcBHwVdbvHEoH684ClhYsyWMPfFr0KvuaH1PBUfStx6KIJPYIyne7cTpUes1ZuHg2Oyj+RS+JFLugcTg66D306Jffu9DN78gtxAk8dRN0/Xlbgawzd7TNmVc5XpHCYEPfLJ0IKnIq7f2JWJDCkXfX20ulPUHeei0fzyXu8Y24/p6wh7AGYNFNMVb7JF95xgnL6We6gx/7TOwv8REMFttKQNQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4247.eurprd03.prod.outlook.com (2603:10a6:20b:7::26) 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:11 +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:11 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 30 Jan 2022 07:27:14 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [5FrdBCmHf99Q6DfeI/r2jsX3zMcGN0eK] 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-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ea796fbc-8ba2-4007-04c4-08d9e3b9b02f X-MS-TrafficTypeDiagnostic: AM6PR03MB4247:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 10pKIS9H3pEO6iB0UVt8IIiEy/cGipVaJ456jwsSzNtDzaFLUvx4XNPEGX0JHk432szOZTwnVwInwDnbXECL1buLYiaf3jGhCWGzPa+SeMlY+i989Xm/W+M9jWB4yahRfxkT1lEgcRejnjPY6goS5xDom8uvi1x8bZUiEnjuBDxvLUxNgiIpAiLnPf23Ld+dB76NR9qZhM+xjejuAC2ruaMZlugPHwnaq6txLqOjVx3RCJeNELQtGrf9ork90gsslOMWMQNsvYfmRmY/9AsqMQa8/H/mh/tf5q2KpOVY0eL6xDuVW/Uk1tm9Aq42WLIE03juDXtEmZUaxtf66HxMPioiNuFvcxjRwp4aGD6IqMLd60WBT8hhPKxvHcaZ15/ww7cnaZQsimV4SRLH5CRozwpqN7GsF5TlmXQsdiZm/NHZETQ9NfoET80yhEhdL/aze7ShytMU8Ytek15Oy5Z53M1FTIEHhH3fBvqInWbtnbEViXcP3LASPJjVm8wbKIj6bx834oVappbGkD2fcNWp+FinRJdE/OG7u+zQAEL0g7m6CnymsT8x+k9c3VqHhErs X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: P3oK6P/9dAm8WDSmoEFzrwEApyA7TC4C00ceGTyugXRkjWcKJr3ZWAJTb5ZOy/6E1zXDgvuOp3JNsYGzVPna3mX/SXt3IG6rF2/Ddis2+2/98TzTUhsXVqDSyulJ8gAa4HsWGV2oGvn5oPUnB3awXbnpk0DJJCQ2F/SlnBNgc2ixvE1H1dnCzh8nnVkZ/I2B6IEaDD2kHMedMiIuIE5T/VQ3qwoDtZwYTXEgiM9deMTbzqspRi0K888znGGcT9Vir5KmoqDpPEQQ1KeYBI6K+Awqtft+HIZ6a07BIB6471hMpny5eow9otdMEJxXuG2cpMjhtZldHRUrRo6+UDzupUQKvj30HyXk5VhDUKvo+16XCFro0OyM1NZY3oVAQQM7KA9/n3ySnKpXl7Yua8U1/5YpnFdwwml5AW3PsAq9w0har6i0KPESWQP58V+F9+6GFIIgutD0Zzm1JtHeeeUvDbbCAFkGF4elZ7xz8eFqk8hQlEJyxSyWLAYh6mFVTsNrAh0bfvQPaLSnsvs71LyU1x3SyrDVuRqsbXbPoid4/z/1PwckBfsKYvYp0XSMd+XN74e3CERuWbMcUHTs4i+8uTY4+fLtElRHddu21DAumhpUvvDN6GDYseE652p3dd7F9QzVKRdO+0uYaq2vzeJV+z1q9ElpG1rJvwMYBEN9vjZGKDK0GhX/TgsKbhjeA1dKOhAj5rPIIPUrYhrgXMa/LIHSX5kn5PP+QIG+ZzhgbU06N4bVLGi5yyi1F1ErcCiwEXJhmVkihya87G0z9P1iRtcoVgocxyHwGyYoDl1CwANbgNDYD2+EZV880zdpIMt156H2YHp4VIJSw12wGNOgIBvmm3Ip/wIMdvFBrKiZCuSKxmfWyAI7OR+CSSGGxzgysjxkx4hSZT8yBVt6gM+7hYyFvrE9kuN9fLQag+C05LD+jjloY+4omOwYnlGMfVTzq/pGJ3dSAk3rHYKv9+ZAWw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ea796fbc-8ba2-4007-04c4-08d9e3b9b02f 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:11.4743 (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: AM6PR03MB4247 Subject: [FFmpeg-devel] [PATCH 06/41] avcodec/h261enc: Pass PutBitContext directly in h261_encode_motion() 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: c2hCGyi2c4tF Signed-off-by: Andreas Rheinhardt --- libavcodec/h261enc.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/libavcodec/h261enc.c b/libavcodec/h261enc.c index 13fe5bbfb2..7e3af1ff9e 100644 --- a/libavcodec/h261enc.c +++ b/libavcodec/h261enc.c @@ -140,13 +140,12 @@ void ff_h261_reorder_mb_index(MpegEncContext *s) } } -static void h261_encode_motion(H261EncContext *h, int val) +static void h261_encode_motion(PutBitContext *pb, int val) { - MpegEncContext *const s = &h->s; int sign, code; if (val == 0) { code = 0; - put_bits(&s->pb, ff_h261_mv_tab[code][1], ff_h261_mv_tab[code][0]); + put_bits(pb, ff_h261_mv_tab[code][1], ff_h261_mv_tab[code][0]); } else { if (val > 15) val -= 32; @@ -154,8 +153,8 @@ static void h261_encode_motion(H261EncContext *h, int val) val += 32; sign = val < 0; code = sign ? -val : val; - put_bits(&s->pb, ff_h261_mv_tab[code][1], ff_h261_mv_tab[code][0]); - put_bits(&s->pb, 1, sign); + put_bits(pb, ff_h261_mv_tab[code][1], ff_h261_mv_tab[code][0]); + put_bits(pb, 1, sign); } } @@ -313,8 +312,8 @@ void ff_h261_encode_mb(MpegEncContext *s, int16_t block[6][64], mv_diff_y = (motion_y >> 1) - s->last_mv[0][0][1]; s->last_mv[0][0][0] = (motion_x >> 1); s->last_mv[0][0][1] = (motion_y >> 1); - h261_encode_motion(h, mv_diff_x); - h261_encode_motion(h, mv_diff_y); + h261_encode_motion(&s->pb, mv_diff_x); + h261_encode_motion(&s->pb, mv_diff_y); } if (HAS_CBP(com->mtype)) {