From patchwork Thu May 5 10:21:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35598 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp975007pzb; Thu, 5 May 2022 03:21:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzmgCv9BBn5JyFs6v+DQgyjbVKnR4vc2IbkgSdbimq/ID6tnnr3m+BUy8UhJ1CvHiUPH8y6 X-Received: by 2002:a05:6402:520e:b0:428:22d0:e996 with SMTP id s14-20020a056402520e00b0042822d0e996mr6263697edd.250.1651746113628; Thu, 05 May 2022 03:21:53 -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 q10-20020a056402518a00b00418ed45e7ddsi1719227edd.38.2022.05.05.03.21.53; Thu, 05 May 2022 03:21:53 -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=rb3+GBDv; 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 1BCF068B3BA; Thu, 5 May 2022 13:21:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074084.outbound.protection.outlook.com [40.92.74.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AA3F268B240 for ; Thu, 5 May 2022 13:21:43 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TvBw19Fjgz8e0V14IL4tbky92OyBe12WsZWHL/tKm5qXi+GldFfvDOTUozLt3JhOi08KhKNIyNfSH/ntntJKBludl2RyavvK8HRWKXKcx/N1OSp8+GEom5kjdGdOXSQcFw1DmsswrKfOaZZtUz1NTJJHBurh8aEDSLrXxSqYtHdzF1P/uo8Ff39rrd1sCd8uSFjPFtTdi11/GSwPeV+CRSouPK5+goHDLFqOFsUclshc3i0NXpjuRzkz97Koq3YwGbIATUIQ4FPa4cqnz+al/lhaNYLs/dFCCvtC462HSy/8aR30nbaw35Az6GOteR9bQuPBP1qGgDUbVeTXY6cKvQ== 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=XjX3oPkS+GICyTiv2dZpGaKIAYWQaNNs4thypSVmoDQ=; b=iJQ9NXSjr7TkTG6ylS8W6F/r1cn0RKOzFh2AT3+1JHyqLN14nHxi54+KqZ4VKoOCR0+tgqMozxglvIraGqZ58ZQLgu/dTLt6W83mII3akMOfz2d8LfwsGDtSRSLzZJR4DHKuay2OfUDPXIM+cnrf9Km74EvkmPUAHwsKZMfPFAyiAm0sBZQOnkl7XinPBKICmvpzV5dsX+7PC0FsGE07weH4hgv1oXp/1GPcimGlsfzuKHiOJmQ+Dxn7qyH2k7eAXUdxTJiwlKgdKsEnG6kupRvVYqrygtYVg6JZvDz2kmJky6M9SEchFVW2b5NMGHMMe23iUq1nr68FODEmFfzthQ== 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=XjX3oPkS+GICyTiv2dZpGaKIAYWQaNNs4thypSVmoDQ=; b=rb3+GBDvXWT8+tQsNnD8EKOUmpLEzuzQwwPPCiwTIuVIbm2jrghRD5nxrwfMdzqYDG1oJdVYtj6HIARos9l3z4jT7bo6dDzZHGnt29YCfCr29Q7OO4HgDkmr9N3WXmccPtaFsWWSIOniBYr4iqVPwRcLLiaFGoTiQTTczrfabvs0IYyxsxb6UpIvKpRLhXEbk9Dh966VwpzH/Q3UXualp/8r3moeYwEKNGCQzCTG08UzKL5jvPzfbqez9pqyEzIGjMSsZCq0GhIKxKEU7NWMAKlb3YHb9K4vo+pwpdT+YN6b0mcz+QhCwRQlh9IzRxYI526CyIdfdbJJvCQroejLtg== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by AM6PR01MB5158.eurprd01.prod.exchangelabs.com (2603:10a6:20b:95::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.24; Thu, 5 May 2022 10:21:41 +0000 Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::1854:2c30:7ba1:c431]) by AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::1854:2c30:7ba1:c431%6]) with mapi id 15.20.5206.024; Thu, 5 May 2022 10:21:41 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 5 May 2022 12:21:28 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [RcLYDi4daYoTx2JmgrwuQwvOVKTqZX0b] X-ClientProxiedBy: ZR0P278CA0049.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::18) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220505102129.3924826-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 805d0391-0dbe-48c0-caf4-08da2e810b24 X-MS-Exchange-SLBlob-MailProps: zswcL9HXbeW6zILrs4w8QiGrWVLGSDAlhvavuQfGPIMEIF0yBOySMw8ctZeWDaA9BcirGE1s6kUJNq/uIv7TI5BLOjXwW1BoWDzFVz+LcnJ3Xr6UJqgG7xf1ewKi1KYID4HrFSLalzR84dk00BG2RQjZXfAPZgN6NcCAVBn38ezaeJIFvOCA7c95CikAa1J+RniPEubi0kU8I9a92pN4CWHkatvofSA029tFoRZlA17Ehyvdu0sy7Y5g8ygyz4fxhfZVTkJimU7g+0tmOLfAPap5V+I9SC0WVdS50m27u9gL6A0liwXHAnSBHX4DO9s2rbPiFc7cU6ZZ+j+EmJP3Dx1YTEPXKIB3y1LvoeBQhHSNpfo/NVIxeGSdWteSz5L0AQZ1k6AixaBu+hwpHG1s8hCUdLiIzXR1AvNoOwJZJ3KSshAzaiVy+Ji8HLq6jnBs12fPdDBdHVS858iFGmzQ/2Q21oEVufHi8lLl6OkcMWLB4sOyGsiE6doLkCuu2K7Z/TF+O2dCfYyhcEjS6oSY5ltV4EvSVpNS+4a6Oqj+WALzGwRkH10gYrfGaedAlGMRom22xYuezHQiG7ti5acrZcmN/ZWcRsXg9C91/4gkiLWYR7doQymStAbM7cSkg6rZgLBKBvQlK5ioPCXLYuNxBy/edfgZIZa5qUHc09LcHYKKJlb++Stq4Jr+IjJ4CtXK/XhanNxOGGYCNVNhHVNIgIFlt9NQh7RgqVrqfyVPYkO+paNBh0Ash+CztGRQ+tEc X-MS-TrafficTypeDiagnostic: AM6PR01MB5158:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BJya1NlNLHftohmwDuohRJ1IdZVXglrDazXKeZQAlnYbVSiagdbt/X/IDzh+udz8HHHdGEgiMzJmazjx4aeMRpmqRm27O4xrphhuytDIOKWRtA8qW7Fo7T1fx7pzVHmid7bZpx5Eusr/2OVkE6cBDUpZXyXZ67B31MrsE+wyJqykdbWtH6IbrXLBbDg+izb1c97fvbnk+UmYRwMn0YXco+UhgEyFYTQmGINrghf33GCTggslpI1Ln2JuQuq+rjMswHR9m4u7L0Pw5YYqq7J4mFMQ9WYtWxhDvyBnpG+KEEszR8BFZ0XBFZgXmB5No1DZ6M7T1n0h82MCSZ6HL6nqy3jjsk74tnLmhdOVMa0FbURahuMX0yDOQ6SvWFP7gL87JYed7lGmt2x+UtWVz74fIJShhanS0y/iE/U3Aw3zBJW4HYy8/8YbTMsQtxNfGHJHRNbCUcrRsJw+KSvyj2Prr/+40SRdaARNJtu1HTgQK1KpjsB/iGY8xckEj0JBOxQH4pd4wL1HIP4yE+yiATrce7W5E8q/HP9VrAPNBCCwNBXcWRPIFJv678ni8iMPBAHi6CB4vJbMuAJ3pjqe2maeqRiKSPQ0w0ipylIP4QhBlwEFuPyJzo5ypOlvkvuHKHmlzu2DYsKccLIFwtkIFQbhqw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: cWjIJ69tOx2wMVGOA/4ZyKOutVFSantnKK+nLGSHLQ3lzk+vsj3QiZZFGL8jBDjnGg/qgzwVP5qQto1DMkPJnjjX03NNPvsHpySiNLgJ1Q1lBRnlkhpLkY9pn4L6Aq4SHBqdzYdSEVMffdTqZpAg84CO4xMgW6osi+NXZcTjl1dzQlQG0tuSSONyobk0K0O5wLPO0tbAG1VXRti0Nzgi2agQ+UNDXxyPbewVzsiqQqfyxMV5pIhQrfrqf/vsSQ9JWcq6/5FyVST2xPOMyxzLE/apNjKpSqhMp3S03TP1gEIsUu/9lhh97JxfO/jVYXUGvlOEMwvOLbbX+1tKgPRXZ2jic62T2IsErf1tne84CupGuw/Oscvrij5JcCatERbZTjzJ29PldAXbnW7+5/2prNFQ0dLO+9YJgYJnlHz9pAbwVWxLiNYEQoNo3dj+hujFgDPOWsKSVu4y+3LCTwhZ7vouNZQDMq7GFJ3UuUYHih9fbeRV3dnS/8kfHo1xfzcDtK6WmdoNBxlsGZb62T/055Ruy1HXn0FRzso7yzgWRYkBNznbm73pongfG3iYLrlcUr/MeauYFLHfn11oUNw9EppIFGfiXY2B2A3In95eCkjOIDgXHJQU9PiMmLs/ofvKOLiqtsHRHMsTP87QnP9RIBnpOjqkAEfG50Kig0oHfpnKts2OPux9sSJOrM9TH0whPjKuEFiY4zBRiLY7ieJfhgTOa+8ECuoV3gMOhYo/Bg8767JiP8W6Y4WzpgZH8k1prgeX0+2JlBXOAJ4rBMn0hOiVXkCzzG/Xo5bpVZocUYER7FNmuKGeJzlu2b3PAy5MeWeN30H51y7shv88LkPUiXlnli5DZfEj6kn1kQ19L2R7i3mUA4hgjDOkipZpfEjjhrb1mnQyGDYjEHDVv7oEnCstNHTuFY/+CUc4S7kFCS/ghIybxuzfSLoOtV8UJOW4GQv0Pw+9n4SivuBUA4oxsKS3ydMfpLqBm+FESRTdS43mEL709pFROXQbXMrlcuNmP+uNowzCOBIBpU5Mbek7rBSXssDTUiijrAD42++iP6X2Hhrcz6FFNoecEmU1TlyDzL9e2HATz93ArUvtptXr/8HYkD+jVZiNv7+MxrqXQ6oAfdh8D+/DBXZOOIdF8gLaO5hbjlNTZW6lIcKdQiAWmp3UQjjdg/ytSp10No2sr3OkWU6sULDUe6fnLvqbCcSpFC2Nf1DUV8R8Tq9ysFZ6q+C663ISuaNrrf/kaZ1E5bjLk1zyJaJQv66KMStfuUDrl2E46QvsyF1L6CbvlZbm3yalAT2tzcpZS0uYR6avBuNMuHc0mk1Gu8+y4ZvamrpvfErT9/t6KGVT+yXFi2fE6J5e1aCeFiDj+IJf3FWalIdKq6xtHup35nvkSr+DYipWZ7EH6VQKRtfXu5PZkvoed4DQPBPlq8sTumU1fF1ADZmShuTENXqb1cYBNAaYGCC4UusEJewmqvkDGbmRYwcYnA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 805d0391-0dbe-48c0-caf4-08da2e810b24 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2022 10:21:41.4716 (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: AM6PR01MB5158 Subject: [FFmpeg-devel] [PATCH 2/3] lavf/matroskaenc: enable PGS merge auto bsf 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: John Stebbins , Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 9758KRUjW60T From: John Stebbins PGS segments must be merged to one packet for muxing to mkv Signed-off-by: Andreas Rheinhardt --- configure | 2 +- libavformat/matroskaenc.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 196873c4aa..4d2f4d9112 100755 --- a/configure +++ b/configure @@ -3435,7 +3435,7 @@ latm_muxer_select="aac_adtstoasc_bsf mpeg4audio" matroska_audio_muxer_select="matroska_muxer" matroska_demuxer_select="riffdec" matroska_demuxer_suggest="bzlib zlib" -matroska_muxer_select="mpeg4audio riffenc vp9_superframe_bsf aac_adtstoasc_bsf" +matroska_muxer_select="mpeg4audio riffenc aac_adtstoasc_bsf pgs_frame_merge_bsf vp9_superframe_bsf" mlp_demuxer_select="mlp_parser" mmf_muxer_select="riffenc" mov_demuxer_select="iso_media riffdec" diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 3b8ca11f28..fe296197b1 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -3172,6 +3172,9 @@ static int mkv_check_bitstream(AVFormatContext *s, AVStream *st, ret = ff_stream_add_bitstream_filter(st, "aac_adtstoasc", NULL); } else if (st->codecpar->codec_id == AV_CODEC_ID_VP9) { ret = ff_stream_add_bitstream_filter(st, "vp9_superframe", NULL); + } else if (CONFIG_MATROSKA_MUXER && + st->codecpar->codec_id == AV_CODEC_ID_HDMV_PGS_SUBTITLE) { + ret = ff_stream_add_bitstream_filter(st, "pgs_frame_merge", NULL); } return ret;