From patchwork Tue Nov 9 17:34:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31341 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp1461430iob; Tue, 9 Nov 2021 09:34:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJwjRkkylGXGF4y8COMi4oH2UU+7VC46q8iI0pKyvFQSA5oNp8v7azlhWYAHRZxulLtVXZaA X-Received: by 2002:a17:906:1706:: with SMTP id c6mr11985510eje.343.1636479295450; Tue, 09 Nov 2021 09:34:55 -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 oz17si44668617ejc.12.2021.11.09.09.34.54; Tue, 09 Nov 2021 09:34:55 -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=P3ZbfHEF; 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 5299468A7FC; Tue, 9 Nov 2021 19:34:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065038.outbound.protection.outlook.com [40.92.65.38]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 15180680A47 for ; Tue, 9 Nov 2021 19:34:45 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=crcFXyz+PGIsKtswLsTIJTuTN6Y3uibsb2OBPqZ0VlRbRXwDrCURUcG5vfArQOq1iq6xWRpGh8TqDOBphVXhtWh4SC1jey3S3dcmRqdE0pcHck+UgXT2oGgEzrtP6JWrMVCYI8DBqC/c1eXIcVxC8q23trTOZkc5dLUKHAlPsTPpPu+VEwquKoeNVi+gJ1iIzKP4l1tnEtq0+FkSe3OBz9/W00zkoSV8WJsYak/DdLHhViF8XpPJmDU46m2sASmf9QvJ/UypofDN0ZHFPWoXwFezr9lgcBCvY5Wxy2DMJ14Qh/sutX9ZeKvD1ELRRWvovXG+8T2K8HooZZq1ZyQQAQ== 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=KtxsFuO5UpkX8S76NWSbqd2tHh0K5oqIR8RUFU6mppw=; b=BGXHvnNw3KAECrV1Jq4epV0BNmOj0xH/NeyxEBmGzKMgtqIDtCYwY7yxSWw/1JmFHDn0wHrjaqFynEV4I2r1DOc0U3r0iUKqywJXfwLgByUpNU88NunpdbN9FaFFPA6jiKV8AfeRlaSPHgR+UHvk0n87CN5vBI4TTfOvpdH4cafrwE8NMe5FxDFRh1RfNkP8IKizQR1vHB6+EbLQ6UeYM8sBT2xmrVZNHwmfDnwdiMYlt67Pkpn3sCptrTV9ftJKAzCxJO870wupLCrHVOYoj9ndiUF90P9kVEun2CrvSiJ2EdwC6xEMmSdDBtwqybIlJ4KO8K31Yp/zjHLszsjblg== 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=KtxsFuO5UpkX8S76NWSbqd2tHh0K5oqIR8RUFU6mppw=; b=P3ZbfHEFRihYU5kTVMLRAVNNk2Rbg0gHFAqw3CzIe+1aUT7sitRCrF6/uL+7iXKGO3b9sk2D+/TRL+Jl12AmMCA/kLV31ZDc9EnjxPMDw0MhU8j6CF7u2JB6ctHM2JAlRgSA4KO1GtcsuhlGP7McoRVtWQQA1lLOob6xlDh6/f+f0BGT6IJS6Z6GgAxXsZz+0ruBx9WC0pprM2cnhfJ156u+UZDcim9o83UuvMoJVkSXpZFposErtHrRELgXS+bkvsvLIih8VAYCN0SMWajN8CJ0f7Hcekbyb2mt2plzQ80tPoEQncg1S5NtYtdanjsR8HUwVGgsW5rK37jQbjW4Vw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5766.eurprd03.prod.outlook.com (2603:10a6:20b:f9::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11; Tue, 9 Nov 2021 17:34:43 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%8]) with mapi id 15.20.4669.016; Tue, 9 Nov 2021 17:34:43 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Nov 2021 18:34:19 +0100 Message-ID: X-Mailer: git-send-email 2.30.2 X-TMN: [keno0hcJuSyIqOYT1UcU036fTtoHNezp] X-ClientProxiedBy: AS8PR04CA0156.eurprd04.prod.outlook.com (2603:10a6:20b:331::11) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211109173435.880792-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.171.90) by AS8PR04CA0156.eurprd04.prod.outlook.com (2603:10a6:20b:331::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.15 via Frontend Transport; Tue, 9 Nov 2021 17:34:42 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b3242850-16cd-4dc2-bbad-08d9a3a73739 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRIlshE2JAC11E3nazVg9Sy7WzocP4h81bnOBBeB+a1YrmunVSNJO+vKbY97xghAwUdv1b4T8ycDKywVg7jmsjA32JObY464cuR+ne5mm2a+g3nWWeGBm8e3cOKiIbB8EAs8m059IfNLK1XAhgvC3COZInMmQeAgXWCgZLttZawKyuCg5YGmG6Ayb9n8OuQ6OEMpOi/YvGRt/de9LVrfYYcG1KqXK7/lsdEsuqqVSCIKEa9p375Ux2Ev46BNRudnYGf/Zgr9Z0zgVSyuKzCmSanPMHeSgzPN14zEgSWWxF2MvwIJKDITjnBeFH4dDSIn4KCae10txRQvSPa3RdSjnvV5lvGKJ9lCROJou43Trih5jJwfFAdpokbKzP9wMl7iZ7gTS+kPjLrvZ4bwztkFxeGmpR3WlBtYRqjvAgpG5jecicGsLqrciu2nIDLuL/X40hN95V4Zryz4aNBI5NOxDCn5rfuKAJbULhtwKP+S2d7HZ+D635n444pZQWwawQ2fm1WDtua6n7kF8uta0pZNlHz63AwOVqwMngxSpJ3m53ktmkNSt61cIUAvQzhvhCl8ppYZqgwcMYeq3s9tjGpVNMARSGCcU//RGf25N3mZYN6MguFuNu4gCmJJ53afbCpo0mS6J67kX6ETHrw8wn3rvJBd3m8lu3+f7C74VCWmUifBAbY6kr55zaC/yAMvdW7NP9QTOXH0e6raCrRDh3wzdGb+Yc+eu1PvqG1S0nan2bYd9379B35FdTpFC9gEilrQXc= X-MS-TrafficTypeDiagnostic: AM6PR03MB5766: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Z1xqrepo0+TWpjSH338x5q6TICOn6EeBdUbrFC8CIzMh/IPzAfGHh50RBEdVQKpxxyI6Yu2ca1D7xjgf8TslzHi8Bgg8a8ZNJDJOdFvI2i76lHwxqDxHvnZC3CCJRGf24GK17aTpmVoACU5N1CI7bqBCKVrM9vnzjKz7lTZDqXr18iygAyyRErcn86eVuw1X4soKKAJUireQk7SAc9EB9Hj+Ykk0DuUqLuzJTBZI5cYxSKRHHsCvoCMDhmi/C9IaJGuAKpHp5B/QkUxiSgp9/+Pal25BgnIazaFrppsva+/JsHCQaYQalW9dLN3UDryD24g4puaAVgAJnSkJzhVH0t9/Iivbt8uCnwmjvweQauUjFd+n6+n4ACKlgl9UB/Z0O861PZwwWueglLjJwwqVW9qqPy6L9+gNQ+x5mQKuFEvNkDV8IDv7Yih2VlAoq1uBYLz/dtEf8hchl9F/aw/deOTuUijGDI2qMcnkEsDIsLF1mqn2b0A1+2PQc7qwYM+JNEgA4yFOYQjjDEBHrcRbCemW0F85CBoaDzK4BvXbiM4= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: mL5NwkAtePaQy+PHhlony3NTrWLyWLGhyZBTalMixDCEWZRrHMbl/RmBhaXqlX2zawk7lcTeBPw18220Qp9yDUQYP4ou6C28c26qSbYxMY6BZcxm3fqaeYU92YSNVNsSoZJgN3Ka+1oKIej8YYkkKxwjyT67fxa0ZsuJeXnJOOrpiS+/rZoMu2++rgPyuHSGB+MkIETXZr3FVtWievo3V8Vv4mmar7H5IRbmLtPbk9KT14rjqDvdcwVUZK3Dl7tAV3eszDcJgJsppI5JfPweIRZuC9wIzrh/7S457w4ttjPEMJCoVBSX0COQhkuC7UUd45TfVjmBGMtJz2piJ7gJHcgP43oWI7O3hV6iLS9tK2H83Bd9PDt7W6gJylbBe0wW7rC3Bn+o1elfGVud4V93whvZoMQjf1mNB9+xCFXfGDwTTKnfOqHDqweiws9maRPwsrJbGNbZ84zim+ntRduzu2xAPmbgcXIGuMAjquUJJ0l8UknM++MlLnBnp4qo6qkPyB3qi+5jNlcazYsjk8ZZWKewuZYxssawz1RGaPI8X/bnmsC41ir3teAA5Gi/oisadtSLybWgV2AudSFB4yKbVf3J2B7hBcZD/Lo/I9xL2eD4b4DxOwShLllwYE4ISgLjjT1Uxee9kDErnvzlMPfvS5Ga9r/hMtyTZMRafKMCnfsxWtcgZlxTWim3TNTMUi00MA6qrfN4YE1QSRF9ku4FDA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b3242850-16cd-4dc2-bbad-08d9a3a73739 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2021 17:34:43.5433 (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: AM6PR03MB5766 Subject: [FFmpeg-devel] [PATCH 01/17] avformat/mxfenc: Auto-insert h264_mp4toannexb BSF if needed 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: BUYaNL5XKBF7 The mxf and mxf_opatom muxer expect H.264 in Annex B format. Signed-off-by: Andreas Rheinhardt --- The check here is taken from mpegtsenc. libavformat/mxfenc.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index c36ebef932..d1c4d43a50 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -3174,6 +3174,22 @@ static int mxf_interleave(AVFormatContext *s, AVPacket *pkt, return mxf_interleave_get_packet(s, pkt, flush); } +static int mxf_check_bitstream(AVFormatContext *s, const AVPacket *pkt) +{ + AVStream *const st = s->streams[pkt->stream_index]; + + switch (st->codecpar->codec_id) { + case AV_CODEC_ID_H264: + if (pkt->size >= 5 && AV_RB32(pkt->data) != 0x0000001 && + (AV_RB24(pkt->data) != 0x000001 || + (st->codecpar->extradata_size > 0 && + st->codecpar->extradata[0] == 1))) + return ff_stream_add_bitstream_filter(st, "h264_mp4toannexb", NULL); + break; + } + return 1; +} + #define MXF_COMMON_OPTIONS \ { "signal_standard", "Force/set Signal Standard",\ offsetof(MXFContext, signal_standard), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 7, AV_OPT_FLAG_ENCODING_PARAM, "signal_standard"},\ @@ -3249,6 +3265,7 @@ const AVOutputFormat ff_mxf_muxer = { .audio_codec = AV_CODEC_ID_PCM_S16LE, .video_codec = AV_CODEC_ID_MPEG2VIDEO, .write_header = mxf_write_header, + .check_bitstream = mxf_check_bitstream, .write_packet = mxf_write_packet, .write_trailer = mxf_write_footer, .deinit = mxf_deinit, @@ -3282,6 +3299,7 @@ const AVOutputFormat ff_mxf_opatom_muxer = { .audio_codec = AV_CODEC_ID_PCM_S16LE, .video_codec = AV_CODEC_ID_DNXHD, .write_header = mxf_write_header, + .check_bitstream = mxf_check_bitstream, .write_packet = mxf_write_packet, .write_trailer = mxf_write_footer, .deinit = mxf_deinit,