From patchwork Sun Jan 16 23:03:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33627 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp2273556iog; Sun, 16 Jan 2022 15:06:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJz2OWYVGScBow/9Vkcm6EX0gyzFYegC4nn00PrrU4+12g7AwF7BMUAdMUbp0r4BU0O8r0Hr X-Received: by 2002:a05:6402:1e93:: with SMTP id f19mr2824336edf.343.1642374391785; Sun, 16 Jan 2022 15:06:31 -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 t2si5735423ejf.487.2022.01.16.15.06.31; Sun, 16 Jan 2022 15:06:31 -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=DhBS4mVq; 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 E3F5768AF7B; Mon, 17 Jan 2022 01:05:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073024.outbound.protection.outlook.com [40.92.73.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EC8F068AF0D for ; Mon, 17 Jan 2022 01:05:08 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=S+ibp0j2OQPpsqpFPCLSyjE7i5s0zM1oWg/uGncYaDbUoRH883sHBbfhb7uwRE0bfMnJNCIpLluG+TFfKd2/j2SOOECl/JuXFWdrZE1GZcCitmK0jbZQjprjB5S15D9L7L3C3/wc0MBLgZPoDBY+ERY49zuZufnpMGUPkovpfyJPeayk38mA5o6NGoY32kK2BV4gTEhyhO3AxX5GbxqGJDxV/pSqPkIZSSAujiALulTVA6sTGig+z12wjEs2nu0RGm4kXe20S4KxNqdiYtD336vSG3dpsL69Ax5utK+sRORiEXtSjIm/4YRa4oaBRb+0FAcyfgLDyKgRftBLLLt3Pg== 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=sTFjb1xqYLScH2Cl3Jilo4PcxO58PlCrueghTSDQ2ns=; b=mt7z612oXP25P6/Xb9W0+ZSDfFQ6ubCqcUlEtOhldTr6+Em13KgCTJt2uEWRL16dCBXwCWr35ZnHybvoGP89aYT/286zUfbv6aDN7JfkBlvUGuhNA9iNHxlTiGTvEt4cuFKiyzuAtOuUrq8bLO52eEChkp8bHjyPkcf5LwnCPTEJHJ/RWE6LwMrXtrVnkqymNzw1G2CGDBs7tYs5YdbZQLLLrYrVPhcJiKi4RWXMLe0gaPFrrEV8Zl2mCf99nWiaPhx7PZU8N9U8/fvi8w88a7/Vi/JkxZnwdoBuFiVHo424LGc8U/t/kyCVJ0FyM0Ca64DMYYgjUc+YjmgzJidSWA== 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=sTFjb1xqYLScH2Cl3Jilo4PcxO58PlCrueghTSDQ2ns=; b=DhBS4mVqZDLczlweZ6c4z4XIAuE2cGFKwJMag4HbIXSVd8LJOxgj7zs7X3Rrh2sMdlYGg3bXDtcrg0USo2clalwbKK3kBeQ5Lmli4h9P5yGklInj4QcGEjudlStZJML7vRr3dDA2xft0P49+0R8VISjXF69u5paP0hhVNd3aKFLIiIg47IkLbZ0aU5wER7H6wn8PO7xcpg/hV8Ol32AFFQPftE/STr2AEz7BlPodSXn2JuZMI6rpnO4pMwBoNRApM5Qqh1PXblYvha+phA3mvasW5pd4otcGVfDs7TFOkkqld1IILPCvBCeJ4W+FWQapA2dz5MakRAFB2CI/JaTNjg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7704.eurprd03.prod.outlook.com (2603:10a6:20b:403::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.10; Sun, 16 Jan 2022 23:05:08 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4888.013; Sun, 16 Jan 2022 23:05:08 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 Jan 2022 00:03:55 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [c7UEuJ7nNmmYdOQSFvbyVsJgWE3e/ca+] X-ClientProxiedBy: AM0PR10CA0070.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:15::23) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220116230405.194506-14-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 09b0bf63-f5e4-497b-256a-08d9d944a421 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQ2WpFcKeHQajRkhOqduPnsaR+dBYBcj/vB85awgDIRf7Mc9F5/WwArUnEi6HYmXBrS3TyHaPFjDCKYUAC3wbl682lEu3QbzEwr/1aSGhxSzmGIeKNfaiynVVvJ5tZVgMRjNJgR69JazYbVXFRpIOyhtl+vO0qaE28l6J4kpGKVfMKGJK3uOFWPQNRWHIDBLJ2fb0GQksbU0uMAwk5Tt+6CsNeABoMDSlyCjUsfhMQk8fbYccN2d/LMlwxVh1hk11HEdL2c+CAx5CtexAc2TPeVHtqSlfEf6HKtznhT51R5owrwQXdZnYtsn2BNT5t6PdOPzY0nkrV2/ux9cMo/IUnsxlX3s9lPBgn+lAGLxNiQRtbwzpG8wdeA88EWaJZ739VnSfMf1rPEwI9lY+FY4Gn22kgEdlPmuQVDTMJMM9qdwrIq79QSpWz3FGGEsz4cJJrJh12xeEVM0coFjLjEjcDgGZqOald27YS7PaHyvwgmf+qYH3zGkKN4f8QLymHlaedObN+3+N6Yhbu5Bbst52wB0ED0wFuafuHJaXQR7ekAJpWwAz/Fq6gOeO5l26k/BU6QT/38MX1VI5aG39Ibe87iEkULYaVxyZmpgmUXWhMRymFreCRCH+wvZkSv3TkoNvsz0iz46UzilfalxhaYufPnTtx1azn8mun3593jOcRZnsgl9FJMkC9UurJg/TKhXavEIkKOEe8/zj89SGgUv3DTLVZqHu0WXC3gFtRLSno5kh3Tndoua1n3tq/aNg1Rwyo= X-MS-TrafficTypeDiagnostic: AS8PR03MB7704:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LJFkKIb3Wh2dyvFvvDvAp5df+HkTVqYBsT6uK2VssRrTQD4kUH5lG5U6MCo+UQiERDif2QPAn/5tXOnXk9JDWbr0t06lX9EWqeEjL+GnvbKAOcTmkjDKmuc7mgyJlEKTlVYVL+G3ghqTJDsQqNXRm9TwV2PfeDzdsVawIvDqflPtGzbS/adrPX8FUDlKVHVYFu1YuEneCrMg+njtpiPR9cJacgCdDsCetefuUFB6k6N/q7v2YyPfQussrpcbcimOewWCp/qJSEm0K6hE7schUHoJbzsVWWbtxOpDksXmyrEiUv+XINj5LjP+sHomRgkfk7+Ida1rjyPD42ilcJF0R/oeqsHUq6UCx8g7ZtEkfRYaqmtpAGxcP47Np/u+5qWPkICpjps5qtw7fDX/rX+t4vS6mesR9mykpmrH8OcGhp5SResloUfxdKSOvVW/934jPExXh7ChYStoTNg2TBfN6sJr5ecWNaGepVQ9Gfi6LZ0MC4Pqmjxz8ivcqKG8YcuHqB+0bYquCse5J/3fbPq+V8n0Zrp9g0zkHnpSuZqCvu3P2jWCkXOij8ORZEk2B2YJcovV7BPftbSzNmw2pXZvDA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: WUJcYO8+TuaEVbEP9gX9cK70QqlSW4B/+3Va35f3M7LlF0u+E1o6bsW4ETIHOpoB3CaKL8fb3aNdad7s8M2v7Tl2Kg4H7h87780UzTXifulIGl+olMNodmoSF/K1pX5WiaOZdMHcWNs3Liki26t3vQYA1ag3a67GxjhOFvhQvHLyirvm2p6mjkbdlhjIWpteDLHo4KiN7z55qhxAR00BHjAY5UNSlwHJMVJmialeI+JMDmUqNeAMC0RFQogDB34MiKkEUzKvMs3pwofZ74vtVeYw5vJfCUN30+RD4bwvbn1RusWNa4GeLuvTQLmj9fhmE0vMyrbWTEJBqYix3K+LGB9tE74026sPTjEwRbPuKp/u2ZdIvxV+lDz91Ay0dmEa39Fc6BHSp6g01VWSSINMLkDy/8ecLcK2cAqhs1rpeaCGa+RMdZ6d4A7frxEhvqM4WyJ6SkHmv0FLvxCxIEteSAK2q0DFgD71z00Nh4EOCQb6bVgIODuETb1V9q7fLpVoMzm6ka8jJJ3I8/q5LiXTINczYfcqeoNJVyO4bfyoZ9b4XIDthcUkLr+5LMYb05NwYr8TyboeOvwHFI6dja8/YriWr9kHV7hJ1NDGPkk4mX0zticVjgdwoq+BnY6klDQKL9x/iGXTvyE1B6sW5fISSZasZ+QHwua/QAhJSpv9k7IgcKw6SYbegchzhBXi55UnBrU4H6eRBwkY1wLfUT0gj89RIA0TlIn/vtJ36mwuSbR8PRI59yBZbjt9rwRyDMSsiQYo36/5BVRw6ztxltPCshMHn1weKB4UYZjzRS/U6Y/q0KHDW4O01KzssOYniuZ2vlrMisa9r/sNQVbGQfv21kaJwXoJWm8ZAtEnNy7UDWJwQ2w99NxKYSG/AyUMCy6diR8762bEC9YQxxf9uNMGPA5O2nWu6BW59aXAeQsTPbrCT65PCa3S80+/NQ/YgkAcQR51Gl6TB9wh+Jc7vCQahQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 09b0bf63-f5e4-497b-256a-08d9d944a421 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jan 2022 23:05:08.6150 (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: AS8PR03MB7704 Subject: [FFmpeg-devel] [PATCH 15/25] avformat/matroskaenc: Use common function for H.2645 annex B->mp4 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: Scj7PYq0BOee Matroska does not have different profiles that allow or disallow in-band extradata, so one can just use the ordinary H.264 function for H.265, too. (Both use ff_avc_parse_nal_units() internally anyway.) Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index d275d6cd6c..0446cd6ca9 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -2427,13 +2427,10 @@ static int mkv_write_block(AVFormatContext *s, AVIOContext *pb, mkv->cluster_pos, track_number, keyframe != 0); #if CONFIG_MATROSKA_MUXER - if (par->codec_id == AV_CODEC_ID_H264 && par->extradata_size > 0 && + if ((par->codec_id == AV_CODEC_ID_H264 && par->extradata_size > 0 || + par->codec_id == AV_CODEC_ID_HEVC && par->extradata_size > 6) && (AV_RB24(par->extradata) == 1 || AV_RB32(par->extradata) == 1)) { err = ff_avc_parse_nal_units_buf(pkt->data, &data, &size); - } else if (par->codec_id == AV_CODEC_ID_HEVC && par->extradata_size > 6 && - (AV_RB24(par->extradata) == 1 || AV_RB32(par->extradata) == 1)) { - /* extradata is Annex B, assume the bitstream is too and convert it */ - err = ff_hevc_annexb2mp4_buf(pkt->data, &data, &size, 0, NULL); } else #endif if (track->reformat) {