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 780084A833 for ; Sat, 11 May 2024 20:59:51 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C3F6D68D7EE; Sat, 11 May 2024 23:55:17 +0300 (EEST) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2086.outbound.protection.outlook.com [40.92.90.86]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A0CC668D7CE for ; Sat, 11 May 2024 23:55:16 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PVeG2+0/rg5mZ+sexzbUkYCzhpRg5/F8T4SgjR3yGeETgRXg17Xs7h4cOVKgZwU5+7NW5Praim7jcQiASUHMCvTmryg9TpxnXJwKC7T7Si9Bge+iUMinjcGjNY8KL0rD3kdp0s4H6NNw4KXulU+f3pSFYlvhl4Pqy5UIbVehmY7JrFh8LTrNi3SEs/M0ZHmpcm8+xlsK3BLN3ShW8Mqq6E8pMA7A3dIYiaKJ0kIpybhQC+yuOrYD9YwgMMmaY+1GcP6hodT7lDHg8E2ITFzEFrKF2i1WmcJNUAwdMVKY5u9ThivsHB/kT0Ye1MpRBQWeYLG3Buia/cTgc2PaW7pNqQ== 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=F7wq9e42+45fJzpaZEF0vkgEXcnyCmO2bVVrkE6f9Dg=; b=XJyiH8ssbzaUPxjmH6k6cFMbhugHJoXIkkn+xUd6xgJD8D3kgBrxD+1774sV7gX63GVGJGdwaS4s/JMtwnmOz9ivyvptfdqDnR8q0yeJISEmt0Q8NqUgXrLwJ+7f/rQg5VpkTHQseXST7QXx/zJYl1cFAizCHjKtBy0efh2/1wVxjR4i09fSiJ0JVwK8/kxJKhAGnoyBE5dr/jX+41K+yBE8bvxHbt6AhqZlrMbelqK09rzpuReqpf6as6sM0uywszBe/oPCy6x4UQxBL6FrBE3go6AvUP/7+VrLyG8rq6hr7j8U3iLD6NcanpyWSDFlpznpfZReHfSJmr1VbDY9ug== 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=F7wq9e42+45fJzpaZEF0vkgEXcnyCmO2bVVrkE6f9Dg=; b=ZLjtBVfogcwYaCEBt3e/H4e0i2CzdEHMxjWwQE4gUep8avhuLGCHUrF77OzN5v+LAsZiyUIT6JknIwUOCoil4VnaDfzvbsYrIfoBQI6I+FGb5LXGrVUJ7PCnUndy8cgw5cQowKDEqNnTEzNivQwA84YXLW6KrFx4B1MBvfiM3+GxdiNPNjrEh3RhlFT4ICcgWhyWolaej3yYaQh3mkuOYpwYosYbMiKOXzaW0evb31kLjSj50vl9KHSt3hGOAwFdMT0VwKWptFOsHIYBL1Q5Zj1yCC7H0y3q2jizImzThOHU1pYZsPK69FKVjabQdeoCr8to7NoPtqav7Juhb9dldw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0070.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.55; Sat, 11 May 2024 20:55:15 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%7]) with mapi id 15.20.7544.052; Sat, 11 May 2024 20:55:15 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 May 2024 22:51:20 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [oDseiFh6NzQyBtlojsM7ZBa62kEjP8MqQ4/QJb11NCU=] X-ClientProxiedBy: ZR0P278CA0172.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240511205135.2411886-55-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0070:EE_ X-MS-Office365-Filtering-Correlation-Id: 110e29f0-7dca-4483-8f91-08dc71fca849 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: RZlrGYhH20O56i011Yx3YU7Ld0KF12biKe147wWtXxD7PIpaJExr2Qt3tHM7t3adyG6iCRaW598Kaa1xmVJbwIJJ8+B3a81AZU/Shu/iC68chpB9FIxL1ZVSbXA7wYNH63VHb3XUA9eGkZF7Y0TKR2ALoroDmyAZu8wn8rbUEU6JBWTOOUb3cPlbNVEXrALOxNHCWecKJ/tnciiCUgGHXkCJz1Scg+U9rW2t1HtpgT23YxNjG1D+Mie/sqqtse2K44Et6rVgCBFNpHU67tepEIIch/zb+W64wQcUcXRtM436k0F6XZYQGpCYfBdXi4kI/byoX0WxHstYfI3OrBOrOxxrRsfoSZqrf+77HZ6glKFXAEH6cuc9Ik5Gx9sqxaje7XQP6rB73L90mz/75HPATNy7YIPEW3cmCh2vCZesnYDPt/q11qDNcWxOZrIS4ptLaXVVKJ8ZT8LZ3Uo5eLA9wuiUfI1+O6HzwdI0Ty9g6hqnw8D2I5O25jziOlPDmyBXJnbzMYruz7evD/TCPW9O6A8rspvWGiVP48mnrCrVOVPbkjfTYucqtD1Ze5HYSkJWVeoMZoBA6ubNCofG+dlKJD//2I436nQEHJuxaq8BABRbmu+CH9/h21BVxoGcee/9 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?tkQ3oVvgrjXsqiOsYgmhM6KX9Hcz+a6kLVCblAsOhL9Kq66+KpLfJ2u+paAE?= =?us-ascii?Q?b5ePg94GotsA+18XZEsdC5vylz4tZ0pCQdwpasRyo1BZ1KyXoFHfiz0m6r+3?= =?us-ascii?Q?c8DNDZiTf81ggiZzDOWNyTTk9UZOkGYPr91fWkKYCzXJ7255DjtnQNbDxEFZ?= =?us-ascii?Q?SyDPFjxQLiwqb4kYiqRnMsOI0/svD9bcnP1ZaNr/vEJk+KzMGXzQ1b8phMYy?= =?us-ascii?Q?YG29CpTvUmiitOLjgo8B6qLMk5USoEUrnZHFkEBaERdrhwcGS5+0sHROtwgB?= =?us-ascii?Q?zjwfyn5unpjTx+IUs7prtF9HoxWh+uBze8T0LbyM5lix0eEI98qyA4qZs3ux?= =?us-ascii?Q?uzrc02mlZfqU7mxyabgBSULBLY6a0MCofxwqPvNAqMLAvwP9MfujDKRqi+qF?= =?us-ascii?Q?QepnhLSgNp5lxQXVzYkgqcefEHT/D+tpdujLuAl7KTU87HFB9BIUwpvFMhuX?= =?us-ascii?Q?LfiQZxo7/lPQcH5Wls+TvlFo5jduq8FBY3H/eDHIvPRU0e1KslWJwpAPwJrM?= =?us-ascii?Q?if9O768/aTPbs0wKF7kqf/85Rzw3n1Mr32iFzPjiq6XdwIBh3/M76rxytlMr?= =?us-ascii?Q?ksGOw37uRRpVFP7fbeii1dMVqEM1IMq45KfQHteMfD94R2pm2K4+et53sJes?= =?us-ascii?Q?S0ZdUBSNrHPFGDF59oPmU0b1d4JcI1jGItGcdDKUNNAxzoUUZBIjWtJ9NQZh?= =?us-ascii?Q?U1LYkVMjzUqo3flAlnBHMQj5pb8cQlC3IjfGTgJHIBT92m7HaM87dgT6DqLx?= =?us-ascii?Q?Uwd0hgp+5jpxrOoLrJ8o1fYEt8nMMik2js3SqaxoSaUAc4T7l3lUSqWJYeZZ?= =?us-ascii?Q?Z3FRwHA33gzMt0dg1DcYogiVTHs0eqLbKpsdRQSlDaaPV7k/uuQz/dRXOcSK?= =?us-ascii?Q?s5Z4uwLMlyT4uw0l3vWyO51WX0nAk/BL1W8gH/f6FUwBOZufz9V2f8h1CiQo?= =?us-ascii?Q?0pVjZ72R7Bp0mCqv3gC4W1ImSRUfzyJzur9id3slDflo2YgHZ4yuZtSAxXKZ?= =?us-ascii?Q?odCrCb32YNO6jf7MwZIz0uL4xgKhWgpaSdzGtmHiun4C6NgyiFsMy+4Nheh7?= =?us-ascii?Q?sIMoCd4nFF6Jrp7qP+o6GMTuGHjaf8eCy2OXqkI4Loed0h8LWQqf619ZWY+V?= =?us-ascii?Q?6GDbPPJc/4vd9vUUy+WtvoJmEwQr9WrzDJLmkuMbUl3rk1SZv7jq0tgRj1E0?= =?us-ascii?Q?yokdg6jWgqnARiWVheEt3rWqD++aBfq7v3nkQpgcJknnlklcKdJKqwF+l6hI?= =?us-ascii?Q?97f+3SLeGSek3b5PZcTYwyDeWM4GDk8+PmQu1nCxew=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 110e29f0-7dca-4483-8f91-08dc71fca849 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2024 20:55:15.1223 (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: AS8P250MB0070 Subject: [FFmpeg-devel] [PATCH v2 56/71] avcodec/mpeg4videoenc: Simplify writing startcodes 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/mpeg4videoenc.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/libavcodec/mpeg4videoenc.c b/libavcodec/mpeg4videoenc.c index 76960c2ced..583ea9de6f 100644 --- a/libavcodec/mpeg4videoenc.c +++ b/libavcodec/mpeg4videoenc.c @@ -883,8 +883,7 @@ static void mpeg4_encode_gop_header(MpegEncContext *s) int64_t hours, minutes, seconds; int64_t time; - put_bits(&s->pb, 16, 0); - put_bits(&s->pb, 16, GOP_STARTCODE); + put_bits32(&s->pb, GOP_STARTCODE); time = s->cur_pic.ptr->f->pts; if (s->reordered_input_picture[1]) @@ -933,13 +932,11 @@ static void mpeg4_encode_visual_object_header(MpegEncContext *s) // FIXME levels - put_bits(&s->pb, 16, 0); - put_bits(&s->pb, 16, VOS_STARTCODE); + put_bits32(&s->pb, VOS_STARTCODE); put_bits(&s->pb, 8, profile_and_level_indication); - put_bits(&s->pb, 16, 0); - put_bits(&s->pb, 16, VISUAL_OBJ_STARTCODE); + put_bits32(&s->pb, VISUAL_OBJ_STARTCODE); put_bits(&s->pb, 1, 1); put_bits(&s->pb, 4, vo_ver_id); @@ -966,10 +963,8 @@ static void mpeg4_encode_vol_header(MpegEncContext *s, vo_type = SIMPLE_VO_TYPE; } - put_bits(&s->pb, 16, 0); - put_bits(&s->pb, 16, 0x100 + vo_number); /* video obj */ - put_bits(&s->pb, 16, 0); - put_bits(&s->pb, 16, 0x120 + vol_number); /* video obj layer */ + put_bits32(&s->pb, 0x100 + vo_number); /* video obj */ + put_bits32(&s->pb, 0x120 + vol_number); /* video obj layer */ put_bits(&s->pb, 1, 0); /* random access vol */ put_bits(&s->pb, 8, vo_type); /* video obj type indication */ @@ -1046,8 +1041,7 @@ static void mpeg4_encode_vol_header(MpegEncContext *s, /* user data */ if (!(s->avctx->flags & AV_CODEC_FLAG_BITEXACT)) { - put_bits(&s->pb, 16, 0); - put_bits(&s->pb, 16, 0x1B2); /* user_data */ + put_bits32(&s->pb, USER_DATA_STARTCODE); ff_put_string(&s->pb, LIBAVCODEC_IDENT, 0); } } @@ -1071,8 +1065,7 @@ int ff_mpeg4_encode_picture_header(MpegEncContext *s) s->partitioned_frame = s->data_partitioning && s->pict_type != AV_PICTURE_TYPE_B; - put_bits(&s->pb, 16, 0); /* vop header */ - put_bits(&s->pb, 16, VOP_STARTCODE); /* vop header */ + put_bits32(&s->pb, VOP_STARTCODE); /* vop header */ put_bits(&s->pb, 2, s->pict_type - 1); /* pict type: I = 0 , P = 1 */ time_div = FFUDIV(s->time, s->avctx->time_base.den); -- 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".