From patchwork Wed Jun 5 11:40:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49575 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d792:0:b0:460:55fa:d5ed with SMTP id db18csp320187vqb; Wed, 5 Jun 2024 04:40:55 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVqStP7vz9X1ZgiH9HJofBObG1Nksx6fwnrbY8MYTxY5VZcJkGZFTjiMwLuzeOb9YqrMTV/qBYwbTCmL2So/IzTgQwv016MHTOLYg== X-Google-Smtp-Source: AGHT+IHbEUsesM6YXJYHXCadCH6ZRi4g/UKsQ4Iw6vfmFWgnFhPmDhr8YXlpdU/xAWeEkFZw4Shr X-Received: by 2002:a17:906:2494:b0:a59:bdb7:73e8 with SMTP id a640c23a62f3a-a69a002246cmr151862866b.53.1717587654989; Wed, 05 Jun 2024 04:40:54 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a68cba4058csi413203366b.646.2024.06.05.04.40.54; Wed, 05 Jun 2024 04:40:54 -0700 (PDT) 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=YKYXk3aA; 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 5C48868D6D7; Wed, 5 Jun 2024 14:40:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02olkn2092.outbound.protection.outlook.com [40.92.50.92]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 078A768D6A6 for ; Wed, 5 Jun 2024 14:40:37 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZaezO8pwyrEcjqrb/RwvvSUFxrX/SV59nzW6LQJKJ46PjXFU0hW8dA1NwsFAXrbU+hUaS7if+9Ki2e3/uYfb3/U8/0G+Zb2ohTqGoG1G0JeAQJazQfHdAatVNw0S3TogcLTeT44byXkI4fFkovH4pVhm1iLjVOg1FuKHqc9GsbimpkXyXs10niB8vzjHejpuig/nVagVrksGqnFGNHU1UaiY/Yl1VFJFht7pEH2mrGco3HEtTxR7fEPCWbFe36zyj+ncHvK2GtSZlCjvsShQmlpKQfGQDLJpFkgtLf82rSerI73rP+iir4jIAKC5lGvYoH2VJfwK9a++Lw4jlHonxQ== 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=mtRNp//+HAkeQfBb/AWhsDPujumhQ9YRBCoQSGsbyl4=; b=my72/bi+2Icm3ZbuJ1mxcTGPqRHmFojBDiIokmDHkYRIHbqBw0sgrmLpyUPtDcJBzdcigf5ZWm6OQrv9ZfL0jx59YNra3ApQLN7CSCYhobr+5C01osD0RSp+AhTwd/sKDo/HTUyCga1IhSzhSevVKtxB1v0dMIhkVitCH4DZ3D2bM0tD8Dgq+bAHqcHuCZPWVBEufzEV35Oynv7Q70iQumsTJ1oBRw/GDo9W8+qS6+SlYfvLAAYj2alCDiPASW+/PhZ3O88lNqRo0KEGX3gpur+4lyWh6jH6R0TC6PsnxBgEGQbORADfivMx6Bm/Am5vJcuWAs/LOIObVMcHEz1nqQ== 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=mtRNp//+HAkeQfBb/AWhsDPujumhQ9YRBCoQSGsbyl4=; b=YKYXk3aAwUt9aTDjThuEKyVhEYHFqzwM4IkmAs9waQSJegltql4IEPSLD/p9zAXkzBptLEE7RSCKCsssmvmyJQ0mUeyZXTJ53CtID9W74fF0Q+AfqZqLw1VI1J993I/tPf6+8ZSbCGx94N4k646NR26LD8AKYxvUzNmj6C1AI3o2f+dQGETj9AGX+Uu631OKqv6C++1rbpOPnesMy5/Mytoe9pLrmfM6ADeEAmzmJVb09swQzRQy+3K+v0IMlWO+MIQOnmQGgYbA2NRsNbFBt0/KFBpU0c9F8HCr1RZp20u7TMXTeCRkMc0KzQJbnmcZg/L9RKq5MN5NtiHGbIm/Wg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0243.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17e::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.31; Wed, 5 Jun 2024 11:40:35 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%4]) with mapi id 15.20.7633.021; Wed, 5 Jun 2024 11:40:35 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 5 Jun 2024 13:40:23 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [12Co8E6d6fnFTWlLWuICChdgAE2FUbWgC1q6qvkV870=] X-ClientProxiedBy: FR4P281CA0420.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:d0::17) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240605114027.1701387-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0243:EE_ X-MS-Office365-Filtering-Correlation-Id: 3f5ee4da-b028-46ed-9174-08dc85545058 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|56899024|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: j5lYl9jHckr+Iny3i6UB4lhOVCJVSUqn2rakljhR4bkkUmVEeyWMH8n3q8pqS3ASS2uASj9adbHNalsAVjkpIOPrsNNHKQHsOnWsWfqwjpir1qBMSKC2qa7CMHcOk8me7fuQODwHcoDxbN9EKhGHPKMcQcjSBTWNFh8skVo0Hk5dZGZlQnqIzqiC8VyPo1i15evogdY7zHiO/DvedD2EuLtspaxBPDghKHObXY+LauBc7lc0w2PliUT++EujF5VDbkBDZF7w9g3MRB35vvmOkKXmtbkoJeBOPmDMOLuTtDWW2lvEKfhBRua9+hNdEjgoKVTkDtKahOKBztHHeTfKR20N6CObgKXys4BOB6UpUhq0FYaj8dgh37BbN9SLywoPeKpkZAMI6fjeVVWYkuQqI7taH+JL5OTSp6hIuHwFw4R271jJkZb4A1BNPBSYlNtZwU4+7pBEzZB435ZaSu5Bkhsr1BxR1tsYa9rI4xsaycrJQCe6JAS+Q7+3S49HUzRxsgEhY6x1rrnqfDO7UbLBq3QunRhcdMsrp/kj15jtmFprSiNE84UhouwDRlifmMpITsuAR5lHSH2h6C18nleZI7Z0DDR2q5w4/R//WNrGVd/j0wul9LOiLV8nHSxWnUeJ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lKhzaMBAH578VAFKR1pELBIapI1JfYy5N4rcEezz3bMCFy3bO/VdPtH7WoRTQvKTGggwsiA52TSMLJvmjjj62/aN2333Za3m59ywmyObcxAiyebz3KUbXkCRPBSsFpYpwd5VYZWT0REp6yd5HY0CF7z8DqQemIyKys7yaIyZxv3jmAArGoo08TUULtckZnfns1IgjHKtHY7Oi8bpK5YIwU+yUfabqPd/f/aQ1+NoJDaYnds2T4HBQ7QGWrV2pHD4/lxkZluGH2kavFIfh6UJA3Xyii9FbmAioWA3G34ZumPnjv5aJtvqxDlrYBAQ3vqMOe2X5V0v3KNSwjyDFEMvwNvr5YuYlO6KiLsly9+54ZjYyxY1/g4gAWZt/DzDBzkAeECvdbCcNJx24rAUzXK5VFcjPi0ZfA0Txn+OAjL+y8eC2kyDeLssW32fhOpXNB97voDZplY//+Zr6I33PRsjnQiqXYbsd1c87ZRE9iNusJ7y6e/h5SUD3g1MARTLyAAlo3y1QsXUg4CIJZ+9Y39AXD7JLKCRjgQrrhedZs7s/GnsdEs/HgzfGON1+EeNibmoeXFxOLW6R75jvfHsFT/oqfp3tSR/zEXVyGboleGP5XPm5GMj4HZYlgWuYdKaVij24BKeXQmWCCu3omGIsDDMKqy7y6Xmje4uomOjfBkt64nhlKCRv4bK/CsZw0gKUYLyDR9+oIliLe6CU5OInkMUMCkx+hLFAScOP4mBPYEycuAAsPI1Qge8900Ll3D6/p4QMKm6cTR7/5+mW5ExfxoPitSIMOCJcv+HlLKsZn/7YrbVy7N+YwYi0bBXyxNGXkoXq8plW6TgH4lME65mE7J0QJ9FQ37jSNVOzkQenAQvG1ZV+2WpJgI+H9dLcnF1WAAH/eukDFwzEcrExe1Ki7f0JVOZjzns99uCYVIH7OmbSGwlKGEDwTMek53NV4U5Y46skkxmNd+IKa0gvXjmkl2HaCaqlQ17wheD6YzluPOnHzXO4xVz4C7xj6eC6MQlft/s3zp/xfvV4JcaquNwD5jpukeERI3dXpaC+uMhHMxT6j+dipxFK/wWQAHEAk1V8+cRPUX1CnSl6Zov6KPUP67tEXWgKLTTG0s6VHcIMX0MmlesUVnq3inPGh5ZbrI6AZyac0G/bwpJeCGMJ2hXCUJPuY+LKX62eTZxVwkcwKJKZ8RxLok9GWH4hL8fVnKA+qo8uRovmlV5IQ8g4S5pAdfrQaBlVrsqH0RebObLRpr80yciEZ0eID2WlB9ufZ8L/GRiJsX4WgCLGufRalK3YBpRNQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3f5ee4da-b028-46ed-9174-08dc85545058 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2024 11:40:35.3310 (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: PR3P250MB0243 Subject: [FFmpeg-devel] [PATCH 3/7] avformat/vvc: Don't use ff_copy_bits() 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: hNLobnA/vFlV There is no benefit in using it: The fast path of copying is not taken because of misalignment; furthermore we are only dealing with a few byte here anyway, so simply copy the bytes manually, avoiding the dependency on bitstream.c in lavf (which also contains a function that is completely unused in lavf). Signed-off-by: Andreas Rheinhardt --- libavformat/Makefile | 1 - libavformat/bitstream.c | 1 - libavformat/vvc.c | 4 ++-- tests/ref/fate/source | 1 - 4 files changed, 2 insertions(+), 5 deletions(-) delete mode 100644 libavformat/bitstream.c diff --git a/libavformat/Makefile b/libavformat/Makefile index 1c4d9deccd..af31d6f795 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -728,7 +728,6 @@ OBJS-$(CONFIG_LIBZMQ_PROTOCOL) += libzmq.o # Objects duplicated from other libraries for shared builds SHLIBOBJS += log2_tab.o to_upper4.o SHLIBOBJS-$(CONFIG_ISO_MEDIA) += mpegaudiotabs.o -SHLIBOBJS-$(CONFIG_ISO_WRITER) += bitstream.o SHLIBOBJS-$(CONFIG_FLV_MUXER) += mpeg4audio_sample_rates.o SHLIBOBJS-$(CONFIG_HLS_DEMUXER) += ac3_channel_layout_tab.o SHLIBOBJS-$(CONFIG_IMAGE_JPEGXL_PIPE_DEMUXER) += jpegxl_parse.o diff --git a/libavformat/bitstream.c b/libavformat/bitstream.c deleted file mode 100644 index 2afda37c30..0000000000 --- a/libavformat/bitstream.c +++ /dev/null @@ -1 +0,0 @@ -#include "libavcodec/bitstream.c" diff --git a/libavformat/vvc.c b/libavformat/vvc.c index d8195f0fd2..679bb07a4d 100644 --- a/libavformat/vvc.c +++ b/libavformat/vvc.c @@ -757,8 +757,8 @@ static int vvcc_write(AVIOContext *pb, VVCDecoderConfigurationRecord *vvcc) put_bits(&pbc, 1, vvcc->ptl.ptl_frame_only_constraint_flag); put_bits(&pbc, 1, vvcc->ptl.ptl_multilayer_enabled_flag); av_assert0(vvcc->ptl.num_bytes_constraint_info); - if (vvcc->ptl.num_bytes_constraint_info > 1) - ff_copy_bits(&pbc, vvcc->ptl.general_constraint_info, (vvcc->ptl.num_bytes_constraint_info - 1) * 8); + for (int i = 0; i < vvcc->ptl.num_bytes_constraint_info - 1; i++) + put_bits(&pbc, 8, vvcc->ptl.general_constraint_info[i]); put_bits(&pbc, 6, vvcc->ptl.general_constraint_info[vvcc->ptl.num_bytes_constraint_info - 1] & 0x3f); flush_put_bits(&pbc); avio_write(pb, buf, put_bytes_output(&pbc)); diff --git a/tests/ref/fate/source b/tests/ref/fate/source index a3beb35093..d7b48a8b85 100644 --- a/tests/ref/fate/source +++ b/tests/ref/fate/source @@ -7,7 +7,6 @@ libavdevice/file_open.c libavdevice/reverse.c libavfilter/file_open.c libavfilter/log2_tab.c -libavformat/bitstream.c libavformat/file_open.c libavformat/golomb_tab.c libavformat/log2_tab.c