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, From patchwork Tue Nov 9 18:01:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31347 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp1492134iob; Tue, 9 Nov 2021 10:02:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJw8Mr5Fgk4Rg0CvuwAVUjXityQwFCSJn6pil4fLnCtZv7gq36X8YxrnMZX67G+b5dXf9MZD X-Received: by 2002:a05:6402:438f:: with SMTP id o15mr12649750edc.235.1636480935327; Tue, 09 Nov 2021 10:02:15 -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 cs15si35266029ejc.331.2021.11.09.10.02.15; Tue, 09 Nov 2021 10:02:15 -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=pLN2fd7V; 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 B04DD68A9C8; Tue, 9 Nov 2021 20:02:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067068.outbound.protection.outlook.com [40.92.67.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7779268A817 for ; Tue, 9 Nov 2021 20:02:05 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KtUVolu5nR/S+NZYkQPUNKdWXrnH7QkBhnty5k0d4PHWljaxdFX+iHlHPgSg4IWHIO5X3bgTWrzzLUX+PLLihzS7chuwgY889ZK+QNu7oNIYSyMglQBHPpiMEEyeZShqplm1tJKH7/GoTQuD0mdOidFVP0V9t0NmA78YtNG7P2L6eTFDSqXaGdcHqYdwmmgZmpzYukHplw4FFnDp3uxd8/Utic6gG49G/om6tIV5bMjA92w38/R3L9n2xegiBlkHRVnTynG/MD1fqWccuQZPcu3JJKsdxyE8to0ep4rhAY6UyUJBHfFNI6BKbmjCCIZ7hnCD32Vp8dWq91E8/BfEtw== 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=W7fJawGD6coAadXPkgTXEgdJcYz7QTnEKd0J44WrJc0=; b=LlTxhoR7qe1lIsBLQSOsxRgSR9Qs4KG8Q6UFKmmO0LKCYYli22qYaOkTlC//bnDe4Pu0TdtqVou3MBzxnn16DW9l8ckDk6wcHJIW6Hq1NlCRvHchTSg/qDDydlSDgrduU51wqgZBnY8QhGeArCEsVbJl47TVfoc2dD+KdZbpxCu7Lp/tVhwDa9ZZrbBIe3fYL7d8KO0IyOVQjy47r2PAeyC8esP8xj+PL7shch3Yyarkd8suf5zebq9hNQM9ZummHNYTgsfW1xTI+VVUFfMhr0UUFpJhonTrA1p0G2CUAvC4NvXakYqDTsVTpr0b3h55e3Mp+ZmSYPntEazeTuHFnw== 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=W7fJawGD6coAadXPkgTXEgdJcYz7QTnEKd0J44WrJc0=; b=pLN2fd7VJeTcb/KOCRFVfl4wEapoZ4MmkgO3pRjZbGZmlRVih3p9+JBlwiiu+uEDjCwvvyoNDa1ivFxpL0StynQP0C2vlsZPsxCigz06w9xFtqeQOk7jP037QQmwiLriPSgPEDEizRq3aa+w/8lo/d2R82eafDjbMlphlmWcV1r16lEkuC5F4otZ8AmiBNOhSDzIptIU9y7e6T7MmjdDJTVPKqo9Zzl4zLQGDinoFaWlNcuETexyeima2Ryhrj92axw6mwsKwMV0/JIu74nRJpLaCy6QggqRzkkxyH05nyQE2+C3fuXzN/7T8tsf2Q5oAcRX1/zoIhQKkLsCF7rlcw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4775.eurprd03.prod.outlook.com (2603:10a6:20b:d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.16; Tue, 9 Nov 2021 18:02:04 +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 18:02:04 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Nov 2021 19:01:40 +0100 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [STOJj/MAGxlQzdRLC0Z9/Wt07T9zw+D8] X-ClientProxiedBy: FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211109180155.881111-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.171.90) by FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.5 via Frontend Transport; Tue, 9 Nov 2021 18:02:03 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b4b519ca-cecf-4c16-5cde-08d9a3ab0930 X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEsZzfSrvjW+wulzEDwo4mtcUNyroHX896XhgkNHPaLARCxTKchXsf31QlothjzpC+G6STRdvTYzNJW3jyUl76+J+tFHitkmZ7gshxSp8WlCeJsEhofojpIQ+tRmTNnylNp5KPDIwqOb8nb6iCpCIltHE6xAFTxCbLeZ3bFQoDdUe907veF7bgZAvzXNPqGtMI9qlsNjwaS6yRE259Vi/zkb302b8N81w70k4Mqnwfl0WT8j70aalfCq4nzX9Z+eTULmU3PqVYRDz9GKMYF8HXn9MB22sPX/IoQdONAKirKE+jHTFwTWIuYU7yKaqN+FyCFHi6RtoTrzlf5Cg7q4hjSNEVg20syWxfpCogHMRFHgi6uyl96Sbw93bhOe9Wtx0UO5N272z8BfERSVJ578r5V5biV+kg5h+r6wqVddYFz/8Cs2DNnjx0FbFtTqqpWU7oBaHXNT6kvv8H3VDvywahKDb9vTwKqiVDdHPIxIYD5ebrYC5oY+/vhKvptfNYUcbmxBBqEr1r5upBjia7tnW5F6vFvEf06lB3a3NiGHQwZxSIsuC+rKKNhFiKO7QARqfLkMi7b70vu8GH560gfdpUeGtxbQS6cSkWb3wp95CT25lDyydIcMWI5NywBMcFHYxtWXdkOZ6mrF/cbKFzQ14/MI7ZdjaKdayuvUuiwl8eul+Te4WVRmtVzXkL/F/QLKKAG1fwNLUS2w7hkFPnTV89HFE9ssTs1Jdb4Dk3prV56AS4PzhefdWvYWd4TvhDljjD6aYxFTt+OyMZxpubF/giQZ X-MS-TrafficTypeDiagnostic: AM6PR03MB4775: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mC3Wf/keDhl6pNI0gdtuvDdFZG//ZfIh9hRoD/ckPxz2NhuXhjRGLklsaWENm9Yt2693LAhlvhWjCoEUNeCK5m4qerQ95Morm2tcOaalLAbwhZ8zKCD3LgmBLMA2TKO2oYJrTYT8b5WdM6ocOyXIY1PoLQ1RAuGrC2DNBq3fEVM5/2CUWYsEpE3hZXjJ/zluxQyjEuQ+bCAxZXA2V1O9f5STUEa7CrNd+EfBjqcHZRYFnvOIDdU5DlFy+l13JOkLAJ6PYJzyQ9IVrN6nVPlWxQj23050YWNkuPa/EqrOQeFvAhRK4NJbpSk0YkaEg7qjay1bKgf8lR6bX2dQkZ4NYrdc43uIn3yjVhdUaFgim0rBOWfV4i0Q0eRmGKyJjaSwLeanf74J9+qTZCPV8A8RhrThfrPeY8OLUEgxLy2Zewuhovi/Z4UiEUdaAJkbAH30HUCVtl489Fy0dIjung9SMU9DQEnwlgbznHd8y4cfiXKItcZh+ny+5cD2i/ADNund6SMi0BZdpBJT20H0EDDwFH5hvNCNcxhQLX8bNdSqBUc= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: O3qB5qhBwyMTkPEPi0ciVgEZgOk4/JqteHWV89Cb5g3phK1s1lomfJo58/yujyWEwj6Ejl5RMBPSFVB1Dp4Il39oH/9PrBNfoL+BGqL35Vvu4vslKLTFur29bDA7/AaHekTlZnL+txGI8coInbXyRykiudTO1HRpJO1bCXfLFj2n8egEHarx/DthY+TH/I0NOA4Qee9i6xdfNMMGFfU2GrBAsxzsu4FPZShczKdxpipxhZwbxTNMYfvfF3gcKsoBa20MdorcMBJe8hkMYRmTCeFLt0TJYTvnb+DEQ3lNPsMQAMwoh/q2EmvitkHpIUZTZhc/ftaZSDqCqRIr9knfnq7i8kOM+UgKZwM6ilmfdA5AxFtETAc+i3JIRzx3McybX3Pt/LGFjHq9lhl+4HDj79SudupNaBZUJWcFYO6MXnUAHFLdpJJiK1iy0DkK/ogFkOoa92qs/xqkwZ0thrBa6jw54IC/i1ntco95clMn1qEKqLuY0g2znm2dBZ2St1O1LLoHJdbLq6DJYuUbK+Uj4XCEAUKNpn6O4yJOnUXDg44sIKXkbWguwf04OPqfjgswyxbi6642VTxR1y8FoBvL6RuI8dBeSmVhtKUL9VYkC8U9Yvhz2QgVzpOr4zZjEJ9zHvMMo0nD2IfXYV6vpxXBNN5DCD02csO8+MmM1DzzVOBDb53EhZtG3mlgFPSpfkM+56HlDGNxsoq3nzdrJIPXBw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b4b519ca-cecf-4c16-5cde-08d9a3ab0930 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2021 18:02:04.1203 (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: AM6PR03MB4775 Subject: [FFmpeg-devel] [PATCH 02/17] fate/mxf: Add ProRes remux test 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: +Fx5radhVCyg Also covers writing mastering display metadata. Signed-off-by: Andreas Rheinhardt --- tests/fate/mxf.mak | 17 ++++++-- tests/ref/fate/mxf-remux-applehdr10 | 68 +++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 3 deletions(-) create mode 100644 tests/ref/fate/mxf-remux-applehdr10 diff --git a/tests/fate/mxf.mak b/tests/fate/mxf.mak index 3a1096176f..f96f4a429b 100644 --- a/tests/fate/mxf.mak +++ b/tests/fate/mxf.mak @@ -37,6 +37,11 @@ FATE_MXF_PROBE-$(call ENCDEC2, PRORES, PCM_S24LE, MXF) += fate-mxf-probe-applehd fate-mxf-probe-applehdr10: SRC = $(TARGET_SAMPLES)/mxf/Meridian-Apple_ProResProxy-HDR10.mxf fate-mxf-probe-applehdr10: CMD = run $(PROBE_FORMAT_STREAMS_COMMAND) -i "$(SRC)" | sed -e "s/yuv422p10../yuv422p10/" +# Tests remuxing ProRes as well as writing mastering display metadata. +FATE_MXF_REMUX_PROBE-$(call ALLYES, PRORES_DECODER MXF_MUXER) \ + += fate-mxf-remux-applehdr10 +fate-mxf-remux-applehdr10: CMD = transcode mxf $(TARGET_SAMPLES)/mxf/Meridian-Apple_ProResProxy-HDR10.mxf mxf "-map 0 -c copy" "-c copy -t 0.3" "" "-show_entries format_tags:stream_side_data_list:stream=index,codec_name,codec_tag:stream_tags" + FATE_MXF_REEL_NAME-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF) += fate-mxf-reel_name fate-mxf-reel_name: $(SAMPLES)/mxf/Sony-00001.mxf fate-mxf-reel_name: CMD = md5 -y -i $(TARGET_SAMPLES)/mxf/Sony-00001.mxf -c copy -timecode 00:00:00:00 -metadata "reel_name=test_reel" -fflags +bitexact -f mxf @@ -45,7 +50,10 @@ FATE_MXF_USER_COMMENTS-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF) += fate-mxf-u fate-mxf-user-comments: $(SAMPLES)/mxf/Sony-00001.mxf fate-mxf-user-comments: CMD = md5 -y -i $(TARGET_SAMPLES)/mxf/Sony-00001.mxf -c copy -metadata "comment_test=value" -fflags +bitexact -f mxf -FATE_MXF_D10_USER_COMMENTS-$(call ALLYES, FILE_PROTOCOL MXF_DEMUXER DVVIDEO_DECODER SCALE_FILTER MPEG2VIDEO_ENCODER MXF_D10_MUXER EXTRACT_EXTRADATA_BSF MPEGVIDEO_PARSER PIPE_PROTOCOL FRAMECRC_MUXER) += fate-mxf-d10-user-comments +FATE_MXF_FFMPEG_FFPROBE-$(call ALLYES, DVVIDEO_DECODER SCALE_FILTER \ + MPEG2VIDEO_ENCODER MXF_D10_MUXER \ + EXTRACT_EXTRADATA_BSF MPEGVIDEO_PARSER) \ + += fate-mxf-d10-user-comments fate-mxf-d10-user-comments: CMD = transcode mxf $(TARGET_SAMPLES)/mxf/Avid-00005.mxf mxf_d10 "-c:v mpeg2video -b:v 30000k -minrate:v 30000k -maxrate:v 30000k -bufsize:v 30000k -rc_init_occupancy 30000k -vf scale=w=1280:h=720 -an -metadata comment_test=value -metadata company_name=FATE-company -metadata product_name=FATE-test -metadata product_version=3.14159 -store_user_comments 1" "-c copy -frames:v 5" "" "-show_entries format_tags" FATE_MXF_OPATOM_USER_COMMENTS-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF) += fate-mxf-opatom-user-comments @@ -53,10 +61,13 @@ fate-mxf-opatom-user-comments: $(SAMPLES)/mxf/Sony-00001.mxf fate-mxf-opatom-user-comments: CMD = md5 -y -i $(TARGET_SAMPLES)/mxf/Sony-00001.mxf -an -vcodec copy -metadata "comment_test=value" -fflags +bitexact -f mxf_opatom FATE_MXF-$(CONFIG_MXF_DEMUXER) += $(FATE_MXF) +FATE_MXF_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL MXF_DEMUXER \ + PIPE_PROTOCOL FRAMECRC_MUXER) \ + += $(FATE_MXF_REMUX_PROBE-yes) FATE_SAMPLES_AVCONV += $(FATE_MXF-yes) $(FATE_MXF_REEL_NAME-yes) FATE_SAMPLES_AVCONV += $(FATE_MXF_USER_COMMENTS-yes) $(FATE_MXF_OPATOM_USER_COMMENTS-yes) -FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_MXF_D10_USER_COMMENTS-yes) +FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_MXF_FFMPEG_FFPROBE-yes) FATE_SAMPLES_FFPROBE += $(FATE_MXF_PROBE-yes) -fate-mxf: $(FATE_MXF-yes) $(FATE_MXF_PROBE-yes) $(FATE_MXF_REEL_NAME-yes) $(FATE_MXF_USER_COMMENTS-yes) $(FATE_MXF_D10_USER_COMMENTS-yes) $(FATE_MXF_OPATOM_USER_COMMENTS-yes) +fate-mxf: $(FATE_MXF-yes) $(FATE_MXF_PROBE-yes) $(FATE_MXF_REEL_NAME-yes) $(FATE_MXF_USER_COMMENTS-yes) $(FATE_MXF_FFMPEG_FFPROBE-yes) $(FATE_MXF_OPATOM_USER_COMMENTS-yes) diff --git a/tests/ref/fate/mxf-remux-applehdr10 b/tests/ref/fate/mxf-remux-applehdr10 new file mode 100644 index 0000000000..cc9ea1df6c --- /dev/null +++ b/tests/ref/fate/mxf-remux-applehdr10 @@ -0,0 +1,68 @@ +1b71f29a5c65646cdcc16f1311594113 *tests/data/fate/mxf-remux-applehdr10.mxf +323641 tests/data/fate/mxf-remux-applehdr10.mxf +#tb 0: 1001/60000 +#media_type 0: video +#codec_id 0: prores +#dimensions 0: 1280x720 +#sar 0: 1/1 +#tb 1: 1/48000 +#media_type 1: audio +#codec_id 1: pcm_s24le +#sample_rate 1: 48000 +#channel_layout 1: 4 +#channel_layout_name 1: mono +0, 0, 0, 1, 57008, 0x43416399, S=1, 88 +1, 0, 0, 801, 2403, 0x00000000 +0, 1, 1, 1, 57248, 0xa06cd7b5 +1, 801, 801, 801, 2403, 0x00000000 +0, 2, 2, 1, 57200, 0x5623da10 +1, 1602, 1602, 800, 2400, 0x00000000 +1, 2402, 2402, 801, 2403, 0x00000000 +0, 3, 3, 1, 57152, 0x52d89d3f +1, 3203, 3203, 801, 2403, 0x00000000 +0, 4, 4, 1, 56960, 0x431d5189 +[STREAM] +index=0 +codec_name=prores +codec_tag=0x6f637061 +TAG:file_package_umid=0x060A2B340101010501010D001300000000000000000000000000000000000001 +[SIDE_DATA] +side_data_type=Mastering display metadata +red_x=34000/50000 +red_y=16000/50000 +green_x=13250/50000 +green_y=34500/50000 +blue_x=7500/50000 +blue_y=3000/50000 +white_point_x=15635/50000 +white_point_y=16450/50000 +min_luminance=0/10000 +max_luminance=10000000/10000 +[/SIDE_DATA] +[/STREAM] +[STREAM] +index=1 +codec_name=pcm_s24le +codec_tag=0x0000 +TAG:file_package_umid=0x060A2B340101010501010D001300000000000000000000000000000000000001 +[/STREAM] +[STREAM] +index=2 +codec_name=pcm_s24le +codec_tag=0x0000 +TAG:file_package_umid=0x060A2B340101010501010D001300000000000000000000000000000000000001 +[/STREAM] +[FORMAT] +TAG:operational_pattern_ul=060e2b34.04010101.0d010201.01010900 +TAG:uid=adab4424-2f25-4dc7-92ff-29bd000c0000 +TAG:generation_uid=adab4424-2f25-4dc7-92ff-29bd000c0001 +TAG:company_name=FFmpeg +TAG:product_name=OP1a Muxer +TAG:product_version_num=0.0.0.0.0 +TAG:product_version=0.0.0 +TAG:application_platform=Lavf +TAG:product_uid=adab4424-2f25-4dc7-92ff-29bd000c0002 +TAG:toolkit_version_num=0.0.0.0.0 +TAG:material_package_umid=0x060A2B340101010501010D001300000000000000000000000000000000000000 +TAG:timecode=00:01:15;26 +[/FORMAT] From patchwork Tue Nov 9 18:01:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31348 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp1492477iob; Tue, 9 Nov 2021 10:02:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJyPmgEU2v7nPBd3N72XzD6K87gzWpY01RJFmy4jzjF28Zmb0Fqb9u9zfrnr8ndkrrgB5/BO X-Received: by 2002:a05:6402:2554:: with SMTP id l20mr12738598edb.33.1636480948558; Tue, 09 Nov 2021 10:02:28 -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 qp24si15045874ejb.531.2021.11.09.10.02.27; Tue, 09 Nov 2021 10:02:28 -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=ClpAuB4j; 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 BB81068A783; Tue, 9 Nov 2021 20:02:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067068.outbound.protection.outlook.com [40.92.67.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 95E8668A783 for ; Tue, 9 Nov 2021 20:02:10 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZpI5PDu8+OoujsqTO34QeHcdEJ7XiuCvvpjzxm6YgNR8hUk8dFJwQ5bAhv0sS++Hy7e+0lbdWrqVRyOt8QrbjBfKn1TjNi4iRefXBqvvgxnpJI5TULZUaP7txvCCfwQ7tMmICagYuld7Nx6jk5mO2ppwN6G2aXkkWGXiQP0Ss8mWGHNr7ZwVio7ao5kIthlfatQBAs1mrNUFDS9rgIxE17ZPfS221pwMHbkppfbP2blhBR5KYyLfPmGSKZ97opWsVCK6YyLP1fxB6voRjsqBDUk83siqWwWL/G2ciA8bpX27twVjEV9CUH5taE8vZHBA97vQjKVZVEyujI2qY9IwLg== 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=xfOe7jvo/OpSyKaVXYSVGlu21rZb0u5WR9bZ+6rXbjI=; b=CqeJ/ruG3mcyk9lutRQ+3TCoR7kObc3khLesIGWyN6nJJg2S9RrRjRZ7JE+Tkvx0ygvTFhRiCMioOzYI7MNm87ROHmidclhbKB/s+DsovXOxbcZ8lX364JVo3yb0jriveyYR9PoC1ccJOBRdGr6FUzQUY8sSAHQO+WTBdqlB0KCnuDM97yJ1I9BEsxUNvkNfikOVgf9GE07LKG0cDQ8MYMtskOOt1vf+r45TDghUtACqn7SO4kWjjjQHJ98LGwNy2Hm6ru3z9OVWWPOPzz5gKsXA2CNGs8rE3+B7kdzDcvSkslM53ynyjHj5IIjtluqyVUANpYE7rXE+LyTEOgBj3g== 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=xfOe7jvo/OpSyKaVXYSVGlu21rZb0u5WR9bZ+6rXbjI=; b=ClpAuB4jNJgYGZ4ZaPZZD5hw5W3ExSskuvAQPSbfQPxuEirwKuYg2ejQqdsA3mBEKpcvyT5k6Uz6PrjPAITK8SuZHm03/od9XyxhBNTImhu0vraej/DLLJBo1rXwJhYNiTV/esvPE7nUZl1NiyjpJZ7HBOcsrclANnzvskzrb7Iap5wCxm8dgOj3+ap5gmXRBqSoMEfSM9XvJGXlk0GNDOg5EC1x3v7msF89kan22i0zIH0HfV4Wf//j8N4ZPgP1H0ag1eYvOWF7ZxWSbAKFMvSq38fBW1YnEXClzxBbWmxAu3FVpR8piT0UzUWw6aahI84mymVfKOIZpOUSWOjA7g== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4775.eurprd03.prod.outlook.com (2603:10a6:20b:d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.16; Tue, 9 Nov 2021 18:02:08 +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 18:02:08 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Nov 2021 19:01:41 +0100 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [va+/V69d9hqCYVkQxe+nqMuCsHu3+27n] X-ClientProxiedBy: FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211109180155.881111-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.171.90) by FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.5 via Frontend Transport; Tue, 9 Nov 2021 18:02:08 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a6192c5e-2000-46cc-d746-08d9a3ab0bdd X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUaEas4lV0e9Du8ljla95f+3DhguGEJOM4Zkv2KPi5g35erdsccvQ5QB76vLAK+nvavJ8kcIrwAhLZBAQzYzG/t3BX/KNsC0SoV2e9c3+VPBtnYTmDHS4tvZ+LNZs8wCunCRRuiHsqGpohPDDSRRWtlnwlOD2eH+fx/0X9sR+YbQ/bR1wl/0j3iCJHrWc5DVLCE5PX5LAvKMlM8AVnW/OvfmHZL7JDQSN3hEAycs6mcuOH/RPUkMFxaUTOHzsgCqSprJ4RxOm4p7WewyNehoLaaYAcpgxTTKN1dP6TQV8GCaYO5twG5OTih2PXhW31MSiNUjUGFo6oNN2sJb/gHVRwN0P9nMNyvH8shB7XbEv6FyzBG8HNqLAg604Ta8cX0XYTIlh9kJXJKpe+26vcjRzWjQ2Rhm/zmElnYuMBLrmNYzCM/0PgDyLxBo4BufZBrwrF+OKEoqZAAHku6FjNSTuD3D86CPQLYboQgLmnJ9a2CJtI9O+LtgPsonoU6uyO834ICoxFCZJGQpO1aXjbClar6+6GSFBlbogrGfAAJO6RYuhAOkQkd0aDG7UVM+LrO4kphWPWn+mgOOQkKR8QVyzbIlCU5W+XD00O/NkASoKLMYIHCbRGOMLPCHBrTT2aXzuV36z/QDj0ghGuMeIJUVqgPZxKarNjKRCKQB8aSFFqPbxJlpyg/pa+jernNxvjtD0ucmvuZoGIeIIji7i7gU6sC0igyALD9I+Y= X-MS-TrafficTypeDiagnostic: AM6PR03MB4775: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NKO0zJTWkVbfO+wmSyRTYtEaOW46Y/0wOJMtSGj0KgZ/1n85yHLHt5mmCPLy6cKiFE/uQK1eBMxXOnjSW3WY4CYSz0mm2YqSq7HpQiMvPROmTzZIkRTMoccEgGVbNgelxncB25CSyDobRjXsYsHTwq2+5Y2PDoyQqQ+h7iKoh+yoBZKbQSDgARTm1xZjkWdO96v/ufIycq/kg2dnbxgT+78kVjQ046VS9q3wyfVulNpHpeqnFBVe02lDlRt696qzi0ENX2oDrhTclpXSWjZlSZlFocQUlsGhosuzzKZBUU+WhYUyDYQKTyidtJGcD41f+DoY4Nr01emam92KNhy7btmc2/7lF7zgA48ayeyxlA+IaZ7wIRplZF8Von71c5XUShIB1G3QpuYpACftPvi9vO9p5jr2F+gI1x22+7yLaY/nYoXJE++ZEJ4JY+Ggdu8r8qfUWM2b/I5HxltK8cnsGji06E7Hkhk8PSGsCgDSaBNad0PUtivJijN4BFvVTAFTtoGYq5iVvhx3KLeTT4euH1xUJ+2iSgBlJfmhDJ8yt+o= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wmFUoJOWp8vyID9ATQj/uBLq1uL+1q7351yNQJNJtouy2yDOpF96so3ka5eUix+Q7h4qf2nFkv1caF8V5FFCH/HDHpS1kxt8gvnpzDBqPCg7meD4BoFAEVX+Cy0lnRSMCMkDVHOiYAiqd58q1l0kSSjhFWI5pjWNW6bv1NBctOs1DLeXCY1vFxWJJEkJRn8DDKkvo+k1F2JE0zIjY0CcLAxlTr3edkQo6RVjc/s8y4QhTRHqfzN/R2QsKltSD4dQykbpWTt2EeO9Wy6y1WJTpwcKIHyw3DAeJ6VajMbgEcrg2kC1VVlLdBxliWaQkOMMMyaMV12/YKgTw9VKphdFeKeBhV5h0uzsdeaisWzoJZN6l59Bjnk2zFbEegFDaAscsbtnzvC2sArQHo/ZIbH82DnYJUZ2OJVG09r/g/OruyvM7mVxqbSbpu3NmmldyXembkMBhwq4WwMh5mefZj26ThIstsumeyqk8IICqR8RpOotkC0WWZblYn9+UR2ymOlICark2OygdIakMEgGfczjSBzG0NHvGBwHjL03cv5IzrjcM+u/KQQLnbN302dTMvOmo/PHDN9haaP3Y7LvmcsO7TISCB6Vc9XC4iXwSB7oEuzqibXIerVIkZ9di1X2qAqlU8GUHLpd+221l1AiJ5XmusegyjfqrPWbvCICPHt6c+5VXu45HxjFbpM8GEcir18oNvw5wWJiV4EGYIZTd7fXYw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a6192c5e-2000-46cc-d746-08d9a3ab0bdd X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2021 18:02:08.5410 (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: AM6PR03MB4775 Subject: [FFmpeg-devel] [PATCH 03/17] fate/mxf: Add tests for H.264 remuxing 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: QUxE2z7aLaTb These tests exhibit two bugs: Instead of using the in-band extradata the demuxer makes up some extradata designed for AVC intra tracks that lack in-band extradata; these files are nevertheless decodable because of the in-band extradata. Furthermore, the frame reordering is lost. Signed-off-by: Andreas Rheinhardt --- tests/fate/mxf.mak | 22 ++++++++++- tests/ref/fate/mxf-remux-h264 | 37 ++++++++++++++++++ tests/ref/fate/mxf-remux-xavc | 71 +++++++++++++++++++++++++++++++++++ 3 files changed, 128 insertions(+), 2 deletions(-) create mode 100644 tests/ref/fate/mxf-remux-h264 create mode 100644 tests/ref/fate/mxf-remux-xavc diff --git a/tests/fate/mxf.mak b/tests/fate/mxf.mak index f96f4a429b..58a697cd86 100644 --- a/tests/fate/mxf.mak +++ b/tests/fate/mxf.mak @@ -42,6 +42,21 @@ FATE_MXF_REMUX_PROBE-$(call ALLYES, PRORES_DECODER MXF_MUXER) \ += fate-mxf-remux-applehdr10 fate-mxf-remux-applehdr10: CMD = transcode mxf $(TARGET_SAMPLES)/mxf/Meridian-Apple_ProResProxy-HDR10.mxf mxf "-map 0 -c copy" "-c copy -t 0.3" "" "-show_entries format_tags:stream_side_data_list:stream=index,codec_name,codec_tag:stream_tags" +# Tests muxing H.264, in particular automatic insertion of h264_mp4toannexb. +# FIXME: The timestamps of the demuxed file are not properly reordered. +# Furthermore the extradata is wrong: It is one of the AVC intra SPS/PPS; +# decoding only works due to in-band extradata. +FATE_MXF_REMUX-$(call ALLYES, MOV_DEMUXER H264_MP4TOANNEXB_BSF \ + MXF_MUXER H264_PARSER H264_DECODER \ + RAWVIDEO_ENCODER) += fate-mxf-remux-h264 +fate-mxf-remux-h264: CMD = transcode mov $(TARGET_SAMPLES)/mov/spherical.mov mxf "-c copy" "-map 0 -map 0 -c:v:1 copy -frames:v 12" + +# Tests remuxing H.264 and data streams. +# The same FIXME as for mxf-remux-h264 applies. +FATE_MXF_REMUX-$(call ALLYES, MXF_MUXER H264_PARSER H264_DECODER) \ + += fate-mxf-remux-xavc +fate-mxf-remux-xavc: CMD = transcode mxf $(TARGET_SAMPLES)/h264/SonyXAVC_LongGOP_green_pixelation_early_Frames.MXF mxf "-map 0 -c copy" "-map 0 -c copy" + FATE_MXF_REEL_NAME-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF) += fate-mxf-reel_name fate-mxf-reel_name: $(SAMPLES)/mxf/Sony-00001.mxf fate-mxf-reel_name: CMD = md5 -y -i $(TARGET_SAMPLES)/mxf/Sony-00001.mxf -c copy -timecode 00:00:00:00 -metadata "reel_name=test_reel" -fflags +bitexact -f mxf @@ -64,10 +79,13 @@ FATE_MXF-$(CONFIG_MXF_DEMUXER) += $(FATE_MXF) FATE_MXF_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL MXF_DEMUXER \ PIPE_PROTOCOL FRAMECRC_MUXER) \ += $(FATE_MXF_REMUX_PROBE-yes) +FATE_MXF_FFMPEG-$(call ALLYES, FILE_PROTOCOL MXF_DEMUXER \ + PIPE_PROTOCOL FRAMECRC_MUXER) \ + += $(FATE_MXF_REMUX-yes) -FATE_SAMPLES_AVCONV += $(FATE_MXF-yes) $(FATE_MXF_REEL_NAME-yes) +FATE_SAMPLES_AVCONV += $(FATE_MXF-yes) $(FATE_MXF_REEL_NAME-yes) $(FATE_MXF_FFMPEG-yes) FATE_SAMPLES_AVCONV += $(FATE_MXF_USER_COMMENTS-yes) $(FATE_MXF_OPATOM_USER_COMMENTS-yes) FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_MXF_FFMPEG_FFPROBE-yes) FATE_SAMPLES_FFPROBE += $(FATE_MXF_PROBE-yes) -fate-mxf: $(FATE_MXF-yes) $(FATE_MXF_PROBE-yes) $(FATE_MXF_REEL_NAME-yes) $(FATE_MXF_USER_COMMENTS-yes) $(FATE_MXF_FFMPEG_FFPROBE-yes) $(FATE_MXF_OPATOM_USER_COMMENTS-yes) +fate-mxf: $(FATE_MXF-yes) $(FATE_MXF_PROBE-yes) $(FATE_MXF_REEL_NAME-yes) $(FATE_MXF_USER_COMMENTS-yes) $(FATE_MXF_FFMPEG-yes) $(FATE_MXF_FFMPEG_FFPROBE-yes) $(FATE_MXF_OPATOM_USER_COMMENTS-yes) diff --git a/tests/ref/fate/mxf-remux-h264 b/tests/ref/fate/mxf-remux-h264 new file mode 100644 index 0000000000..49ce4324c4 --- /dev/null +++ b/tests/ref/fate/mxf-remux-h264 @@ -0,0 +1,37 @@ +a06741f1a308fa0bd755b206d93639d2 *tests/data/fate/mxf-remux-h264.mxf +201273 tests/data/fate/mxf-remux-h264.mxf +#extradata 1: 81, 0x98411475 +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 1920x1080 +#sar 0: 1/1 +#tb 1: 1/25 +#media_type 1: video +#codec_id 1: h264 +#dimensions 1: 1920x1080 +#sar 1: 1/1 +0, 0, 0, 1, 6220800, 0x6a771857 +1, 0, 0, 1, 69157, 0xd6ff5c4d +1, 1, 1, 1, 1103, 0xb8e00551, F=0x0 +1, 2, 2, 1, 141, 0x49232f95, F=0x0 +0, 3, 3, 1, 6220800, 0x92aa1963 +1, 3, 3, 1, 131, 0xe01928c0, F=0x0 +0, 4, 4, 1, 6220800, 0x906014d8 +1, 4, 4, 1, 69, 0xdf5506bc, F=0x0 +0, 5, 5, 1, 6220800, 0xa67a179e +1, 5, 5, 1, 424, 0x408cb97b, F=0x0 +0, 6, 6, 1, 6220800, 0xcf7e1148 +1, 6, 6, 1, 83, 0x5aa5118a, F=0x0 +0, 7, 7, 1, 6220800, 0xd2b623ab +1, 7, 7, 1, 70, 0x39ec0a38, F=0x0 +0, 8, 8, 1, 6220800, 0x97f51b81 +1, 8, 8, 1, 71, 0x55290a92, F=0x0 +0, 9, 9, 1, 6220800, 0x53e01e46 +1, 9, 9, 1, 149, 0x42683340, F=0x0 +0, 10, 10, 1, 6220800, 0xd4d0de99 +1, 10, 10, 1, 78, 0xad8a0c29, F=0x0 +0, 11, 11, 1, 6220800, 0x6f18e3e4 +1, 11, 11, 1, 72, 0x8c1c0caf, F=0x0 +0, 12, 12, 1, 6220800, 0xcfbbe357 +0, 13, 13, 1, 6220800, 0x70cfe436 diff --git a/tests/ref/fate/mxf-remux-xavc b/tests/ref/fate/mxf-remux-xavc new file mode 100644 index 0000000000..7b221208e5 --- /dev/null +++ b/tests/ref/fate/mxf-remux-xavc @@ -0,0 +1,71 @@ +d0fea4450c0f7c51b0af3631025dfa90 *tests/data/fate/mxf-remux-xavc.mxf +1436217 tests/data/fate/mxf-remux-xavc.mxf +#extradata 0: 97, 0xe2f818c1 +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: h264 +#dimensions 0: 1920x1080 +#sar 0: 1/1 +#tb 1: 1/48000 +#media_type 1: audio +#codec_id 1: pcm_s24le +#sample_rate 1: 48000 +#channel_layout 1: 4 +#channel_layout_name 1: mono +#tb 2: 1/48000 +#media_type 2: audio +#codec_id 2: pcm_s24le +#sample_rate 2: 48000 +#channel_layout 2: 4 +#channel_layout_name 2: mono +#tb 3: 1/48000 +#media_type 3: audio +#codec_id 3: pcm_s24le +#sample_rate 3: 48000 +#channel_layout 3: 4 +#channel_layout_name 3: mono +#tb 4: 1/48000 +#media_type 4: audio +#codec_id 4: pcm_s24le +#sample_rate 4: 48000 +#channel_layout 4: 4 +#channel_layout_name 4: mono +#tb 5: 1/25 +#media_type 5: data +#codec_id 5: none +0, 0, 0, 1, 553248, 0xbda0217f +1, 0, 0, 1920, 5760, 0xd5894ac8 +2, 0, 0, 1920, 5760, 0x86314faa +3, 0, 0, 1920, 5760, 0x00000000 +4, 0, 0, 1920, 5760, 0x00000000 +5, 0, 0, 1, 150, 0xc6f20c7f +0, 1, 1, 1, 119985, 0x6ba5546e, F=0x0 +1, 1920, 1920, 1920, 5760, 0x9f71829c +2, 1920, 1920, 1920, 5760, 0x38049906 +3, 1920, 1920, 1920, 5760, 0x00000000 +4, 1920, 1920, 1920, 5760, 0x00000000 +5, 1, 1, 1, 150, 0xc6f20c7f +0, 2, 2, 1, 98815, 0xe47762ff, F=0x0 +0, 2, 3, 1, 257022, 0xd0647527, F=0x0 +1, 3840, 3840, 1920, 5760, 0xf7245421 +2, 3840, 3840, 1920, 5760, 0x5cd058b0 +3, 3840, 3840, 1920, 5760, 0x00000000 +4, 3840, 3840, 1920, 5760, 0x00000000 +5, 2, 2, 1, 150, 0xc6f20c7f +1, 5760, 5760, 1920, 5760, 0x3cef69d8 +2, 5760, 5760, 1920, 5760, 0x176daa39 +3, 5760, 5760, 1920, 5760, 0x00000000 +4, 5760, 5760, 1920, 5760, 0x00000000 +5, 3, 3, 1, 150, 0xc6f20c7f +0, 4, 4, 1, 123833, 0xff7b324e, F=0x0 +1, 7680, 7680, 1920, 5760, 0x6b647758 +2, 7680, 7680, 1920, 5760, 0xbf6f69de +3, 7680, 7680, 1920, 5760, 0x00000000 +4, 7680, 7680, 1920, 5760, 0x00000000 +5, 4, 4, 1, 150, 0xc6f20c7f +0, 5, 5, 1, 117099, 0x7d6aac45, F=0x0 +1, 9600, 9600, 1920, 5760, 0x0958976a +2, 9600, 9600, 1920, 5760, 0xe3957d5e +3, 9600, 9600, 1920, 5760, 0x00000000 +4, 9600, 9600, 1920, 5760, 0x00000000 +5, 5, 5, 1, 150, 0xc6f20c7f From patchwork Tue Nov 9 18:01:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31344 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp1492860iob; Tue, 9 Nov 2021 10:02:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJy/zlhVpvWT9DVvMD19P9ODCK92pPfCWkFzX8Ne7rgVhSQJfFXMVrvhHzkhDjjecg9h9/e7 X-Received: by 2002:a17:907:931:: with SMTP id au17mr12652902ejc.119.1636480963221; Tue, 09 Nov 2021 10:02:43 -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 b8si26479857edz.535.2021.11.09.10.02.42; Tue, 09 Nov 2021 10:02:43 -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=UtRubMQ1; 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 C8BFF68AC7B; Tue, 9 Nov 2021 20:02:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067055.outbound.protection.outlook.com [40.92.67.55]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 753DB68AB96 for ; Tue, 9 Nov 2021 20:02:17 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QvK97Elw8xOn5TKCtSd4FwO8mxq83WrZl/ndu19p6cUJSSB25lloqcgIOCj2/XEIQ3GICT8c6CKgfnKWsMGzzG9xBpczL2+0nJgR53bbcgLcKE8jJz+11vS2ExkyMDblqXu5Sd0jvXPPn2DEx1hHIT+GaZYJUUYsWFdBC3aD50hjRgcJmmBqSzrAVcFJvMKSIHTNFrTH+Pdtiz1Rb3+yrmJNrKwoQJ7CM9rGIF+6Jjo0pLqxgyKrw7ir/VBIpCB3GjoA2rid+jNWG9Z12qWvH+Eqr5Qft4mZUszuT8Ncoml8qCxoKFFbUEaEjQ3KDxUzeoPEXfeMprf6LUOuA/dcGA== 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=AMPC52c/KIylWZgi0Oqcf7KjwS/ciEBzN033dubBHoA=; b=HJhY4XcrubNf2FqSccer9fXJzeA5mZrRnsz1cnoam51XfLlP8+EbjWEyPE/cbkW0oNhQDPNhx3MZn+rRzSDaSkIKDB0572EysVyr0JSLUBNhAgimiuVlQTXDnmksgroTvZ/+Qpos0+W6TEG/zWoGKHCJKahB5W34WMhvuoOR9+KTM66l9O00LBM+/8VdQoNIUJ9sQw0+hhTGAIAlk5V8waHdxwn704hqLkHV6bnE1QTLqVXWOllfdHqXiQo7eTwPmQnwwR2vAPaXYuUKbKd9I6jsipFG1BzHOfnkqxXHvufdoRyU1HfZ1uuZLKuy4cRorGFk3Qm+l2V5ur9ZW+S9Fg== 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=AMPC52c/KIylWZgi0Oqcf7KjwS/ciEBzN033dubBHoA=; b=UtRubMQ1Nea7wnHKXeZdwxR35o/aSJ3vAejoLFDfWLyhMwzU+DZJNpLDMSGefpnYI3Gmh/l52Tgxt9F2SFBlys0zAHSMb0Uhhr8APTteAioDaV+2FYto4+VLWkJQ+tE4QC7HUAne8HhEDbn/xDO//TPSkWfYkwH+tyjyzqbszIe9ZlhZT3Fa2uGBcCDQDjj4U6d6SzsR1ttlDIu/g2SUUO2QmgvbmrtwlRifXnzo9i120+lCkk5fCKPIXpYEN1VUEAJTupjj/5/NaL9guE9iLMQzzf+SwFCN4KsjQAPfs5ST7VvFs+ueGWrweA6Qp/kaDzJaPsj1VPOvEanRYziPZw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4775.eurprd03.prod.outlook.com (2603:10a6:20b:d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.16; Tue, 9 Nov 2021 18:02:16 +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 18:02:16 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Nov 2021 19:01:42 +0100 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [wDf+tbTDZqZy5X2decg7VOXk/KFkEsIL] X-ClientProxiedBy: FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211109180155.881111-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.171.90) by FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.5 via Frontend Transport; Tue, 9 Nov 2021 18:02:16 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fc7fa5d3-4223-4410-b456-08d9a3ab1083 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRIlshE2JAC11E3nazVg9SyfZ6E0OU0au0Ja2HlNDLYGAkrGM+omzi5bZzfwGbgBvUHl+0ww7NCT41cCsecQAOrXDyEgagl3XX+w2WCG9Bg0j7efg9LazXsxJExOzGV3SX4zqjyn4yGsR3G/AgL5BmRHq/pTKm/7CRjuahqyzOev4hhV0xEKU0N31Io7X9be9DU/ROfnBV+hx0g3H5tlzDQmYhT9JSTC7y2CkDaKz30s5kCc+LT8BUeZnvv5muDuCk/b8kEHnd7GqNt5vFgRwT1F/MxnhFp+qyInFb0Rzxq4FuaM3tDSLPJlN50qUjLxxmSODso+j1IqFiYTT6tHlUwg3EiI/rDFB7kCsVQ+jjsMP8Ady+AjjRpymbsl+lxAN3VDtnlyD9ILEVbjbOpYpAudmUiddhVcSiIzdZJ1TURsQi3t0+8xrkQEqRq8GKVff0Q+0+uq0429sNyq7zB5INOavFbYOy8ZuC8fa4K2j5EKACeu8ZX/ofqZfi+v0rO1YOGWSCMBbWlWj9ovSEM+jxWEYdfiwfXrPINqGodrDVb4kvnhhPV9xI67/uBKAQW4DYV6HGMdiimEFAOlPKsTe09m69ZlVRs0nYumguRwp16gfsYWMXj94UJXzyVvg2IywgjLse3yDqIfJhHsYS6DVryyLeQWPcO0TgMkO+UpMJMUQijcCjnNd0OXeAH/tS5OUD4ZZOeJEoQ9/zzyyoBx+ohbZDDV64qqCXzYoTdJN2vjB0FQ/cx+8AwCwRbsF8PGxE= X-MS-TrafficTypeDiagnostic: AM6PR03MB4775: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ckHe6PYucpxx7UExVnj+UAgfvD9wCJIj5qEIyDF/sPlGdzzwAmdnQ1hq8WBOW+vsmNgo77u/RSQSCyK/M+R595raZ9cBUam3zcooTjUeaynkggmB3hUL9fXMxTIuD79SBdoTtC3hhnDd0CXDDsoLqKhz5cM5aKkdquM3YQ77xsHsebKTnM56RsGb+AB7m4vWebalJVwEk+mFR8C50lsHXauaE7L51m6NdCkYgc8ispXqn7zrsf+EPLYRpRQAXSdJZmwbkhD5rLcyPfZ8XiTFepA1zC4nFpwyKRPFTiTDHV8irEKyQJ2gfteXeahunkGL2KZM/c7q46ZfLIo+GCnPDvsQXEMvw14ns8wV4UXVaigPgaxG+L2+iOl3A0nvCMTc18XdC03MexWiLrCCaD6TESJLeXg/8A9tCjR7scjjjsjdANadGSfhpr1xPnhXSxBW3iH3XOKpQaI5zUS3y12Pw6iMHQIn+tGACTqjMD349KhzzhOzDrRPxwkC0x/ebJmm+k9CX7LyVhG2JwzTZ4CFjZ1MOxz+GtQbncofExjDDhA= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Y7ysINca5dgK3kMdKqS4rd6ou1Y3+crBwLEBKA9EFTPbVbuvoy7IoyNwSyeF2m7/QpRejT0x/U1kMl7gj74MljKRHR4n2cRpQ3/GaKmAPPY2OJyc83Eo05SCBsjYz4vv1uGnfP0hUfZV58dKD/Ty/i0kUy7uS3ACQu/Tg70Pq/RpZcBrzEN4JsoM+iJ4LDtCpJnoPI2GR6x2Y4L7zSDgyfBnitqzSyjXgXNXVS4+66zC9i+kSLv34H1QoekfHbgMBrsjtmw6sdK2tXWMIhBbQdZ6qsy2oWtMcxH4QSM3TzwevoaGF8uLfqH55d/mt5tgxPy0yYsnyW2HOEIxwocHfxJrn41oVlt+up6KGIIUUiTouUr9axY0Rh6MBMNWoivForG6dw38SYhSaK9qZGYx05Lqj3Na4JwutRHO39uvsNUCUSmqseGVJ3E11rPzNxW5hCH4zrv2XqryjUQWp1mb4/AKiU2eJDw3MqqXx5TNQuwHFpJGZNVNKAIBO2T3k4CrjbFbD8aO8ZlGCInAIl53nWeXwAUDNtrTmyLykg49FKTrlWYlRNuuZRpG3bKgIQtFuXmS9QL0zyae3Ci22HLNfAzC+uPBj5Sis6H4PqZdf/hiJlMhLUuGouKIEk6+SGG6aDr5DJop+kBXpBGxp2wBfSEUf7vE7/Cn0GjnwBlKsJzwntrp6UYQjQ7iBHMfoJKhln3t1OBTrVev0zsA8lmG1Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fc7fa5d3-4223-4410-b456-08d9a3ab1083 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2021 18:02:16.3608 (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: AM6PR03MB4775 Subject: [FFmpeg-devel] [PATCH 04/17] avformat/mxfenc: Use smaller types to make struct smaller 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: /U6kG+ghZxl1 Signed-off-by: Andreas Rheinhardt --- libavformat/mxfenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index d1c4d43a50..3b6604d0d6 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -2203,9 +2203,9 @@ static int mxf_parse_dv_frame(AVFormatContext *s, AVStream *st, AVPacket *pkt) static const struct { UID uid; int frame_size; - int profile; + uint8_t profile; uint8_t interlaced; - int intra_only; // 1 or 0 when there are separate UIDs for Long GOP and Intra, -1 when Intra/LGOP detection can be ignored + int8_t intra_only; // 1 or 0 when there are separate UIDs for Long GOP and Intra, -1 when Intra/LGOP detection can be ignored } mxf_h264_codec_uls[] = { {{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x01,0x31,0x11,0x01 }, 0, 66, 0, -1 }, // AVC Baseline {{ 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x01,0x31,0x20,0x01 }, 0, 77, 0, -1 }, // AVC Main From patchwork Tue Nov 9 18:01:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31350 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp1493195iob; Tue, 9 Nov 2021 10:02:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJwfnkGZdr2WG3lDl28MNNqu/YXGHNYKAjepu4mM6DVFu1TBgu8KunwsEmbqpHd9fvxuMKOV X-Received: by 2002:a17:906:a08c:: with SMTP id q12mr11917516ejy.443.1636480979239; Tue, 09 Nov 2021 10:02:59 -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 ne18si8882827ejc.424.2021.11.09.10.02.58; Tue, 09 Nov 2021 10:02:59 -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=ZU3b3sn5; 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 CBB4F68ACF5; Tue, 9 Nov 2021 20:02:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067055.outbound.protection.outlook.com [40.92.67.55]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8B35768AC54 for ; Tue, 9 Nov 2021 20:02:22 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bZgsFvGCGmq2Ig2N6yomXRzpvKMhRSdv4OVJqcDAyofSaj6+4JMg36lgsRZuruKKngwyPZKPdBEvVw6lp9Vs84fUct/c0yPAT8hE33SRWLN5dx0/rNiilGdbjYCR29F6audbMltbagCUIxdSA8buz4yX0bhqd5Eq19CzCJbyHSpKpBGuAkfQUJOxf/gIgjYwVqR9ifbJn6nNDruBQjbjnOBTgiIUOOfTDgoX7RZrqFWwfNCf/BJvIlEzop+lvCFfmUqYAFUwbl7VdRIzz87NG3uJigjqq8z/0XtH6lMkTFXRtk74DPFQUMQ3jt7xF0Rhb11b9xYM4fL/IyymuNyTSA== 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=+sf0BnGSBQf5+87Z3neMzP4bUl6djs0mqlogE0IKQv0=; b=YHdIX6Nct+rkMjTIDXi2om8AXakjrzh4Ux29kSDSL8XCvGKgWUXGh9MiqZaVTgeg6dqLdlzS4nhDKD/bw/T4iC6iq89bUJQ66EDeyPuGVl+jDCdWvjEhDDdJZdGsfSANC6uS6RzyFAcKtY2s9fPoPE9SjXL7VEhT6y04Ca436RDtek1/nt8OUwaKUdDgv6ZyYHkhGlUjdQFR9TXdNGx+Qy4QYutVLU14u36KLfIyyAbIYyCa/Im6ewGL2/fAeLGOPbRLrSDS6/LZvEnQ8jFSrSoUfXYRiA2jjmKRKMvHcJEAHJ2NO3tp2FCLqoF7PMpQsTKzxf2sxQeE+4uSgQyHvw== 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=+sf0BnGSBQf5+87Z3neMzP4bUl6djs0mqlogE0IKQv0=; b=ZU3b3sn59/cZhqxt+DPPhSmy0Lm7N4KiETCs8q+WVmvhW0YGgP7lip0WtmvHk0W8F5RJLo4So8fV7a4IQW79cV+9rnw4GovRDV+X/viZZOoKuuMxg5D9iLL2NSf297TVvD5QtAXlXrqVY4AeUqHFiR/7HnhKFXmA0ia694Oa6dQ3RjOnpGZcomk3G9RtlsbGUC8O3ePAlciitGDkLrNVZl6TU4VsOTZ2Hyg1yym+TG5+xko/mr7pQ/BMuOhpPDBtCIe791H9625C/QlaPC8PH3xqadRUbYu820/rFL6lfRslinNlbUAMx3G4jmwVpNcN8Mbxa12Auf63oFim3YHifg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4775.eurprd03.prod.outlook.com (2603:10a6:20b:d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.16; Tue, 9 Nov 2021 18:02:17 +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 18:02:17 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Nov 2021 19:01:43 +0100 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [1F1PUurlOKwVCnWf13KkLJg0jjGx7EAl] X-ClientProxiedBy: FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211109180155.881111-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.171.90) by FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.5 via Frontend Transport; Tue, 9 Nov 2021 18:02:17 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2fd8c55d-63a2-4ac2-ae88-08d9a3ab112f X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUaEas4lV0e9Du8ljla95f+xKqHNI7+gSg52bKX2i5lc2RWFZ04sZiqZbdWZtA3VGdaDWVKQGV8iOd+8nzmDaUK6D0GZyvFeMsxHd3S3z3gLjMUZHZOh7s8PnJHoSV/6M7FKCBJavxxAGPRDiLNryT/XJkzG9dU+tQfUwbxNKy/0nmn2RXnre0MLba9/zE3oVVY033vpAeKJowSjcXQHXDfWdaOJsjupYXmwbMs8JX9fO+guiskYP5CA51uUAa2ZMc7Z2rq7Kej9F8GHbiU8qVh9A+Kia/zpULdPa8BFmPS+kuXk9vBKMpdZrveMj7HE1EGgCXhmImaBp02e0CULxmPClEBgRY9YqhgQFh6ndF90Ty8nN/ZaK9YjdY5QQd5qW4ZCSPTAByAEtkC1ODDvOZIV6tReJ/7X65UTVXk25P6H831NVty2qJDf6BrX76RhZ+cGbc3XieKPR5siljmHYiVVK6TLTvh8JavBuE4oozopFeJHZnp+SXF5xdtQLkh7QwkNpWs3MsVZ9ZZhLKhqps7iU/m0FxcCOgpQmlUw8gA50aC6xmNI9WsdPpAWSWVtqJuj6VW3IfGUfCbzHJObBQEAKBtv8palyvm68j5dgINw5f4ohPgWuofwORkXDEeb1YFYElI4LrZv8Dtt3sydizc/LJ06AmA+xpjvzWq7siVhGmO6p8GmJtJkajs8O9spHZYoSGRbqUIGhtWyq8v4sXh2KLiBm+PGKU= X-MS-TrafficTypeDiagnostic: AM6PR03MB4775: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YWAvmBsB5GKzX4m8zAtUO0jkliYlxrzh/FT3X1Ve/PMLcQs/RLCQGXYzkHdVzSJmNRze3y+K3UxvescQ8SfMSwj94XDZsODlHc2ss+JkG8I52U9jtkfpa8yGRMef2PX95VudrDnyuJKXcxLQxg9wUZx9lE1i4KOapoIJzq8/cYdXcUV8u4PLNDj+Zg/tQ32y07Y+lkoVpDm1TZp5OunzkHLA/DxKOGyotuwWXNaaV8iQLSpqcRufdbQpYNrJCwLBG9Wu0BeeT/oC4EKlVsX8/yg3hH2e3xwgjuihqZDvaV9gNXDxbVG6d8uBrpPCxxTNZvXzXwEsP/UD4qgcpKUM5gh4UfyhHs/PNkGoGesQmPbPMBGAjZ6FvyEmKLqwYd9wjQtJd4T95tvIDXPv43ukH8tIiB/Wf3+gkai2Sxoz4ZWJsduTHhr0PWIW7aNO/aSqcRlUvea2tBztjxFDmFbkBy2c5aFb0bgc/0polCco31XCqKA0gAH69e323KL9nUT+W0gA08qYdskKfqwiispN/0MvrZCQvZZVvUJk5Aqj+IQ= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: V+c16IwNdr6rGg3NimqCNgZT4G0HDLDpQYnyFmYhlFbllqqFh/H0VuSUPrf5xntX/6sCwfbGwMAa9XNrK8+AoK9maJEQh4pWPvkq70QS21AtK673gj5kZGOZfH8AaGxFg04d/k2y56lYZSMqjGQPRJ6qZZFPC2wlWa5iR4x1kFkAU/TjWq742trhOAa1bY69Y3jpzBJoqxWJZiWtLI/WEzWddaWJ9Q4QUFWx6ZWQU0NVfZknLgyNeqG1kLn1usWKqKSIw3GUfd9lXyeikPEjsMDTu+ygkwziVw1FbQ6m9pV6Zl7W6ryd19rqUMJUgC2pAtADM4DCwTetGg0TVPdihnoC3w1A0M5kVjTPZRmwPvsf6w0vengIoB52Urd+2Ca+kSjH5YX58BBrJkDEYMfuRzqSF2NOqAyKf0D8kD1hO9ir8qBaS38MzDUDu8YeS3ANfhpzBxjv2Une2VK7cyfRFG0MyySC2iiknLeCUjNreulSnxGbUzNv+8nnwCzCOM80y1P1LMq+SvSHgCRny5+TCgvwceQiv+PQEGJ3CiDpAgm0MtfiYVuaYZegDqY4I2Wu93Ntz6m1kM8YX/1WZPMqLZQfTCy+XinFbWYf0siOZQnY7YoA211F+9D9KXb9A8+QWBPUdry77PnTmmYsizWNN97jk/Fh/NPvEcjeqyzbBLW756Ek3je9R71E/jXbDw28w/5juUaMnYOQTdteMmR+OA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2fd8c55d-63a2-4ac2-ae88-08d9a3ab112f X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2021 18:02:17.4490 (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: AM6PR03MB4775 Subject: [FFmpeg-devel] [PATCH 05/17] avformat/mxfenc: Remove redundant check 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: NPpfpdEs4jlN None of the muxers here has the AVFMT_NOSTREAMS flag set, so it is checked generically that there are streams. Signed-off-by: Andreas Rheinhardt --- libavformat/mxfenc.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index 3b6604d0d6..fd9e2c4c48 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -2507,9 +2507,6 @@ static int mxf_write_header(AVFormatContext *s) uint8_t present[FF_ARRAY_ELEMS(mxf_essence_container_uls)] = {0}; int64_t timestamp = 0; - if (!s->nb_streams) - return -1; - if (s->oformat == &ff_mxf_opatom_muxer && s->nb_streams !=1) { av_log(s, AV_LOG_ERROR, "there must be exactly one stream for mxf opatom\n"); return -1; From patchwork Tue Nov 9 18:01:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31355 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp1494132iob; Tue, 9 Nov 2021 10:03:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJyvLEenuDLQp6BF8EQXWVrglqXS8uOkbv8Y315Yomf7INPNgos9tZVErjG8q5uWCFbjBC4q X-Received: by 2002:ac2:5d69:: with SMTP id h9mr8769735lft.675.1636481017807; Tue, 09 Nov 2021 10:03:37 -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 nb27si35269903ejc.336.2021.11.09.10.03.37; Tue, 09 Nov 2021 10:03:37 -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=jrtwFvlo; 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 CA98168ADF7; Tue, 9 Nov 2021 20:02:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067058.outbound.protection.outlook.com [40.92.67.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5E54C68ACAE for ; Tue, 9 Nov 2021 20:02:28 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HTwC0a+fTtN21ierKZpUR2onsjKOMBUfwnKddFN9HBhy76xA9IdNdbnV24NlXdGlaCq1ad0Ej9o2VsnMsbNBtPBIC3yINsOmK+lWKndWn6i94rUvKDQhUYcQ9wvhbqI4boepRQPMYglrCpdV0MtwchdMJ0n54omHb1SgKWVpXNcNva98Q8NfGxL2BWRnv2jTXc2ok1kV0LZlqeT6CsuYlRlpVduyDkrrCt2NLf0oqfeU/t7f8Sf/NNnyBE8Phrnthti4mD1idYzWPn3NsYhI3qjRdz9VYjWKl6zyeYDwCIOLQpIDHxXjCk8TuxRy4XSsN+gSNuxeK45C+4gybg/P9w== 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=j5TTQ10RiHBzxq3wB97XqN/e5bsFiljO04FJuORE9t4=; b=c1Qtvy2mOAfyI7dI5ecfh6i9n8IaS06HjMLmkdx8a1ijfjaD5BS9i1JaNujGWaMtvW44xBO+b4XN8B1kDeRQyOO+3FgMNDxcE8Pcs+5U2YUkApR4UCqCFpGs9/QcjTw1r/V9+gP+OZ1yDRsG7cpcrCGES6nNR+qyM9QS0/Beox88mKjgRB8WLoMcA7bjVYZ/M9pGYrF6iVdWFwbIAdReTsu8av0Aux6N4Z/quwQ5AM1Vs6KX+kNtC0WLSZRlbsqW4Q5LybOWekyo0FWnltcGGrg0SP9jyy+U29WFoVuh4SABxi99TS6qGR/x8j5MqvvhP1MRcHZGBh+Zpnua2x5/Tw== 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=j5TTQ10RiHBzxq3wB97XqN/e5bsFiljO04FJuORE9t4=; b=jrtwFvloAJaDe9iUSAta1qna2xLcmYFp+1O7ziuaEuTLY6cHDZOVxe5DcJFFER1oYRaJQkmJ/WeAnl9ySoWs+dRFXMkqD9cpuMC5AANRwSXjkZfliq9sXeX0A9+8xhY47NeVJap9JsOjEQr+JGbwz4ppQS5HeMULb5TlWUeTC2KlINHtK9S5bfk5tGSb8Pskz4G54Iv+GqIDTLQgSTsccsb+spu154kA5cSeZRyhJbhrpi9zbbeSAkJwkzCYZx/S13BGV9EcfxKbXjuyxlpAHDFpEQA7Z0J4+pLi/fY9cZ4kjMqVZh70z3KA5iLj8XKc+QYUkCNXOxp0JU0X4Rj6cw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4775.eurprd03.prod.outlook.com (2603:10a6:20b:d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.16; Tue, 9 Nov 2021 18:02:18 +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 18:02:18 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Nov 2021 19:01:44 +0100 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [cFrQ5u0QlD5ZbQZrkTEXkDLNSGRe22F+] X-ClientProxiedBy: FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211109180155.881111-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.171.90) by FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.5 via Frontend Transport; Tue, 9 Nov 2021 18:02:18 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 84c919e5-c251-45dc-ee99-08d9a3ab11b9 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUaEas4lV0e9Du8ljla95f+WrNrXy0ABZ6DlL0F8SVjrzBd0PRgWnXcudK3+zMK5OpERhy7/Ij4y84NCxtXvTJ9nmUfa2p3CF6ba21CSGEtr26bgsmOmcyGx3lhEN+VqQdTR3c9N/PwGT3KE3nUmuaKi1NEvEAfqTBOuyqXub/d7rqBIg05w3IYfu/GeEd649yyKl/uFYIOnOvJoMtqJupxxEf4G9NjiDPrcGZANPFrD/PdUjx/H2XQInMtV9xhbH8dsmVSq5bT9zjuCjtXCUHSad/XjQ4xKaXDnyd5AqQt4o/Uu3NA3C5KpaiPjSR7VXVmhjU9pvIA0pXLTf1+HAwUBZc6CtDFBncKcn2tsAXjqdoXKV+2YQ7yT6oEC3rezq7gCmfGW473neRbsOQvf6yL9sctvCAdbKbCzUuPGOGWUBueUKTa2gvjWm9g4vUNttYQ1NOk4V8P2Ecml/TAmFikFt30M3GIj4UCTnHeixN6JXCrt6ZIXjIZlHp3n/8Nj6R4/Q5+hYspfIsgsFoxXDYb9uKY3Rap2HY9X1zLHrvP/uJihZFJoo/8HaWhhtvnYD4VGWz+bn7K8sM23Go9JGzR9fL02HTLNHZgeIKQ1A/HBMiRlPxaqWcjM6NM85wS/lGmykm8L2o0p87Xm5tc8B5GzqnpqvMdZutcIC03Go2OmDaOuUUR70pTo7LzgZ5MyBP9DAUNCM4RgCPIAQiDgcNusxfL9Ranupw= X-MS-TrafficTypeDiagnostic: AM6PR03MB4775: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qyj2uWhoSNzI4feputBT5evys+D4UhM87U96DKWFAtghdVktp7ol+DoXI/Nbw3+mDhTHYkgKCT+ThbJLpLqBg++M1U8qDVeQzJCHT2ZfCibSvMNApfXiX/3DET3xj6HTDPpi3KRNQsZ8S3piHakcRWOakb1NBKyuxRVifDzzXBlEo5QmzIhDUQZoKDtQnj51Ft6dcNDnWhjhg5InLOtlHp9uocPSNcKqxUCt3wH0RK2Xo+73+QZ+9UXmBw7DdxzJtQA07EAN5Za+o8Mi7DV9CjJ8xDmkVHbRSbpiLtt52Mp2p0SX1zx+3IGFjarYVas3Hakt+cZf7Vl3bjLr+tHIf95FnJ3BeswoqNV13HR3kC6+6MngWV9PUwwJ1owXeFrhuNM6tOy4pxRnjd3jERB26fwt5HzgLDYsxKGpJkanH3VOfkwu1NoORgfRvYYubj1VBDxxQ6BQgUOYScbY+BVO3Ni6h2lKEB9ETsBPwjDf0dYf6KmqyxYoBj+jxzw0JX0HqMA1BuaMJV1e2Q8YM5oaI3WQ31b1Ahc4inccyezjazg= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Ft11+bIti2MXQy//PjfAizbThZtwoRuK+6Wt0x2zKhtbetjt1ITmnLYqZnnAAyJlcxxA0y+KSXsJvByGiCpQFnEevK77n8n01gWTnBIMAH7szOFDF7AevhYJQ5HrRldySgtjMaHNo4Cuka2FoPLHDTQwTLtRXbbrVb90TX6yhQ5qHDWsNxcqqkFlS4yDAiyRExIFDjTE9N5JK1LGwdYWU1owC91DZAAYEPB3mH0QVFUKsBNNxd5KBst/+AGp1PCiYq4jlMWx8Qy5gGLzKE/tU+a27+6insG6bHOxjdnCzqvidUQqy+Z1S/7zel98tyEGJHApPLpRw4GVsMwLaZm+zR0VOcaPJSLAinHP5xmX6j76cBSaa32UqD7myM7m+gkcpAEodqC/p1RJizwzEqbtCN5gTP58uWREDxyNDLZbGz0VnxceyCufAi1RdRxFlkaHM0AeM7N5HnfzHZnzaN/k9JMoFZjV+40SjmA3PZtHJCZSwF7i+tMsIYiVsCJTEvjUY722CVHZj2Og39kD5fvJM6xBV9TZk3hrOH1t1PL3vkhl7AWQaA0xn02UY7GpRRhi3Vtr0l0SuI1K1a9Kl4O3qTzH9BCqIP9DmIjVtjsFgLWxAj1XhCwQ8xVBFp9/000GXKwqxme6yXMH+9+qEbTWN2+S8D7S4TaLvbmHmyEou4jXVeR0zzWutVdVRQmNtBIDo7aXazzdeMhAADG+Sv9Wyg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 84c919e5-c251-45dc-ee99-08d9a3ab11b9 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2021 18:02:18.3620 (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: AM6PR03MB4775 Subject: [FFmpeg-devel] [PATCH 06/17] avformat/mxfenc: Make init function out of write_header 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: qJ2/+EEIji7W The MXF muxers only write the header after they have received a packet; the actual write_header function does not write anything. So make an init function out of it. Signed-off-by: Andreas Rheinhardt --- libavformat/mxfenc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index fd9e2c4c48..a6535eb43f 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -2500,7 +2500,7 @@ static int mxf_init_timecode(AVFormatContext *s, AVStream *st, AVRational tbc) return av_timecode_init(&mxf->tc, av_inv_q(tbc), 0, 0, s); } -static int mxf_write_header(AVFormatContext *s) +static int mxf_init(AVFormatContext *s) { MXFContext *mxf = s->priv_data; int i, ret; @@ -3261,7 +3261,7 @@ const AVOutputFormat ff_mxf_muxer = { .priv_data_size = sizeof(MXFContext), .audio_codec = AV_CODEC_ID_PCM_S16LE, .video_codec = AV_CODEC_ID_MPEG2VIDEO, - .write_header = mxf_write_header, + .init = mxf_init, .check_bitstream = mxf_check_bitstream, .write_packet = mxf_write_packet, .write_trailer = mxf_write_footer, @@ -3278,7 +3278,7 @@ const AVOutputFormat ff_mxf_d10_muxer = { .priv_data_size = sizeof(MXFContext), .audio_codec = AV_CODEC_ID_PCM_S16LE, .video_codec = AV_CODEC_ID_MPEG2VIDEO, - .write_header = mxf_write_header, + .init = mxf_init, .write_packet = mxf_write_packet, .write_trailer = mxf_write_footer, .deinit = mxf_deinit, @@ -3295,7 +3295,7 @@ const AVOutputFormat ff_mxf_opatom_muxer = { .priv_data_size = sizeof(MXFContext), .audio_codec = AV_CODEC_ID_PCM_S16LE, .video_codec = AV_CODEC_ID_DNXHD, - .write_header = mxf_write_header, + .init = mxf_init, .check_bitstream = mxf_check_bitstream, .write_packet = mxf_write_packet, .write_trailer = mxf_write_footer, From patchwork Tue Nov 9 18:01:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31345 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp1493486iob; Tue, 9 Nov 2021 10:03:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJyDLuyO6FcESy1+3x1R5W2UqiUYFU4YqC/q2zaKbFbfClL3fW5f8cl3/upjDEZeSgX3UBy7 X-Received: by 2002:a17:907:7210:: with SMTP id dr16mr12075608ejc.267.1636480992111; Tue, 09 Nov 2021 10:03:12 -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 l7si32254784edi.523.2021.11.09.10.03.11; Tue, 09 Nov 2021 10:03:12 -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=kb1+vdUb; 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 C596968ADAE; Tue, 9 Nov 2021 20:02:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067055.outbound.protection.outlook.com [40.92.67.55]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A1E6568A817 for ; Tue, 9 Nov 2021 20:02:27 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FBqeQN716AX1GDP0F2bfdGX8YvfMBwKlzH4CEOlDme+tYkSA/WONRWdlMNy2v5yWfp8qQucNZ5P7om5Kje2Y6xcUK0Mrv5Ffn98Ujrf9VizCJ5nM6B/sEGpAUOOBqzBAdYi7xceNbrZB5sK/IIN9n9msiJEXIE4XhZuFv/oPq0/fgJwgNU8wBRHq7gTha//bTuVj5UVIL9Epc2wCX1Y4XAgqO8sVsvDv//ZWV260q70IkVPbDN03VzYoyYsY7hZSmlR+UEP4/qU2KFq1FRwO6a0r2xUGWWVN3oxqhPcg378xSvns/5Qo+eo1NdLpnZGpg8g87A97RcpXnK4/vbr1Hw== 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=pzrgXAyqSCUN2J4KfCt2efwSoAzvENwdnY1FabxCzLo=; b=SidsP94us+ffrOndovZl9GEs5SAAHXCMvSjlm2uD/4jri1L51a7FCkZREye391AjTzRXLg/PeDP6+1uSXRvkmuAW5klXgNYTcUx2eZCcrG/lQF9xuXC27wT8TN49lLVFVgRgLJbWHJ5DNHk2GoueGgUuNiLvq6l8y0trMH5F5IsRQAh6/pLVqshCWKsUV1hWIuHt8GiiNAu7N8HDpIYi/pvTa+WAMCNK8tmonQi+PFz6FfvnVJw2Xw1oX+zCs5gXXfYns7Lz93seEEzik0V/VKANjt6iwspfeHjUMJ7VTMT6fuoP3f9pJZ+kPFbDDsEhS+sezk3G8WfDJfktjYG/NA== 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=pzrgXAyqSCUN2J4KfCt2efwSoAzvENwdnY1FabxCzLo=; b=kb1+vdUb4fAxMMaEA6Uf/DzxGX9kohnvCYCFOLP+e880yi2tmsZoMUHEJjM5Xrlci89/IMl3ROyf9miRZCgVWFWyW+2VTSXISi+2C1mFvwd9UONtZ/hUUNMf/6WFkAioLW2fpGv3dvUPWUilhFLQ7jC5GmVG+fuhtxnAo8QYEE5QxB3mAA9jh7mcGITJ6gmuKWHca32p1hIIzLIpE+XnLPx1CNmskAnyHDmx6xfUYGCgnUJSkvHlabRMJrQIFXH4eF842Z7Ip+yOdBfE7b9PJPrUFIHr7F8b6nb5cAxoTXCrsRiByVpEVifCq/Zc7y0xfoUIC+c4DBOlsAUZc4e6ow== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4775.eurprd03.prod.outlook.com (2603:10a6:20b:d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.16; Tue, 9 Nov 2021 18:02:20 +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 18:02:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Nov 2021 19:01:45 +0100 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [QP53obbb3QkiuhB0jBRhgQ41ttE5jrXR] X-ClientProxiedBy: FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211109180155.881111-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.171.90) by FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.5 via Frontend Transport; Tue, 9 Nov 2021 18:02:18 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 37f1edae-0f12-479a-3e6c-08d9a3ab1239 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRIlshE2JAC11E3nazVg9SyU6Cr4WJar/RC5/fBwtK+TySHuER4OVAhGErpA5bws8V3sx/hnActcU5ZCIT8EvzVhd3pQGZnWuYpxQxtN5u5DUiB8aO8JeKOV1/P3HK1BO75XzHglmSCRnuoJ0BK7TLlAIGSETkRpfhkBU1KSfQo+c4g75Wzs557lvopoJ75RyA0VdFSV9Tg1lsn2D+s9/6YLhVRocq6f3ZzGfiX2Jq7MzJmM//3CtbW0kJu8+HZw6/l5FRpQAd07nKiA3or3Cube6Va/kRFOHwALUWpJAyUAa/f7k7496JBt2rj16ELJEBuzkcqiv44Z7WO4Iu1MXJ8TmngpQYdqqXJOfvl4nksTmxPwT2jMso9JrLWzSEFOm3wth66hGtcDzT6TU/VsyV+dQbglR6TCcB6z+FoEEXNIDnToYjQUEC2s5+UAEF+LXq1G4c5Ko7xJXhMCZXQ1v5rwZN519yMUHDO7J7E3rtWym357olvZ9EyDQKED4oe4Nzd/JV7RTAsuhenL/zSpFvgEFjy148Dpfy2qvAITeRpoja1mFFIvrFBcqr/0oeEaoNKisk8/0Bl0SZF0dPmdKM4QWv0283b/SuUXRbao6ouN1mvePt4hEe1mp1cJNS+7k/daZx/GTK2OH85By8DBwuMy4zJ3nfz/JNAji7XYgXiaBTZAV9Rvl+UbriiAPWcTxT72RtdLcU+RyIyi8FtMd15V1WaioKnFjFthwWzhfQ1WrpZwIHHbFTQ3m7Ws9vSmvM= X-MS-TrafficTypeDiagnostic: AM6PR03MB4775: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0nVal/nhY1MVBHIrTprNofMQfX/U3HJW4r8YfxCWSy1Vib4wZFVD0zeg+TYqW19vABx6WZ35oixwAiTgdOqWi+cWAJtXRbnamqIa5+lr1Eut/zozXhzfNtKt3PSoggnK+fKdTxas8yO2jl2or+QRUp5gJ1Aa6rr+LGazvHzOkVAGLqfRWk6I+lYhwMuRUQTmq4RVzeysJxA/kN/qJLON0TAqamvWg8C6g8wuBWk+r9DypJyxRNLEd7+bguUv3gQJtHfb5QQcMAte9SMYjsoJtGuTpCndnlNzdJFy8GAoywkd+dnzjkdLqvA0aTa3AHT1HAKoHgHj9/ZOVP/rp0AYxFfcL/dN7oH8ZnjEU/o5qtWifYUCRkCkZmW4TUXtWKnQGFG2behrPJeV2+MFs9fCRauMTKx6MCbFut6RWFYRS8K2w1MIuNN25DNi0DuSH2U1/DRJ9D9iK8n0bBN0HsEnDKZbhfNlBjuMerwThFGGWS0iUro303ohM56g8nQXyjsAyJaLwq7EfJ0Dc1DxB7nve/uykNSIixju5waBqkOGMyA= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: O6zDuKRuIgPU6bBsKSmyxhRjyiUvJY1RCJvIm744umANH4rGH4IhWueu3D/Q2dvuz25YQTKhH5zJopIypAqVTi4DcT9JtxlQmRgE6TuEHBUu6g96ymrYwtUICSG7/88QP8GehAORLeSifuONjG5PcOYyjQF6bI86CPYIQwxCJBMMSq+XdBV+MS5cMH5WP7lDGVR0BoLRjG00vr/m+/BqU5d0KTb2w5n8UeR9G9A99iqmv+ZVlcEsszO/YmtmUuEcSkV5Jf8/kcX6EDq09sH+SBSTruJo2K+80GRqo0DUqIL0Gl6VsBE9gw0Eacuw6C8QMu3ahr/NVLcziP/PQVMKIfMXZ1YFQG46bBNgOQiMhqz/f7QmBvYljYFKQrQIKuZ4jTd0rHkQ63hXRHn7wkuQotk5JWTF+Ru7mp/gxyEFdMDn82Tqw76oWSBAMF62d6F/rzAxO96e6p3TEEki/mpHD24Ycy2Q70TJjNs6+HmTOHa3WB5rI311s+dO0FW5uVr5482TEuBa8I96Qq6s1glMQT9Ja0iFXBH9ftxMuvqm9d7AwztLUbanQYXUwEZY2druPe5WJCvE2xEM+yPybV18IXegmNY+I2smwP5KvVLm7MrAyESgLuDk3Qb5DvK0XEetvy4hJlLzX85ot+nTIMrkZvGJvjj45zVpw917u5Fc8HHKaYugXNAlv7XcB7vh/rVZpzZfvNlHdF9VFzUqTEPy9g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 37f1edae-0f12-479a-3e6c-08d9a3ab1239 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2021 18:02:19.2720 (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: AM6PR03MB4775 Subject: [FFmpeg-devel] [PATCH 07/17] avformat/mxfenc: Error out when receiving invalid data 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: 8Qdre/2Z9eXu (Unless the packet has a size of zero, the packet will run afoul of the cbr_index check a few lines below.) Signed-off-by: Andreas Rheinhardt --- libavformat/mxfenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index a6535eb43f..c20ba9bfca 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -2151,7 +2151,7 @@ static int mxf_parse_dv_frame(AVFormatContext *s, AVStream *st, AVPacket *pkt) // Check for minimal frame size if (pkt->size < 120000) - return -1; + return 0; apt = pkt->data[4] & 0x7; vs_pack = pkt->data + 80*5 + 48; From patchwork Tue Nov 9 18:01:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31352 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp1494365iob; Tue, 9 Nov 2021 10:03:48 -0800 (PST) X-Google-Smtp-Source: ABdhPJx7Zv+ni8DJS0vx7XWUVZIimunPvzDyJsO3kojSF6b3erCz/dRCRci/wD2LH0oLWjyvrFlg X-Received: by 2002:a17:907:160a:: with SMTP id hb10mr12400545ejc.83.1636481028126; Tue, 09 Nov 2021 10:03:48 -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 cw4si8853100ejc.93.2021.11.09.10.03.47; Tue, 09 Nov 2021 10:03:48 -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="pr/OaKOq"; 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 9379B68AE14; Tue, 9 Nov 2021 20:02:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067055.outbound.protection.outlook.com [40.92.67.55]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 734C668ADC9 for ; Tue, 9 Nov 2021 20:02:34 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ty+yJUYjvQNFwtm9eQWSJzLaqmcCOfElDYCgTrEWiMVcQgg2pbST9ltJ1ftA1MYJxQYyrDH3Tqo+IQaNCwcQiNwYF+Evnm/0s+jOIUUnymEp1X48AN3pXQYLppZZqlZTsO7kRMcOZEUCxAuMeuY7swHO/FF5NfroznNj8Y7O/LA+4QspAQg0NOtny1KG5fBJbsTGirh6wHrqcXXfEKmn1bh7qa/E83sjZno67KjTtmVtVbycXPuBDxYXnTZXNgR1kRCUYW89uja1/0gNtXIqgwC/IXD9hNmN+5gU/zgWT3i0w6P6/rqNxAhV2ZfPCHyVSsgJFKGB/Z4LQVQe5yzQKQ== 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=oU+JxAmsDsCDHYoPZgzDgOl4Uy/UjxwvzjyF30VAxVs=; b=C5PLOzFG7k3ZZDiFnFHjkBJDPucs4PCkkqiIO4uIcDKR32Lx6VbtKY66KndyaEMDEdIgmZT1c5IGWVulRqBOh/DZeBj78j3hbAjcAgWQU9J7qImAokdPZ2ouyp/EHygeFPo4Hb+NAuM3kiFvpzsPzZxnslqLWXHGosQ2v9Sucv5GyY4Q+VynLxlsUTr7MwK5qZZqIqCi499eVukkkca2cJZ6vHjv6KtlIKLkLP9U04z0Q+mAv+L9T+xZuquYkzm4XPkETokxklUdSn85D8gL9VntfQpcONa3AR4Gr+MLnY2q6VUmNhjqHMubarMw+Jxv3LRBVHyKvsA7rgi3tzvHKg== 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=oU+JxAmsDsCDHYoPZgzDgOl4Uy/UjxwvzjyF30VAxVs=; b=pr/OaKOqsgPo3H35rXrNvz0lHyV+b5jYA/sx1GiTmaLZq2cgZvd0DRaD7ZBBYe3pmlPWTFMWpdGpM49hbkMwbhMnIAFRCsJ31yivk08Rq0GQe+fcTxOvuFYL3f80AeWORQ1BQVwHW8ldICKqAQPCRWJbrX8NN7nc9LexO3TTDaxHvE5MJj5L6cMRal9FDjXymcwG2aICt1lzRpjURSz1Gc87FUATi/2YIfsLu377E1l/kVLBy1eK8NoYV8GpfrwdXy0Q32i+DGGGeiUe3m409UNNKTpt4FJk+rToujRInQnK/fQEhlvwbcLE8cBwtOr7P2bsjDQ2yERdCZOwAU7Azw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4775.eurprd03.prod.outlook.com (2603:10a6:20b:d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.16; Tue, 9 Nov 2021 18:02:20 +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 18:02:20 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Nov 2021 19:01:46 +0100 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [2w0AeRV3kVZxeQEb8YaOQl/0my85Hxfg] X-ClientProxiedBy: FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211109180155.881111-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.171.90) by FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.5 via Frontend Transport; Tue, 9 Nov 2021 18:02:19 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2bcc2a0e-9729-4a72-a8ce-08d9a3ab12c8 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRIlshE2JAC11E3nazVg9Sy2F1pulybUyurpjJjACKJHAvrl1/OMJrWJdyUTj4eEcIVIKFMzZkuHvOs4J/fErCXTZUJWQuvhbmtz5CQj8+Xgi8UKjP8scJWJUIE6Ni1CJng4eCWCCTEyva9sYwU/lCKXh6oDRWxXhRzNDAmgOqOAXALV293UcgNfLSE7hiSZeRjT1G2lBzRXe9+AisO4i2OTDIRj0V/2vJ2HjapdYcdleRaF0e7qHu0lIxhtjIIJSJaLd37jaPd4LNU22abBDLU3xykfeUttWlpm1YpPg2BoQlO6eoAcJzJfyh33S8P24PTP//2qEI3feiT0eYahsnPb0iwI1xmOu56uj1bXq49wZoqImmoB0MsBIelaEwI0CkuD9yw0O2ONz/No6dG8c8M19k1j3NGr3gecNuRGJr3qTMzYpC4YlukQrjX/qiRbhBHAR5wmT9OlXMFIy3uhsx9rfRZ1FZ4Lj5B9JndTctsUjA69ucyJPX8idtF+kXXUVh36ZLDhjfRV0171GyKY/klvoipkUjKX8zyQw8WGUt6ZZcLC5EXa8oK8DSftVensgn+tAU/YDqDidrnLxXUzp7zu1FpweuYn+SR18iKWy/UqfQDCs+fQ+OgtZm5or8a2sxxmeC5fB4P8NVJipE9b6HObgyoMJohoDuhWNOxvWfwkH1df05rp9cTAhWZC91W863t0hwZroJjccgrpw8jK4PMlHc7S1Pp+DfRNBiCPAhfHTIgjJmmu5MceXqOAtjmrZU= X-MS-TrafficTypeDiagnostic: AM6PR03MB4775: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: o58ElTBuG9SMiEMXZTwN0xBXaJ5mxCznR3CABSwvsi+v+A5Dda/GuV4ZJU3V/7S/RwMXI+4DB+ScVpZawDt7xT7CK0JLrhKS+JJeLMfGerHAHCJlAYmlw9lMsu6y6f84w/NqpaUQKQNQtZ1MOeJyaj7X4o+3h5AniA1qwzqNcaTLV+7sMnfA5xiYjvPvg0it5L1+EibuzvDq6U2pEuHyebYzs16csatpMxg87nrwHia379lTDQXRUXQUo8A4mEi1mCpnKaPHJBD2CjnlIUY1HiNwASP4Rnxi91joI4ofjbXmgt+fFEkeEDNQ0wRpfbRxR4bdvp43elG7UmY9d4pSxQDcTjkZHcSShcggXjl89YEyj0nGbHXGc3LSyHCIH7pgDBsrimuoUUkX0oa3DeF6BwMJwu2UXizHnUCv6FwLD7xy3u9kOjpUnmBtuCJvaAX/amNsR9ilGKKM9dmwD2C+h4GuA+0Ri33/8deelEv0vFAq4HDatZamtP8Ldl11oAAcMwbWP3gfDoHTC/GvPLKzEMPtoU1cwJ1wKD2h9vVI3K8= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: oj8YQzvRf8MaxkDHZ12uqSMG0fThjDEY6qvn6a3hDWI09su3OmGnXVff3zFLn9Pu6N46FoRM2mlgewQHu8/EVZogxdP09CxQe/hAEhHrIv9s1oe9jbrU5w1ZqVgzHBVwElxrJK5gIFxJGxYo/r8KXlX6oJ+4FFtSIVJ74e8yXlR/dliL6EEc1ZyGAMMtFoEKJ7aw4WAA24+FMtWJKnSZyU7kPFcJz/fVMRiZwd1q0zccXXc0Dj1iBPD3WtyLoGcCakdfh0r4SEr5/c+Ypsj51gp64CRZ6zxF7J/c01f/M/jNIJIUY0XVKcClY6rFLMSDTkdo96VdeVLsLgpBDgc/QTTDNs0jkixdiNiitBdBa2HfeU5zngcM7gwIKUKS3ICb0H5OfU+iruJQS0rgxQ0b7JPvejZyQm6kvjGSQThGkeakVnTdeML93PBNfZbjKPGq9xqb5Q3+FidvYbRys9ZvzgwFPXuuA2JlY/LCeAGW/QnrVOXnVo6EfUHTpayTmjQ+wSnaCMVfFKGAIBYgc66rba9kH2rSup4CkE9YLmD+WM7Ynw72+ihl84yCJFoqw3GwHlEDvPMd+ILhEJGc6jIjG2jLIgIIENxxK74lWKv0LTZ1XAB8bdzkAw7mIc7GjCd3r3Y7/a/fTHeXMNbSw0p3v10uGqSupa/AwRkHgUNzLyuT/vlQ5wK5I4kN0qECLo6pchlLdOSUvvcrzdvGwtf3xg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2bcc2a0e-9729-4a72-a8ce-08d9a3ab12c8 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2021 18:02:20.2786 (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: AM6PR03MB4775 Subject: [FFmpeg-devel] [PATCH 08/17] avformat/mxfenc: Improve returned error codes 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: 9MHUsS+fQCx0 Signed-off-by: Andreas Rheinhardt --- libavformat/mxfenc.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index c20ba9bfca..cf63340313 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -2509,7 +2509,7 @@ static int mxf_init(AVFormatContext *s) if (s->oformat == &ff_mxf_opatom_muxer && s->nb_streams !=1) { av_log(s, AV_LOG_ERROR, "there must be exactly one stream for mxf opatom\n"); - return -1; + return AVERROR(EINVAL); } if (!av_dict_get(s->metadata, "comment_", NULL, AV_DICT_IGNORE_SUFFIX)) @@ -2525,7 +2525,7 @@ static int mxf_init(AVFormatContext *s) if (((i == 0) ^ (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO)) && s->oformat != &ff_mxf_opatom_muxer) { av_log(s, AV_LOG_ERROR, "there must be exactly one video stream and it must be the first one\n"); - return -1; + return AVERROR(EINVAL); } if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) { @@ -2590,7 +2590,7 @@ static int mxf_init(AVFormatContext *s) ul_index = 4+ntsc; } else { av_log(s, AV_LOG_ERROR, "error MXF D-10 only support 30/40/50 mbit/s\n"); - return -1; + return AVERROR(EINVAL); } sc->codec_ul = &mxf_d10_codec_uls[ul_index]; @@ -2607,13 +2607,13 @@ static int mxf_init(AVFormatContext *s) char bsf_arg[32]; if (st->codecpar->sample_rate != 48000) { av_log(s, AV_LOG_ERROR, "only 48khz is implemented\n"); - return -1; + return AVERROR_PATCHWELCOME; } avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate); if (s->oformat == &ff_mxf_d10_muxer) { if (st->index != 1) { av_log(s, AV_LOG_ERROR, "MXF D-10 only support one audio track\n"); - return -1; + return AVERROR(EINVAL); } if (st->codecpar->codec_id != AV_CODEC_ID_PCM_S16LE && st->codecpar->codec_id != AV_CODEC_ID_PCM_S24LE) { @@ -2657,11 +2657,11 @@ static int mxf_init(AVFormatContext *s) sc->index = INDEX_S436M; } else { av_log(s, AV_LOG_ERROR, "track %d: unsupported data type\n", i); - return -1; + return AVERROR(EINVAL); } if (st->index != s->nb_streams - 1) { av_log(s, AV_LOG_ERROR, "data track must be placed last\n"); - return -1; + return AVERROR(EINVAL); } } @@ -2670,7 +2670,7 @@ static int mxf_init(AVFormatContext *s) if (sc->index == -1) { av_log(s, AV_LOG_ERROR, "track %d: could not find essence container ul, " "codec not currently supported in container\n", i); - return -1; + return AVERROR(EINVAL); } } From patchwork Tue Nov 9 18:01:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31353 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp1494646iob; Tue, 9 Nov 2021 10:03:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJy/oYJ14eFl+Fg+cjYYC0rgeqy+mVrY6S2WvbJAEgWkO6wrdm76DV3CGz+e/r14wybFJSHQ X-Received: by 2002:a05:6402:11cb:: with SMTP id j11mr12643049edw.134.1636481039632; Tue, 09 Nov 2021 10:03:59 -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 sh11si31890776ejc.687.2021.11.09.10.03.59; Tue, 09 Nov 2021 10:03:59 -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=bb1sswaY; 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 8381D68AE33; Tue, 9 Nov 2021 20:02:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067058.outbound.protection.outlook.com [40.92.67.58]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7E46468AD12 for ; Tue, 9 Nov 2021 20:02:34 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V3UtYCj6DFhlx0vSLb6eezBc47yLPG9czkB/hPUAZieUEctPqqTcHW78fLpKp4Juyu55OvbUtsWQj4iGFNf/Wqjpqp1Hgxk8xnMGj+fNfb2DjA1IXMG6+xVX1Qiq3B+Zxf0pJmIhOOO0+VR0O6dp1bfUKKPThvcoVwjAqJmD+K6cSpinuYdhmXL18yuWkPHgHCqFj112HKcsDeS2fnP5eo88tkVyvz/PKb/HPNOye3R7JPxvQrqIJCLfYDTVzMwlj9IXr59/Ib8LLBUGpKuwGkU3zpHH+RCEs/Ll+6HQd9fu87rOfWYSa9uaTN5GOiykzhwwtZ1yzjO/wFeDxpZEdw== 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=EPl4fnsC5B1BUdgaFOipQGAOET9WKBsmPYo8LGXe2vM=; b=maEpAqFOMLEsaU4AX1xFYZotXJHyHekkZTwLWcq+i0xMMVRQPJfXy06oz2Ty4xsvz7Y8EMvwGic6U6HML55GnfcBjuLHGdDYySDlxKTwn27heglhQ5uE4ygF60dZYc2q2kyMtvNcPVSn8Y0ApY1AFe400aikVWlwGhxz7y0gnwMpZ7fBTD2F7I59z9cSW7F4GGwQsC7Vxc12NNlUrpd1pzrwgnPAyJOmL6J6zBylJ5PfsHc/Z/JasP/wvu01FjJFsi5tcRcJ1VwMW3xS8jE0ndy7IhLrTaavUxfEnOWeYmEYGv+qenFx/N4/cRPqtz0WwL/iplgJfYfZwlwDLBlP8A== 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=EPl4fnsC5B1BUdgaFOipQGAOET9WKBsmPYo8LGXe2vM=; b=bb1sswaY2erV/1o/ghg48P/Q+NemvHvw+/OAETeW/UHcx1YxWeCEg5azByHudKZVdrOQkKCzQkw9FeDl2CQW2no9JEK20M5R+aW3mQk4HllX5oYNuO22Ir74ojjThUMdUL5zDasE17Oft+qSROrm8/yNvP6obz+l7fbqfFMLUc3jYxWbvYtOuWYQmbc6zCEWyxWawdQRx0Qk3Hnq7irPBGEzVl7cwukQi8G2SdeQpFrfftkku11c7lCoLq6NDgJevGfxnOTe/m/o6GJxpK+eAdKoGWdAeMyh8GXm4lP25q4QRmf8NliOHZ/3bo+10Xd/719ePyMFnth3haHpzl80Ow== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4775.eurprd03.prod.outlook.com (2603:10a6:20b:d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.16; Tue, 9 Nov 2021 18:02:21 +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 18:02:21 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Nov 2021 19:01:47 +0100 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [OWaQFiETnXMswZfeDcC5F828ECT3975E] X-ClientProxiedBy: FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211109180155.881111-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.171.90) by FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.5 via Frontend Transport; Tue, 9 Nov 2021 18:02:21 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4f54656f-cfab-4a82-a6eb-08d9a3ab1385 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUaEas4lV0e9Du8ljla95f+iN1ku1sEUQ1GeEEDST+0ECoKH7ko/hplHenXeXEVhgV43p1OouWzq8vPjjKUnU6p1XdpYWy/cM6x6HBVDXSas6qWAUlkf7N2nLipPjTBTbC44T4+AwfDV+Rt3TmpJKsat1bQE7pHRIPW+0uqCuQuz+vH5bvja0SdPrSMkZavKlgWkFMfCz4Envlu6x2F26b4kFdCXD3NvtDUF/aDung8VKb3yTQmlux6MWjNPDDyxaG9j/rv70NlnqRfG7bGLI9dp275Z3hXtcl7riPHbWDvenyvne8mUYB4qxnI2g8Ae7NYNMEKmlqtXXMcAcYLrarsP3gvxRd0TXaabHTfLwjXCpQ7thPyDh1rrPOAuZsnia2pPuLOeLsmBEy4VAC8uTtbcmZGveAg6cMHJUm2gGkkun/gICqgAP84RcKRkuFlgdxwRhj244F4aD+4X/G1W5MvnmRc68/NoyWQE8TRfzDjFfb3PhHXp2OY6mCBRhbaNLwDYYQZ4dbomcx0h3Qi9IFJYnMQwzA9HyM0ulO1XWiVfQYyRAvz/qcwNh+JKZ025esC4W8m+JLX2lZX2Z5+IY2ZciHWlG6mTBtL4xmxIvnxYJvB3Lc+3/5hbBE9vuRMPUlGGxDztqOKDlfyOD7O3hl6XXeKZzFL6uxoAwBJGLpJWebPvUyqNHYKjCxCHkACsRJu2RZYJby8t/WsqIvFIzXKUQ6xnb7EsCE= X-MS-TrafficTypeDiagnostic: AM6PR03MB4775: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KoyqtEChB4PRrhNWoRAltSsD1aJ7XLGJpwoA3CJX+Q6Jqqvi5Uadkg+VUgh+ky2IZcqTQiEZziev7ocJwtI97fzSrB90weaYAXFkMdIZjb2v761X/bTtEZJNbSg8A2F5futImKy+XXMnIYKu6B5uRdKrLFxFyBXL6njdtLGGZMXS8NU4FP7vGL5j5aip/YxvWxupB4wyodLbLMxEDGDY76aCriItvn9d8CBZMuRoc8a6fKdNILiZVfTZ2gEnTsAkyXMyBGATUxyS2CWQqU9APz9cXzG8yEu8eI8UA+1t/moH8O728JRnsMIQVSalFDPAdfLGxouYQjqVsOqh0JOEUZVvtH3twkhy1SJeFqdCvk81c/6NBChl+SjxK8yfEE5/GCQEMK37yNvhD65jUhhrML1oRxBjeDvFnI8c0tiHxXFcvGZDVLHBWVkucU39pvmBJwHklVm8AJdPIbEE+ScaY/k9C0VYxnjmO++PrQo3ZmRL8nmsuJrXbxlUTtxcYO6jyVsu9/DOmMVMtQjhtQFCLtOsjrZIW4pkbQ5NMasMOCg= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: J+R9o1DegUqAoKh3oJGJxQiympX2gQkjYseUszrozkFqpx+QT8FKR8QLcdzo1H4loEpH7LedRbavedzHvgLAgZmN1z23Lcl7SDW7K1YS/w9tWuDi+bryCDGeNwaoQk2mLw+Jhnkas0I5PV3a5VhFdj6OILm25gkNH1OdSum4WQDxz8fMkwLmdqX2Z5z1zIbWBIEApHcNjDKelbTCEHUBDrijWLRbnyk3zL2ziQOEpSTGtM45LBJBfOdjQpTRXrESoX52tvqY/qKZoj2P9CswOGIdzJdQtG28YQqhxhJNFqqyJAWXaoZ+bZ2BeKP3caSPrtjzuEhaQdN2caqqeE8xgAqZSi5+vcfavStSaCoO2rN/TyB5rh0FKBcUArm2dW7hHCT8E/mux0zQC0jln4DIrBtns2XrDWJKPS9lYDlE5ZCARRkVoua5HuPpfJbNmr+gQyks5VJxyph8xEX8bhs5J2Jk+B7YenW2LZoHpNK/SlbGGkrh+1sSoLBukN0Bh9h0uV+X6urxfDSvHweVwKI6+dc4ILOLGYOX90EuIQwl82iEbf9UZYndyFST/xEcv+ULkUlFjxESJoRqzb3gZYa76JLN5PfA12HnelHDoPJvGH3FhsWWM4sy8ICt2Ypcy5yIZVJ2lWhnh7IV8UPaX6hAuYFpKdli412vBDkxG95miZXAFzGcjW9hj9MsTRCUIBztRcfTja0LQBP++Q7VohXO3g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4f54656f-cfab-4a82-a6eb-08d9a3ab1385 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2021 18:02:21.3898 (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: AM6PR03MB4775 Subject: [FFmpeg-devel] [PATCH 09/17] avformat/mxfenc: Avoid allocation for timecode track 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: O6onCZC3iXfB Signed-off-by: Andreas Rheinhardt --- libavformat/mxfenc.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index cf63340313..aa9857fcff 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -421,6 +421,7 @@ typedef struct MXFContext { int track_instance_count; // used to generate MXFTrack uuids int cbr_index; ///< use a constant bitrate index uint8_t unused_tags[MXF_NUM_TAGS]; ///< local tags that we know will not be used + MXFStreamContext timecode_track_priv; } MXFContext; static void mxf_write_uuid(AVIOContext *pb, enum MXFMetadataSetType type, int value) @@ -2712,9 +2713,7 @@ static int mxf_init(AVFormatContext *s) mxf->timecode_track = av_mallocz(sizeof(*mxf->timecode_track)); if (!mxf->timecode_track) return AVERROR(ENOMEM); - mxf->timecode_track->priv_data = av_mallocz(sizeof(MXFStreamContext)); - if (!mxf->timecode_track->priv_data) - return AVERROR(ENOMEM); + mxf->timecode_track->priv_data = &mxf->timecode_track_priv; mxf->timecode_track->index = -1; return 0; @@ -3087,10 +3086,7 @@ static void mxf_deinit(AVFormatContext *s) av_freep(&mxf->index_entries); av_freep(&mxf->body_partition_offset); - if (mxf->timecode_track) { - av_freep(&mxf->timecode_track->priv_data); - av_freep(&mxf->timecode_track); - } + av_freep(&mxf->timecode_track); } static int mxf_interleave_get_packet(AVFormatContext *s, AVPacket *out, int flush) From patchwork Tue Nov 9 18:01:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31343 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp1494879iob; Tue, 9 Nov 2021 10:04:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJwuciDKaskQjkuR6eH5X6Me0ewyLw7+4W3EdBD5DI2K+K6TXoKemkehDa1bpG4dJrLimkIA X-Received: by 2002:a50:f157:: with SMTP id z23mr12375369edl.94.1636481051059; Tue, 09 Nov 2021 10:04:11 -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 c12si40700441edx.280.2021.11.09.10.04.10; Tue, 09 Nov 2021 10:04:11 -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=Wec5b9rA; 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 5EC9D68AE3F; Tue, 9 Nov 2021 20:02:39 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067055.outbound.protection.outlook.com [40.92.67.55]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8A17468ACAE for ; Tue, 9 Nov 2021 20:02:34 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IbE4T43ZZjl0o4RG4EAfQoBymT6iVPcuEjT9Y7/4iCSc5TU3/aLymtVSUQJr21HQPAPafs5X2TSw4UFf5AUERwvmP1xOfkKh556B5iPo/MR2NqP0GwcM33sz9MBs9tX/iw5rCg08OiSJw4nbIdvcMxGCoTe+NQDBCl4Kh/b3OxCH4xxFYORRS4hDdsXMyA08fdGxgxVIHNNDlK1q5CQyOlihzShClamQekN/SeQzCHKTNDN1nGp1I/MAUeKZ5yqTTyyzZ3OOYU3Gvoy1AVpOH36T+QZZCpEOq4t4JKpRJPDxS/vRrxbnP714oSZrUmQoxxG/5RUrlnnMsTj+vcbbpg== 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=WgobtENq9u2HOBtBAcZRFF0crfaVeI09Bww+INYgqJE=; b=JlZr8hjEWcB9txRNbb9CEP8wyzAMXIZS2fhkNajUEqO96LtMYgCMp1pH0YwZB0UDbmgnw0JuFG92DlJiDFHPeLqOsG/7dTaY7zlKRPYxGAQImRNi+dmgyZpEzgJJ0n54kUAdUWFJj+vIJRjh0YrcZXmfqNhiRV42Y/H6IHvYc7+XRgxz0GB3yyBLKe6ecyBIA4+aq6uTet44rBzy6YsJk5onj/ULw6z/UBHHZG/+fplOQa4M1oAFXUcI2nOAE1rxwY4eWDRtbBy+tEKaWNxuJU5ItA8md7j+Yog9ZLQc+nyyPoZKYQiSbu4X5hMkVw+0KFju84DV7HVN6e72tsuH5Q== 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=WgobtENq9u2HOBtBAcZRFF0crfaVeI09Bww+INYgqJE=; b=Wec5b9rAM8S+PtT7sAcg6NMIXMaJjQtcW+yxYXa1ZV5khQwFpPUO8/+zFyP8d1l+DzUzzlil4vlqx2Wy9ch7mXTlYLfwKiSx9JshMvT7WEMAh/wZeRAQ3t+MEz3jkZhfRvHRukecYGRg4Kl16adJ0EpPVbdOmOmHeXTFiuRQG9mA76vq5k7huOgy3fiuHQQXkIZBHnebNy/g3XbtrIqWsSe06Vh0Acwmz+lAFA0dWgLo/8poSnP3nf8Oh3jIGB46wW7y9rHwF62BxF6MpLrLSnWIn0b4OLfwFj4/hIrBgrp60ZDpJDPWQRmj4W5j8XvBUuWn+oRoWkB8ioem0wuxjg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4775.eurprd03.prod.outlook.com (2603:10a6:20b:d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.16; Tue, 9 Nov 2021 18:02:22 +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 18:02:22 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Nov 2021 19:01:48 +0100 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [UC7pt78EEW7Fg8aXZlk/ap3ixZjZ67km] X-ClientProxiedBy: FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211109180155.881111-9-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.171.90) by FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.5 via Frontend Transport; Tue, 9 Nov 2021 18:02:22 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0888f586-3614-40d7-6588-08d9a3ab1413 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRIlshE2JAC11E3nazVg9SyC2iCOyybFCJ8Q/4vw0uLUfwhM3HCxuX8Bk5Ar3apNM37H0laNndjfrnnzCmZIBGeqp/f6tb2qTDDNL6WsqbxmbNAZW19B8Qd2CrZmpNwOWQhk5AjZORa+4ppWwA8wMSqfP0QBsEdTEPrSGJ13nRl2UuRLnB+bCMSBjISzfpDcl4Ad19Vdhp9UGiJ1XO6okCJxAP8n+2HVPO5UI9p6bDDWxbfuqiyWVsbQvOQpPdWWnRyHbPpPAyZwLI3BxCSW7h831VNiyCrVFDeIWNr8e6JUn3vqqG5kiYkne/Uu/Xj2N2wDOlheeBlKpcWngZENglt3xtLOsqgIvzRaqlMFEIToHw9wX3tm2oP3QxR7PQT6lVJIiXV3OTb3uYcPT/F7AeF4SyCvDlp6y/2q+fSiZgQ28brYKdPvrSJfWCWA8y2u+PAE0WyD0JqiJmZVc/XkZlS1qEnBKr5KlW6HcJ1pqtYrncd/qiBxLLgGQDlf60rByY1X8uyTgeDinb+Wm+M2WwuvjdE0j7gMPo3ZNf44q0jONuYv/u60fFNwG8KUO8qVMDhbshW80Qnx6k1RNFOQc7DVOhmjKW57p6zEdjDDWk4kgAcn+ompin/aErkmChxC4jfRHo9eHLmCn39346rwrwRKv+ueHXNQPiP+uYg/ED40r1mfTzv6PlE7o5cuD+NJOxl2Xt5ONpLj0WMHlV3srElf9xMw4AucgSI8M6f//w8y9cRK/j5ki2gwXqAbAhSSFg= X-MS-TrafficTypeDiagnostic: AM6PR03MB4775: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OtMATKURrVweMWhGqRCo+SIrslLtpyEbQk/2+4bY4VUuSsIt/b0x6gkCUUCH4P9sSM49GyPOitPa0TM0BE76wXKm5mwq3KelcRME2hMtv+LFYufmhi+QYbMrsfbFm9ch8wAH7/y1QH2ZB41XlZwKnYDmspIt0j28DMstU3qLUaAIm2BcUDWcI8+CdMmBS/0VbXjCsNGmhqao3YtM8nEARrMN/ZyoRvdppwmflZrjJMkKLRvr1cwbd8ADfjeXxGxgnWpgUv76coN5lD2KUszB6XkUpR0RRH4wNp5ckZyhPtucTtr0ZbT01qx+znAFE14kZ4G2RdaVwV5PX8tQUGpk9ju0LDyQEl+zuC3Xij/Ebk0LTaslukzOlZoo/K59W1d+eKc5JKjA9yGWBD6+isLzzMjUzIE1FYAPRYix8TGAUHCcPgnrtOhDeprJ62T4vLifvCWJgECayJZyGzhL6oVYvYXxTcO34UgY4XlraQm3IS90ysgK9KvZnRyiuL5QA1nEeuy4zNtSzJTLf8+z1euZ8hX4iZyvq8uGPey3N8wwVLQ= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BLfxnO4q5E0d1LBEyPv9BAqrxC/EhUBjYoqusDMWT0SWDXvo3h2+gvU+QiPzNOfbfjl2kNlrxcYY1u4n1Y4WvD2S8Vp2qFySTEiVETMu/lv0lWnDm8TyYgzGA8U6TOS8Vu61mqTRaLuMF48VLBx5GeI+LVSKHDGi2sebP+Ynisg8+XMbVQXNtTBCF8qNhMVI6IlVjW+6qK7pdWtLh847Z/YWWeqT6VJkHt6NFutEObSjjRP9W0mMwFD+LWoOe5e1vSLN+Mmvz27RJIzkiDyozTUDU24FOLtFndZb97n7SVvjCPhZJjuELbrirK1APj3nF49jG6lRMI9Ieob6jWWs9SyhX3GOhCJC3T4ch4f6eTewK/TfwrBjBQy+FQnfop3PRtKM+xKOZNQxiztp37efchusydbXvbvZYd9aBzvReoQCy71lYOe+6YuxU5dP3ZAv+5jJLi4o6Ekq2gABZiJgEmFjjRGn2V5aaxWxKXqjWVEpkI55s9EFZCCWMYklTtsm3LDvQtpp6agB49XGzIpfokS+H0ZnR7jJfBxvcsx0ijQNQvsxKVAbhBUtw9nMRt2YJFkJoD41LevXYgyn+CM8jTto4X7ci1gCqiIlNFJAHUproV1nPupjSZ6z9b1imQRgQ4SjGbZuXXh+orbKa2rNDDhS7R66O4hlUlfzLCFQZfpxw6l2j2CDLV62IZ6XjZQ6L7iBByJPce2cRxdw8WDlEg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0888f586-3614-40d7-6588-08d9a3ab1413 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2021 18:02:22.3317 (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: AM6PR03MB4775 Subject: [FFmpeg-devel] [PATCH 10/17] avformat/mxfdec: Simplify data->hex string conversion 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: 1Pf6v7ecON9A Signed-off-by: Andreas Rheinhardt --- libavformat/mxfdec.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index af9d33f796..4191e82474 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -1984,22 +1984,15 @@ static int mxf_uid_to_str(UID uid, char **str) static int mxf_umid_to_str(UID ul, UID uid, char **str) { - int i; char *p; p = *str = av_mallocz(sizeof(UID) * 4 + 2 + 1); if (!p) return AVERROR(ENOMEM); snprintf(p, 2 + 1, "0x"); p += 2; - for (i = 0; i < sizeof(UID); i++) { - snprintf(p, 2 + 1, "%.2X", ul[i]); - p += 2; - - } - for (i = 0; i < sizeof(UID); i++) { - snprintf(p, 2 + 1, "%.2X", uid[i]); - p += 2; - } + ff_data_to_hex(p, ul, sizeof(UID), 0); + p += 2 * sizeof(UID); + ff_data_to_hex(p, uid, sizeof(UID), 0); return 0; } From patchwork Tue Nov 9 18:01:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31349 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp1493791iob; Tue, 9 Nov 2021 10:03:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJw9eWCyr4+l/zTterAF/r3FM69Ua9b31uS/jPOefahNIXKUCVvAFSaJxBYk8vZShdmYjdvQ X-Received: by 2002:a05:6402:4389:: with SMTP id o9mr12959906edc.57.1636481005657; Tue, 09 Nov 2021 10:03:25 -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 l5si30926681ejd.91.2021.11.09.10.03.25; Tue, 09 Nov 2021 10:03:25 -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=ECdNizum; 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 CF1BF68ADF2; Tue, 9 Nov 2021 20:02:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067059.outbound.protection.outlook.com [40.92.67.59]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F08A168ADB0 for ; Tue, 9 Nov 2021 20:02:28 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=U1aY1NkJOEQXEnA2TeTWFu2p0Lb01ddasxWSaS/3c+31AXBOob4yw5B0Wh9okIJPQFG4T5TB9GND1NjEniAQGVbKQAndtBv4hcNgbaNXz1fshoWK7XM+jmyGXhH0nN4nVES4w3trk1mecLya3bzBuhpG6p8/r4qNBRJXtplmtQoPboDAJwdUuRxxGFo7SbsPGMO4DOgeiXB1xV5mV7c4qu0hNMUuNRv5ncbeMkUcpEjX5Fcc23GD9Ht3VqwbPJK5WJwJUulq/425ggoVg2DzDDnTP6sXH5CtRvOmwSRkskGADVrYBB3EeNC+qFs708DHAbYEhXo4Z1tw93qpE9LMvw== 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=vlB7Rsy2vWxxptc49ICMDOzDElngjVxM+Ud0Xiexq6o=; b=dMsU+0KufvuSMg8XoNe9vUFk42/zteztcHUc83ACBtkJBL5j26P0Wdl7IN/CCbaylAZLJZaAJpABfCgGYP1NVzDMZbO8g+393QnTRy4qV1NLz9KVlAlKsAN0ep+tMD5gkUjD8pV5KIi3bOdYPo4fYyR8Po/L3meQoohT0tM8vKWjir87k15thuwU1xdoRuIC1iom2sOpdZ/UCSNYMI/gOzSBrEYDCAeIrsgtbty4Knsqv7x2P7//CMpXRmH1cWJxtQUC6d5QZ11DIyQ1PKf173QwMsmMCHzCAiD028Zy3CBuEDop9RZiuoINfp42BNvpVaixkFeZsFu/6pn7flMG9A== 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=vlB7Rsy2vWxxptc49ICMDOzDElngjVxM+Ud0Xiexq6o=; b=ECdNizumFD9XpmD3STlLkQOni96gpNXDs8SDvMz0ZqA5dx9xleBjRGBIHhc8BxLtTZPIJgrteP7tMoerb7KU2ou6nFXrSxkUlHmv5i/HQFR9t14t3NUizFZBOWRydNqIkUdRLx9nOX74Cvs/CY6FgAqVoWZ8USerPhApIyIEY8xg1TNri6NdNdchtkEs8LkM7DkAoyVJG8ay0pauqa6vcjqh8TbnmxlR5DN1uzrUZyFvjfRv4RqXMz1kQT9TIJZu8WbjO+M/H6d+HHupxyb1/fRfSuWpU82gOgdKQWis6udHVHCcNv8xooNs0b9v5is+2mv4KrtTeDtGYUVBipBFgw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3959.eurprd03.prod.outlook.com (2603:10a6:20b:20::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.16; Tue, 9 Nov 2021 18:02:27 +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 18:02:27 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Nov 2021 19:01:49 +0100 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [L5N1MFOPYjLLuHcPAc3f15doUI33ytYG] X-ClientProxiedBy: FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211109180155.881111-10-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.171.90) by FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.5 via Frontend Transport; Tue, 9 Nov 2021 18:02:22 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 30e72791-d0ab-4faa-a7de-08d9a3ab1745 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUaEas4lV0e9Du8ljla95f+gulnuwz6sW6VsrAvNmrvyATQcEbZaErrIAj43TqvvzV1qHs3mIOVybiqOQeqsIO08wjfILte7PxLwTprA0Z4CB2cex9jIuMzTGe705PDIuwHcUJBXRGMrkpdVDnR2tJAUxvtI9HGh8CBsq+v7m1DopB/82QedrgIZ3fZHxofX+dJoCWwp1AKfzAIxhFGHRdPxOOq6oY8twi7rAUPzWqMrd0U/2watk0q/aOfaJeFPKOdGsoOg6jdEkpwzVDn4DGBicXns3V+8ktkSYSuzwqpuentte500V+XXrofMWCsdgR8LPrm5iDxP50UiArEohe70w7BAwi1fawgQ7j+9h+lzq8ru8FUcp7s38cdfgDxLlU8qlBlAA1aOx1RJFixUAEV7F56qIpAJiVpSaKTyP7riDk7ag8SsfgUVZjOMYPfoQUj/g2q495ELpr+N+6SHkfgSrUtz31M8n+rsYVyCBmVRu7001A9Lrx8Tti4PV9YZqeb7RjhI1P4gusNDRv886LZkBcL+mHywEJ+JtezSArCh16/WrtGhQZwjWlY4QxnNi6Iq8aDvCyty3GuPTiAIRh8G0ENbBMaNuwurl+D1c4B9tnrBNLG0duVZqKGqA8Y12szbJDFSqSz1HGFocZPbl831op31aj8FBEYCcypO4jyvE+PZtcDMdu456ZSiZQy2h3GmZd8W6Q3YCsyaBjn34RD3ZryznqKcEM= X-MS-TrafficTypeDiagnostic: AM6PR03MB3959: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LSD4D8sxAFKy9RMOx2G746kAlTAgW+iitne+/POmi4ig2tRNJn42MrwJY9ZTETNRS+o1Zl5YQFBkpVOYc05fCwzq+YV3CJEACnOSUdD5DjThkMI9ROydw9ZQhTIM2h0JibTdCLhBBrwJOgy6pIjsSE9+UbAaS6HVHztfERCAVlN92OHnl5Al7EcffU5Ryk7SuaAQz0m/7Wpf1x7zjFfs7btElJPOaH5wVoPcRdMxPKIf9TTUv1twuhEKFw0tfitnjXobcISu8lNsRrTqvUl+WGeMJBI7e9NNpNqJiH7dOpuctGVq0ckIZd4JXjnPF02Q2jwBSC+0luehgYd4gT7+5Ha5bHCRhl1eToQT3HCRR7tUuop/QNIZrCyoHLa03u7hUu5p2eJBo0cBFWiRBK2CuVAPcyJVSIfCCEym2+qYcldRptCxBkPNBMfCdykrWGS23sRCd1TI7teL5+NJ01q3EWfDtvjkj74f5EJuNtfm+eFLyOcbJywxNaRiAmBOMoHj8/iS1TO3B8mkZ6noSTcG5WElptQMzM5MbbdvG7FQO/0= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NeMgEQj+atmfMGxnWLubOCQZKh9TQrxCTo6VWepclCrA2pVnLCqea3EJGSX1/JLUHFT3hutWOqpi6GGcOQjPHMeDVKMQBh7mxF58utouYLodDEAdp/cyp6kKkG034ys9Vu5VROA8Iwmc2w037KzwYjrT2QMR5wsUKW8zBR+bXF/1GtteNn0A3zoDmSTwJPA6tuUICIoDmjnoEJSzjXbNFzTALtYxXd1NfMuDxdN/v72nc3FqnRtl0GACPPHPRQ8pvvMP5T9Sob9qjqCDMFchxRkydGOZ9BV9zULCUyHg9I0LYR9u1xwSh8DUJkOY9/r45RQjnzplXTprSwlcB35bl1uGg5ePBuUYjzSxHrEKSgSfeQJR8RtS/05GAob9/T36UYaed3lQfcTTsMmkh7flgBDNMI28zW9RZGZbN+nEa1Ah0jTJSqJ+CKRuvikC3iLjRQTBe1bbsHt7Lhnsp5TOHnXrYqt+GBPBBlRUD6Gr5rGBv/JKNjhMeKg9WBFOFNy6jAIe86eLNdnMXlEMFnzaFKHJBpN3wujESr+7f4uAYsE2uMO8lpAP1nfxGqNrPPb5Pw6NNf4ZJidHx0AFJWhjJVI0MeWDc0MZ3e3OVJFsDyWLhQCXQwcJcIIlop2WATqrvysiODsS9WdTU17Xv6/QC5WMzEBj8H+kXrq6mPegCSqbh926RQsJrxNTBQJ/nXasRggjLEw5klLfHETM3lvLfw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 30e72791-d0ab-4faa-a7de-08d9a3ab1745 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2021 18:02:27.8505 (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: AM6PR03MB3959 Subject: [FFmpeg-devel] [PATCH 11/17] avformat/mxfenc: Store locally whether DNXHD profile is interlaced 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: sF6CYoDroE7d It is just a flag per supported CID. So there is no reason to use an avpriv function for this purpose. Signed-off-by: Andreas Rheinhardt --- libavformat/mxfenc.c | 47 ++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index aa9857fcff..326ec6a7d6 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -2036,29 +2036,30 @@ static int mxf_parse_prores_frame(AVFormatContext *s, AVStream *st, AVPacket *pk } static const struct { - int cid; + uint16_t cid; + uint8_t interlaced; UID codec_ul; } mxf_dnxhd_codec_uls[] = { - { 1235, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x01,0x00,0x00 } }, // 1080p 10bit HIGH - { 1237, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x03,0x00,0x00 } }, // 1080p 8bit MED - { 1238, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x04,0x00,0x00 } }, // 1080p 8bit HIGH - { 1241, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x07,0x00,0x00 } }, // 1080i 10bit HIGH - { 1242, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x08,0x00,0x00 } }, // 1080i 8bit MED - { 1243, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x09,0x00,0x00 } }, // 1080i 8bit HIGH - { 1244, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x0a,0x00,0x00 } }, // 1080i 8bit TR - { 1250, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x10,0x00,0x00 } }, // 720p 10bit - { 1251, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x11,0x00,0x00 } }, // 720p 8bit HIGH - { 1252, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x12,0x00,0x00 } }, // 720p 8bit MED - { 1253, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x13,0x00,0x00 } }, // 720p 8bit LOW - { 1256, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x16,0x00,0x00 } }, // 1080p 10bit 444 - { 1258, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x18,0x00,0x00 } }, // 720p 8bit TR - { 1259, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x19,0x00,0x00 } }, // 1080p 8bit TR - { 1260, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x1a,0x00,0x00 } }, // 1080i 8bit TR MBAFF - { 1270, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x24,0x00,0x00 } }, // DNXHR 444 - { 1271, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x25,0x00,0x00 } }, // DNXHR HQX - { 1272, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x26,0x00,0x00 } }, // DNXHR HQ - { 1273, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x27,0x00,0x00 } }, // DNXHR SQ - { 1274, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x28,0x00,0x00 } }, // DNXHR LB + { 1235, 0, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x01,0x00,0x00 } }, // 1080p 10bit HIGH + { 1237, 0, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x03,0x00,0x00 } }, // 1080p 8bit MED + { 1238, 0, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x04,0x00,0x00 } }, // 1080p 8bit HIGH + { 1241, 1, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x07,0x00,0x00 } }, // 1080i 10bit HIGH + { 1242, 1, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x08,0x00,0x00 } }, // 1080i 8bit MED + { 1243, 1, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x09,0x00,0x00 } }, // 1080i 8bit HIGH + { 1244, 1, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x0a,0x00,0x00 } }, // 1080i 8bit TR + { 1250, 0, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x10,0x00,0x00 } }, // 720p 10bit + { 1251, 0, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x11,0x00,0x00 } }, // 720p 8bit HIGH + { 1252, 0, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x12,0x00,0x00 } }, // 720p 8bit MED + { 1253, 0, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x13,0x00,0x00 } }, // 720p 8bit LOW + { 1256, 0, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x16,0x00,0x00 } }, // 1080p 10bit 444 + { 1258, 0, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x18,0x00,0x00 } }, // 720p 8bit TR + { 1259, 0, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x19,0x00,0x00 } }, // 1080p 8bit TR + { 1260, 1, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x1a,0x00,0x00 } }, // 1080i 8bit TR MBAFF + { 1270, 0, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x24,0x00,0x00 } }, // DNXHR 444 + { 1271, 0, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x25,0x00,0x00 } }, // DNXHR HQX + { 1272, 0, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x26,0x00,0x00 } }, // DNXHR HQ + { 1273, 0, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x27,0x00,0x00 } }, // DNXHR SQ + { 1274, 0, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x71,0x28,0x00,0x00 } }, // DNXHR LB }; static int mxf_parse_dnxhd_frame(AVFormatContext *s, AVStream *st, AVPacket *pkt) @@ -2077,6 +2078,7 @@ static int mxf_parse_dnxhd_frame(AVFormatContext *s, AVStream *st, AVPacket *pkt for (i = 0; i < FF_ARRAY_ELEMS(mxf_dnxhd_codec_uls); i++) { if (cid == mxf_dnxhd_codec_uls[i].cid) { sc->codec_ul = &mxf_dnxhd_codec_uls[i].codec_ul; + sc->interlaced = mxf_dnxhd_codec_uls[i].interlaced; break; } } @@ -2098,9 +2100,6 @@ static int mxf_parse_dnxhd_frame(AVFormatContext *s, AVStream *st, AVPacket *pkt if (frame_size < 0) return 0; - if ((sc->interlaced = avpriv_dnxhd_get_interlaced(cid)) < 0) - return 0; - if (cid >= 1270) { // RI raster av_reduce(&sc->aspect_ratio.num, &sc->aspect_ratio.den, st->codecpar->width, st->codecpar->height, From patchwork Tue Nov 9 18:01:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31354 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp1495197iob; Tue, 9 Nov 2021 10:04:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJyIaCKQ6yNGT+NkvQN1a0ybLtvPDTnDQi0RDBCUe2S7fpcR8MSXasx2FfC/g9JdcW77NXDJ X-Received: by 2002:a05:6402:4381:: with SMTP id o1mr12149432edc.301.1636481064902; Tue, 09 Nov 2021 10:04:24 -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 m5si42545886edc.80.2021.11.09.10.04.22; Tue, 09 Nov 2021 10:04:24 -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=gul3zKhg; 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 68FCB68AE4A; Tue, 9 Nov 2021 20:02:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067021.outbound.protection.outlook.com [40.92.67.21]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9511E68ADEA for ; Tue, 9 Nov 2021 20:02:40 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Rv+lgaIZ7hIosovENRijACSdRU312E3Y+N6FJhNDdcgM27R6YHpK6EBAXgkphkI23NO202aZelXUmYvwiekbQdOUBX29ynwERAxaTFtFbqjAk9kkJpv05gC0hjqGWtQ5Rr6QO3la6nQW+Bsa8hpo1EkLAiwr754ekYsolHvEGS3cBQw+a95o9/2K5Djr8P1OO8LS2/2GvPZdVpE4NCsYZcc6PBdaFHzkSZF0d22s23wduZC/ZolEmHDCHor6REjG5eTiVqDORm62DNF2urjuK0PFmZPQALaxu+0qP8fHT6wXXqiA5Lj0a5puanxougFdLMjqt3ofVBoro71BMpXSYg== 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=i2KbpsUHZrCQZt/W33q2dIhIG63FGsT0MFeliqtI6j4=; b=GHqqqmqkFdUuDJPSLsBBBR9GBIVSiaLSrk+EAECBQKZGgp3kqVwZXl5TjZSjVvmH26+6dyN/cx0QxuLJcyS0857jEOpQ6SuHp6BWcO1LTUQgKhlh3xyHe/CPkxqODzW0DLqFbmnc2XWKv1D5GrBQvzHRJr8pJbSr5JK46Tk3pOsBxnRSQith+cbsji9GVS6poF0756utgGnnJF7aNIRgiTN7vPfqssVdbLcasITag9be8Ja/xoIdagTiak4Hugng41UHQ+2srOnI/iuhmM2WVV+tmP9xAen+Vy2BfqYUIpb+qDudiXQhfv+xwf7OVx3sleSwPlKZ0TwOJNdaUUx4zQ== 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=i2KbpsUHZrCQZt/W33q2dIhIG63FGsT0MFeliqtI6j4=; b=gul3zKhg30Hc2GyUUHW88vLRY8LLGoyX2q6+XHsU1NFDtUl+eWgU0rvipXn2W1aqjNHRbGo0iRyaIlFEm5LxUKzOxn3FgpgWwnixli3ZMSAzZQwWYjr3/FMe0xJBMX8q1Ed9Q0ApisQRX0YhF/3nsk50SmsDy57GrGJEQt18z8XcyrA2pVKDV3MiUCIJXailsv8TwL2tEtCQzupOrz/KO4lLYBAdOeRIvQp/lZIh49XIqFk+1qU6M8JBtPcf5U7hjOgHvcorodj9TsqVWPNG9ktJL3RwQs3Z9ZPmbHJ3x3ECg3xKc6BYwcShSVWUstsKPPZ0eNraGLD814OYeJzqrA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3959.eurprd03.prod.outlook.com (2603:10a6:20b:20::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.16; Tue, 9 Nov 2021 18:02:39 +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 18:02:39 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Nov 2021 19:01:50 +0100 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [WjH04FqezoxC69f5rO7wi4mHuoPsuz6x] X-ClientProxiedBy: FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211109180155.881111-11-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.171.90) by FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.5 via Frontend Transport; Tue, 9 Nov 2021 18:02:36 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8ff3eff3-a4e3-4400-e1b1-08d9a3ab1df1 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRIlshE2JAC11E3nazVg9Sy5UlHFc+jAVVrH0NlZ3falLl1kzDBUhsUxOWOV7AGDKGCnS6cW5PxBECf1nDlhci7xUaqlmgzzcNXxy1FlvOsbt0dkzTPD8nQX1dyxlwtBD2GXYs6XtGh5uLPxC7sZ7nr7Tssz00NaxHSZNh5xa4ttBc2Nk/GHIjjQYxtT1fvNlKjVt+aZEi8l75UZN7ubwYdvdAg+TTaz3zBwH9PfVxHJoP5VVZhh+waCIEUja2pTUd5yXKk2XJkVhLArOP4GQzZtjgXoqBXfDxIiGTGvdQPmI9TmYgp1RczoOzffdy6ICaEWQsydNhqCqrJLBB/6uMormP2bALUEGreXLIqi8xHtzw2wVsiviRRO1i3CngINnFzkvXmIK3JT5eER/Jp6E9k/uSbQTQ2ClauQb3OVan7J0JmX0Ts3VZHOmEPHrNF0drVjI2/4QnxmMpdC92toIANSs4SupxeV0PHIU0k9Yg9Ljx387zyGKUAnt9jN73AAobDJfOjPmR91jojFxkpxu7FTYpFXDlB4X5UNpC9raq9CNEeXPM0VWdEt2TWRk4VxBhFFkJWeIU19I+vGwlfzumbkdN1A/voaZLBCcLO2WJHeEZweMdg2cXIoNiOP2q7eAJLNzWo5Hdw0C0Jr0UXObVNfMKBDtim8IVd6IOYXytZ2a9Aja4V9wp7VTihb04I3PrE4eF+bO8nNccppAncDVLr6dUvd7cC4ch65i/2iby0vuFlxtHF4cXOH76ti8RHDoY= X-MS-TrafficTypeDiagnostic: AM6PR03MB3959: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bUXH656Gk83T3DqiYGJyUuzmCp0lGzlrckdcZ7tKToGqNTRI2PtanZ5zA71dQr+aS9k3EEJ5HM3rP8TGLip0cg0g0AVEa6dEoQm9IEZksSAE96pRVY3XG0aFWl+i8E7a1hxEOzrYcATY97CvBMdU8cOdTPRyjeSSxsFvxby0KCBwkT4nbazVE29uQe0+tFYWIVq/lX0Bet22jL5tHwEvrxPbZpPhJOcb8Y+rpL6RvGPvwhz9yFXt9Zzr4+rmdBRtAvq2BZix7o7P264FeNVp1fJBJd/DCzBy4lbiW5HWyDVBXmVMiMnuosg1BHPuJyM55R/HIocOgb5EYXFxQl4fG7Kg8FDVboIm8oVy0dm6hzRl9e4kIfJZN2QFDcQ7ae4MfM+XJx530W17sjLcOG9kCXdaCs+7QY85Jtr4inEecLeNr8pCZYQdR3uYCTo1veH1f7GGUirflwNjfihOcOyPeeKpMQKM9IR3uuEs4BTeCa1CjFilbnYhILJeD92rpVMlYqsFGEEpumECdkpu4AgY1g18hgT3NeyeJ5RddiQ80Uc= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LVSjXrOuf92qMJSPV0mzAk6bCuX7PcW73S6RCL3dAPPbtYFaJtiqF3TeMrkITIfm9z8P41xSMXU9iQb7M9Vo/UaJIGAtnr9mfAU+K1FhG44TkDPJn/YOguOa9ROmNJH1rn4KvAzXy7eIJLFqU+nUZYsYH4B0STUFvq5Hq+qOKTwg5iDFs32wRRTDFVs6nuYcEthnKIKcAy4vEmesgXTyCByv6VDM1eMEgr2+XwD3FHl945i4ffRskrpQ2qlcuOO50LAH7sQzj9vm27LL7cM9kgW01LSPoPknpvkDtRt3LLnlP5YLj9mNNetV7h9D0wVhhKi7PQpbUSph9COr8/pOr/RWriuZ57HuU/QDpRdovZqkJZSALpng0kEeu8TLs4cH/dc+7o2tRNX7eoRuezPyTxCpG2asZUwGq8WGKKn9m2vKmo+7ppek5xhX5l86V693Ib33WQPhAlnv9bpZMRfavlG63Py7T53tlpiJ7CihL1Edi5k5X2ecTp3WN/chzumJrr42zZoHY+Vv11UYBaJAqCr2APjz9u75PRTOTTJZlNCCs5nvj+ebdd6JEzpztZideVx1sk8Hlcg/da5v/WI/2n37zzI+MfqF899OyYdMgyQuo1ovnwihsgZ/rC+CG8QqsDWXfBkGyABAPvntwyWAAajaaT8EVrnzLld1Z0CBi5njhx25rwVhEWhUBuWciGnHUVcU7xViVZNxLjLS36J/iA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8ff3eff3-a4e3-4400-e1b1-08d9a3ab1df1 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2021 18:02:38.9460 (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: AM6PR03MB3959 Subject: [FFmpeg-devel] [PATCH 12/17] avcodec/dnxhddata: Remove avpriv_dnxhd_get_interlaced() 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: Eb6s1+C92FiK It is unused. Signed-off-by: Andreas Rheinhardt --- libavcodec/dnxhddata.c | 8 -------- libavcodec/dnxhddata.h | 1 - 2 files changed, 9 deletions(-) diff --git a/libavcodec/dnxhddata.c b/libavcodec/dnxhddata.c index 3a69a0f501..e3b260f328 100644 --- a/libavcodec/dnxhddata.c +++ b/libavcodec/dnxhddata.c @@ -1105,14 +1105,6 @@ int avpriv_dnxhd_get_hr_frame_size(int cid, int w, int h) return FFMAX(result, 8192); } -int avpriv_dnxhd_get_interlaced(int cid) -{ - const CIDEntry *entry = ff_dnxhd_get_cid_table(cid); - if (!entry) - return -1; - return entry->flags & DNXHD_INTERLACED ? 1 : 0; -} - static int dnxhd_find_hr_cid(AVCodecContext *avctx) { switch (avctx->profile) { diff --git a/libavcodec/dnxhddata.h b/libavcodec/dnxhddata.h index 898079cffc..ecb1cd0b2d 100644 --- a/libavcodec/dnxhddata.h +++ b/libavcodec/dnxhddata.h @@ -90,6 +90,5 @@ static av_always_inline uint64_t ff_dnxhd_parse_header_prefix(const uint8_t *buf int avpriv_dnxhd_get_frame_size(int cid); int avpriv_dnxhd_get_hr_frame_size(int cid, int w, int h); -int avpriv_dnxhd_get_interlaced(int cid); #endif /* AVCODEC_DNXHDDATA_H */ From patchwork Tue Nov 9 18:01:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31351 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp1495451iob; Tue, 9 Nov 2021 10:04:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJzs6yGQ4zgaX40a9F7c53UAtDijGRY0N9a49Rmo57cytxsW4z3uupFVHgApk3xwL0xjTMsW X-Received: by 2002:a17:906:489a:: with SMTP id v26mr12337514ejq.305.1636481075576; Tue, 09 Nov 2021 10:04:35 -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 s1si32249723edi.608.2021.11.09.10.04.35; Tue, 09 Nov 2021 10:04:35 -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=h+3uXQ4m; 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 6604C68A8DB; Tue, 9 Nov 2021 20:02:51 +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-oln040092073093.outbound.protection.outlook.com [40.92.73.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7D04768AE51 for ; Tue, 9 Nov 2021 20:02:48 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cL33ypuZvcAg0F315PneUU5cY8YZY4oHQthtnvfXLf8gRABRAPCziOQ2Q1e4qKaa3AX1CbaH9JA7DAEeZGiKrflTHFUIDUXh6Z8ibL0T7swpcfytKHPgl2N8KQnukqv2B7yGskaqMsu4op0kVrkOiCynahv+kmaxReEfCPfGDtUXvgozfQ1k33RhRBbdNwuyTax2Ou1MCCNgxyJNgtaOlv9UNeeoKLEUV/G40TQOqtnqYAfgzE+zzUPfr1l7Uhs+gp9luRuRioiw67yjQ5Jepf1V2vtPeDawcRu7hICAVTwkiq11gdV9nQRfM2Mz6DIAKNhhg/IYImQY/nOnRyWOdQ== 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=uy/OyyuC8UKR0gquYlTB4gXFdVOLD0LCO2C+jx68Yw0=; b=HJiOWl06mieNXBa2++b2lOwSTVZ35VsQrPELyhA7weGSVoXpAiXnrTBdJ91cwrxrRMCRzur5ZB6FJ5FcpIqPTZKrwiOYbjo1OSOz8maeIQ9JnjV0ZPLjQNM2wvrRksZyoAKWtqEm3wpnAWY9AutEEa+dJayH3j1cNLRCUioNIYQ/6sr+xzRnBWUkYGai4NnFsThH0zlUuCRBuMg9wwiVFi6Vnx9C5U5np2hmtnvAdZwm+jIYWbvfvrUcEpQmrc1EeP/7mRztgFEmpzg9GScdlP+yDeTbQPkjRPAR6la/TFjN+/x86wHDnURqekGD9gpUntim/AnGoxVPk/MZYgn16A== 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=uy/OyyuC8UKR0gquYlTB4gXFdVOLD0LCO2C+jx68Yw0=; b=h+3uXQ4m+NZkNBGwyFYL6MgK7+OEPeaNCITlIwgiSxC9qFQANQtFPtYHxTIwc0BCPCkWCB4IA1wTvd0FjT1VJieNBalXom09J8tcJg3cLrI+yr3K3vh9d/Sk0GIDqJBgsHUupqnlzjyMXuFPcdvDRCuIiu8ouY+38raeUQSKrsqcxuzcXKsqFJ3nBHanK2dwJi8RG7fdvnAH8+pbQ2FHcJqUJil+mxnPgtCU2XujYMODDEx1hHgbvvccSEzqZp64Niyct1GU+sgOAyrdHt3WoDqOW/JhGxfJP1aekTK+5gWLQva/Y1XEWYIVgzMcHHY/dFzZb7zF5e+brJUKjDFOlg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3959.eurprd03.prod.outlook.com (2603:10a6:20b:20::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.16; Tue, 9 Nov 2021 18:02:45 +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 18:02:45 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Nov 2021 19:01:51 +0100 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [YnJqmFBSWq5kJD8wsH/jMmtEu7+7iw6t] X-ClientProxiedBy: FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211109180155.881111-12-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.171.90) by FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.5 via Frontend Transport; Tue, 9 Nov 2021 18:02:43 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d4419eac-9306-4f4d-0034-08d9a3ab220a X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUaEas4lV0e9Du8ljla95f+NnZ373470pvvGG/nPAkZZzbUpnr9y1S4lz3s2nYVoA9B1d3L+Vf5whnl1K/OoYR43EMzqf8ZmHTK62EH3EpCsY2s11TsfPZlICQcfU/2zpLTQTkFt5OCVqY89D1nb0sa/4lhtky9ijz8jPMbuxPc/LFwNfsoGbDfMXo/kYoPRFltTDoe0Lg7HEzJHl+yXN80TgPhRMlYS2Lk1e3TTwj5stCY+1nEZO1DfGoVflcHYsDAWBzQLz4Ezi96BaBv0PbtGuJZlZDJd3yUIxaHOZbuIURLDBSgKDPgG5a5w2Qt+VesKZGkWh5iYJZ3uzuPT742HeBVEsfnSLwqPNEAeKrYBt7amDTz1kj+rQ2zsfSEJqr5VXclwxwUtfwGTMdqpon/28ClN4l4de8BpDAZwLZ8HIrWiEdgbilxrArTV54ard4UnmQiIfbHtB1SQ3RNJ3zECKnIvpQHoUvO6a/3n2YhzYe7Q+VmguA1kr/OwApnBvSEOF8TltlMT8vFeJCd0ZuyWc+7GgPV/fRgYgXrkFVDyz2xEmL6oefTHNgO7tyTL52dcKUJRQ3oTaU9CIMm7l0mCGf8+KeXdRSsYOQCfhGIxtsvmVMXJH6b6bpLpQMbj94/yhcxSmyVKHOAqtVkoCxYo7B15QxwiDZrQvKdhlmzU7tYGzmeTj68nnw2zmpLB9AsVF+4hRJPgZoKCRWieiOp7Dyc4UPipbI= X-MS-TrafficTypeDiagnostic: AM6PR03MB3959: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7MHUCLEf/7WkhKhf7uZ8FXu/yapuThUe0pksQNRKpZPH3xNCvnGqtFGdW44LmtGnAjqCLLWx6W5oTkeS4GQap2q/IaPlOnreTnkJQzIaVvu6Pt3oneNWDXn6Nk3O8Y+t2AEfcVwQ7w+CInxvM1w869i09BxEpb6sLIOtJy65mIpQht27PMAZFebudPPT7bLMuRoJqFfbOFe6DOan7r2PTkPzQ9YosU7CsQuLqqm5Y9U0b1o7yD8eISMbhCAFIxK81RfdVlaqb0uqcXQLRMyBX8KKlG7o06p4Dnvce1K1/IG1rme/rPP3mq/IiRcWFVtW3zVy5WA+hoZmLVadl4MuLcBDSEI4ExgL54udVoTKhR0upn25wbTBuhonFsexzr/wCL+yRSUPXo7zt7W/AdOTC1yKUW9FV5EYeOEdyme2C01DMJTeS7aVW5JuhjTcyocVVGmovaeYgqCbX383BBIeBcNvM1jCr5tnYeorDap2zba8qN+xyBJj6n3qTkr4eT9auH9smMiTN4pWShcz2sVvWnHaHYWZvkfe5hAas5LADXg= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: zruA60gMPgxoJGDB+kCirKGIOv9uobdhUjruRSzsBCCE11jPMF3pdH/UyFwgrFxV2R12dT3qrpHjvMmhgAwAJ3zfCA/Efn4GQIA94J6ZMrBKAlElrPNFk67MxHiQHDFZEQtaFInmHFGq+J7PdhHId88c1O9ODKuIbpcmUYF+HF11nzXBCiWUQkGczaLQuerG1PwAZgG+DV2NnjjYt1japGGnJPUEkvC//YRRHqBmzfarDgn9C1HrWvag7ded3yKcBGTVUXa977q2DluF2mVgZZlNEEym1MQ8UVpNCBMUq8Em/LF+TGkQe3JtgllsD+SGwGFzXEnmo9g2836Yuni3iPA3z6WxcZF9cxka0JSfVEzoDrj8eTwgD1KH2g0k6zPJfuEJvGUdnExPwFPhTwMGMiUpHyMHMZEYoD4cjXIg7lJPYLqph87qJusAGcUbml0RIbPSm5Bfz/EJsnWQGlGiZZLNpN98DzoeJlLdlwbmHvHoimJSoAEaegCY+DY45LozVB0Q7vWqf/tQ3SdG0riYked4aTXteaK48AVRJUImPOYNn+AARNaySxGJOTS2/gsShm8DFqEDXpanQwUD8hfaKAfFvJDbjIuJu7LVnAqD9U4vWqipC62i0v+3Jm9hLX6jzycM8ZFUnKyxGMSRwxbmSiF0TKCrWsKOfJlShbMEnXg/s9rbbBjztaPhSU0jiSc4mXfjzfpTBNGPwFsDXsfovw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d4419eac-9306-4f4d-0034-08d9a3ab220a X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2021 18:02:45.7452 (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: AM6PR03MB3959 Subject: [FFmpeg-devel] [PATCH 13/17] avformat/mxfenc: Remove redundant DNXHD frame size checks 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: Yp2C72cRHd/u The actual frame_size is no longer used since commit 3d38e45eb85c7a2420cb48a9cd45625c28644b2e; and the check for "< 0" is equivalent to the CID being valid. But this is already ensured by mxf_dnxhd_codec_uls containing this CID. Signed-off-by: Andreas Rheinhardt --- libavformat/mxfenc.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index 326ec6a7d6..83f9a778fe 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -2066,7 +2066,7 @@ static int mxf_parse_dnxhd_frame(AVFormatContext *s, AVStream *st, AVPacket *pkt { MXFContext *mxf = s->priv_data; MXFStreamContext *sc = st->priv_data; - int i, cid, frame_size = 0; + int i, cid; if (mxf->header_written) return 1; @@ -2094,12 +2094,6 @@ static int mxf_parse_dnxhd_frame(AVFormatContext *s, AVStream *st, AVPacket *pkt if (!sc->component_depth) return 0; - if ((frame_size = avpriv_dnxhd_get_frame_size(cid)) == DNXHD_VARIABLE) { - frame_size = avpriv_dnxhd_get_hr_frame_size(cid, st->codecpar->width, st->codecpar->height); - } - if (frame_size < 0) - return 0; - if (cid >= 1270) { // RI raster av_reduce(&sc->aspect_ratio.num, &sc->aspect_ratio.den, st->codecpar->width, st->codecpar->height, From patchwork Tue Nov 9 18:01:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31357 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp1495736iob; Tue, 9 Nov 2021 10:04:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJy7/hkMepZjMkrfbdjLQP/BsMyzAANBjDlOkdvGzn6dlTzxJl/S4bcGRLSmsF+LAMayprV2 X-Received: by 2002:aa7:c693:: with SMTP id n19mr12527803edq.101.1636481087811; Tue, 09 Nov 2021 10:04:47 -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 bd9si33096667edb.629.2021.11.09.10.04.47; Tue, 09 Nov 2021 10:04:47 -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=Fp70UkhV; 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 4A3D268AACC; Tue, 9 Nov 2021 20:03:01 +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-oln040092073100.outbound.protection.outlook.com [40.92.73.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 87FD868AA82 for ; Tue, 9 Nov 2021 20:02:59 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LoVahWcL/peiV6q08Gpq12Zf19E/yxlX8VRRiZlTi7zS5gRMVepVzGRPYKzRC65ep8+NkJJdgjKg+IEMo5ub7qY02DtA00Y7u5iJunvGRuisowd6ZoWnMQWdNf1E7rEZRaqfrslmA6trabMhO2RlgPAMgFaYQBMkEiIX1plwp1DTswlm/stXfFMcjHi/ZS59uwKdOagr/sITFUCCQJpqNBCZdKTWEDbalSt6WC2b6b7tCJuNGmXHz9n05eKKcswCqiOFzCeYDx4rdCH6ZVSDdHHF1UGH3cLzy46vMoqbDizBKWEoVBYKuZv9Kd3YSfLd0nezMazqSvOMZB/DMIz1Bw== 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=JWIqHyteqm/XZThXy3wAWcX0V2NcejrFtk7gvS52nQo=; b=CHgxmvFpbo8Sg+JFBf4XZvHrJq78krXgJewfklBGt632gzIWMDuZRp8ZQnbTHS4FfIwTa1cB1ArfCmiKUnr2HmIEWrOOEig3lQFdquXHOUKjz+ZHIOAu7X4lWljT7Gnki2ZROagWTQmekGpb8XyM4afdLPaQBV1L3akoud27+cZxB91tsWOuUkTpJ6VxymQ3OXbJmlQVKGVJqbZulQocrE43h9+J145SoXPeusmMt8EkxRTXLleIYWpVMfYJ4emX2h/sDqS03EIBJpoACVB1XQdGgcUTJ+Cpx7iFr62WWRhEhK+CLOwK3GtqGyZzxfZIRPrUaYcB6rS8uFowvIK0Wg== 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=JWIqHyteqm/XZThXy3wAWcX0V2NcejrFtk7gvS52nQo=; b=Fp70UkhVeqwlcyeGBzZZd5cXVMzHYE5rqW1al6AmoLFP7AhwTzimiVm0YepLm6+MjpCX6K711wDIlev8MmAUKvJWbM3geB1AvFb6wN0y9mm6I/og6h+jXtKu1xu8WGoPhMPEdl+zsk81IZYbiidX9xB/K05xeLCNYD6YMheHf+z6RAnaZiC3coG9O0XqXOuioIjeoA6m8nv/JIvfGlS0XLANfAB7hZ8EbzFvBR1lyOII2k1TGT91/mzraWUI0wnGZL0jcGSt3n6iZ2OXZ2Xiy5iWp1fP1MzOZh8yzS+kbJI98qjO9/OnQseegicQ/YKEzviECrpNsUxukSdP++oEFQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3959.eurprd03.prod.outlook.com (2603:10a6:20b:20::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.16; Tue, 9 Nov 2021 18:02:57 +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 18:02:57 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Nov 2021 19:01:52 +0100 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [78+CU5RI4bh2Abp9TmVsFLinJOp6db3a] X-ClientProxiedBy: FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211109180155.881111-13-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.171.90) by FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.5 via Frontend Transport; Tue, 9 Nov 2021 18:02:50 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 198b42a8-c923-46fe-9e1e-08d9a3ab2947 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRIlshE2JAC11E3nazVg9SydSUgiaNuKQmUtYmV44N9sN7R537TZf//2m/t39+TlRujlGiqMPFDUtgGhU2ZlQhU9nynGMyUQ9lQ0Ub8W7Sbq4JHxbRShRBVLoR1n8tWywv1o2ycFCOqvJnQ1zXbArfceKd81gErgNAZ6V/t+IXFXgfGnGHLl9mByXXKadKcIwgiBtXtsqIBOHx/0Rdhq81HY5KjHP8ScO8i0/S0nCyRvHuanYd/VcGF/wqxVifyo8V03/01CgWENF864leXXLzGkG3PcYYfNkrU7NUW1R6fxXAOlxiN4WqM6jxBcCmSRG0UL4pUeYk34hCn5X24RODVc/73pqvRZVzZeWvp6NrnOVsagKOWmtOUyZD86PPkvYh9/6eKw1/nmZzsT85Kkxf+VmIzASfGl1ZWDhYRv8euOtdrvWI8hRDX4YAQNjAr9r1kWDMD5rsXvN1cmgSlcpOAuKdU6mhZifpyhef9xRyXKdrt5L1NhZdcrG01QituVjt7NzmwuOGxrdpElxK+dBfhnNY699/XWeJm5LmjyAXTJf4gxnxo6AyHXq30b1FYLfNkQ5XIQBLQX4PvE24/RkLc84TJdrSVWDN2mJ0oZ2fnjX7/tyo/nOU5dv5BzmZReJFbpDvn0ZlDgdjQp+MNYgXZ/m8ao+VEyjnZg3RcXhV+DAo5+qBoyGahJgjtzX/HvM5Fg/rle+ODG/F+U1joOi9xJTXFVY+P0nKOJNpVh8yDk8broZHcHmg3EJh70EW8Aew= X-MS-TrafficTypeDiagnostic: AM6PR03MB3959: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lC0sPI5fqzzZQl3aOkxXaAVDBSvtUifP50iRFmaNhgEz0tBQ+wyO3MugzrVMDXBZOTHxbuz7A9o4QbbKZ+nNcykmqozjxL3CJ77EAllffBENVe98weDl3yJ+a1XuhJafBwiqmeli28FbXxl+9POoSZFmsxTzwHRZxDGOEiDjJsX25AbECnR/eJylS1sht8CepzF6p4O83WOPPf6nj8Dd1Y7ZcJtCESyeQ3NfLlLbhLuuWCa1jU6z3Hg5jhBgD9Lm+Opl/b/g2fBDagxe5zuiKpfVFUtMuCka6wFSAGGFpDkeLHe40xnmZiKC3EBi3Md0bXsTK8y4OOSRla17Z98E452vYyeAjdteUyQfdBZukjR7adQXcUMvTbGAzGL/EgaSsUgxR0njsPovFf5bjhLf/oaonjF0Hs+j63nzCOmyccSBUruC6ULnD0LxaAH0mmiWlKHQdnqZRlW1ba7KUX9m3mamRTM1CWXD1S2Yc3IUjTk/6LiE1MbpWloRLdiHxMYZovGKBMxI5fmjuUnZ7L1HAYBjfQdnaHn3McsKcYG7z/o= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: G2eWG2XNSKQp1L38MkpWfJCg1PE3r6cWiAh0+DClR6C4BI3Ce14JlGK1J+kkMakMDnBZxvRtgD4t0U4tfgfgvRXvZ1K2xLpW9SK0E1Czb7Z2tIUGiPpwovqUtnQyPp2nZEdSQKtgS2Er0gAqto182k8Mq/nfjYdo5au8U+uoOMTkP6+KRITJVEyd3z9bfIeQVmeTt088NhRovZo81pHkYeDFNjPAUN4WqDF1lwCo2ctpnbFAx20TOXK6DEtFGVleBCNKJdtLgVEGoD26YAC8W/dBUWxbENouplfEiBL/VxD2C21fdjLX5nvTxSaysHQUlP3ZDvqRWx8/AF+SOwluMC4/Z6Ew/0mYSm7UwHT9i+H44E+/toKuK2gyUEybk8mSq/SMtGv82OL8DOF3du08xrp+LcrnEw+WVVDZ+jLPnxiaWM+bDx26XO7VA/bIX4YJTSog8ZZ/wxUsDGNpujFXT7wG3sOEBJnDVjmELBrgtyXpXitkd0zZ6T9iPzT9LDqKU38APhUcYwoFNhYTtsrsjI+f4CCuAjqluHBWy8H3jtIt3Q2gcGkXiJHfpF5rocL5X9n0weaYO3InXI2UJYJj60PMK3ULGKuQ6jaEzxAjeHZRookchTY0sNrKriIrbKNT5prQS/v+SuCns/TaS8DAMADPrd3WTHj/UUf9SkxFeQm7hq8Cj3DN5se06BUpRyD90NtPV/uRyzRf9zPoA2wFDg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 198b42a8-c923-46fe-9e1e-08d9a3ab2947 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2021 18:02:57.8901 (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: AM6PR03MB3959 Subject: [FFmpeg-devel] [PATCH 14/17] avcodec/dnxhddata: Unavpriv dnxhd_get_(hr_|)_frame_size() 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: LhDxFiJFNDX3 It is no longer used in libavformat. Signed-off-by: Andreas Rheinhardt --- libavcodec/dnxhd_parser.c | 4 ++-- libavcodec/dnxhddata.c | 4 ++-- libavcodec/dnxhddata.h | 4 ++-- libavcodec/dnxhdenc.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libavcodec/dnxhd_parser.c b/libavcodec/dnxhd_parser.c index 4ba619c9bb..631ac83860 100644 --- a/libavcodec/dnxhd_parser.c +++ b/libavcodec/dnxhd_parser.c @@ -73,9 +73,9 @@ static int dnxhd_find_frame_end(DNXHDParserContext *dctx, if (cid <= 0) continue; - remaining = avpriv_dnxhd_get_frame_size(cid); + remaining = ff_dnxhd_get_frame_size(cid); if (remaining <= 0) { - remaining = avpriv_dnxhd_get_hr_frame_size(cid, dctx->w, dctx->h); + remaining = ff_dnxhd_get_hr_frame_size(cid, dctx->w, dctx->h); if (remaining <= 0) continue; } diff --git a/libavcodec/dnxhddata.c b/libavcodec/dnxhddata.c index e3b260f328..cb3d4a4c72 100644 --- a/libavcodec/dnxhddata.c +++ b/libavcodec/dnxhddata.c @@ -1083,7 +1083,7 @@ const CIDEntry *ff_dnxhd_get_cid_table(int cid) return NULL; } -int avpriv_dnxhd_get_frame_size(int cid) +int ff_dnxhd_get_frame_size(int cid) { const CIDEntry *entry = ff_dnxhd_get_cid_table(cid); if (!entry) @@ -1091,7 +1091,7 @@ int avpriv_dnxhd_get_frame_size(int cid) return entry->frame_size; } -int avpriv_dnxhd_get_hr_frame_size(int cid, int w, int h) +int ff_dnxhd_get_hr_frame_size(int cid, int w, int h) { const CIDEntry *entry = ff_dnxhd_get_cid_table(cid); int result; diff --git a/libavcodec/dnxhddata.h b/libavcodec/dnxhddata.h index ecb1cd0b2d..861faca4ca 100644 --- a/libavcodec/dnxhddata.h +++ b/libavcodec/dnxhddata.h @@ -88,7 +88,7 @@ static av_always_inline uint64_t ff_dnxhd_parse_header_prefix(const uint8_t *buf return ff_dnxhd_check_header_prefix(prefix); } -int avpriv_dnxhd_get_frame_size(int cid); -int avpriv_dnxhd_get_hr_frame_size(int cid, int w, int h); +int ff_dnxhd_get_frame_size(int cid); +int ff_dnxhd_get_hr_frame_size(int cid, int w, int h); #endif /* AVCODEC_DNXHDDATA_H */ diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index ebfb85341d..ca67964330 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -463,7 +463,7 @@ static av_cold int dnxhd_encode_init(AVCodecContext *avctx) ctx->m.mb_num = ctx->m.mb_height * ctx->m.mb_width; if (ctx->cid_table->frame_size == DNXHD_VARIABLE) { - ctx->frame_size = avpriv_dnxhd_get_hr_frame_size(ctx->cid, + ctx->frame_size = ff_dnxhd_get_hr_frame_size(ctx->cid, avctx->width, avctx->height); av_assert0(ctx->frame_size >= 0); ctx->coding_unit_size = ctx->frame_size; From patchwork Tue Nov 9 18:01:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31342 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp1496011iob; Tue, 9 Nov 2021 10:05:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJzGwkOE2i90JixWuVqCP2kmjHTdDbzMChMLkcYgyXufFzMsBbamMvpHoa+6N9cQ+g5s29Es X-Received: by 2002:a05:6402:206c:: with SMTP id bd12mr12644408edb.283.1636481101685; Tue, 09 Nov 2021 10:05:01 -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 dp9si39493301ejc.773.2021.11.09.10.05.00; Tue, 09 Nov 2021 10:05:01 -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="doaIavp/"; 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 55B0668AE70; Tue, 9 Nov 2021 20:03:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067086.outbound.protection.outlook.com [40.92.67.86]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6D9FE68AE68 for ; Tue, 9 Nov 2021 20:03:03 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lD4094VZJGx+eVl/BpWLGeznvzo3NaKBhKwAYgMkMg+mmDu1p8z4Kzw/LD/EV4AWl0On27OfqE0BfBCFV5DIqsneyhbyxF6jB44FTF+wxPsu4q36kFKc3yLtCJwM5Q466fzhYxw6kfjHyIMYnxBHpB4ieF/4r5DC7NJkPugStqTSRyl2K3VO2lEwZyHbhjMMVNsgHs196XCXoWT0SEVc6moFmuF/bV/Ly7SwozhafZdiRT6dUwtT33o0L3hu3vC5qrtmPglD0i1o6rnF8KWn/DvRmbGa49uftZKbiyA1EumtZkbBtU5keZ1UY3b4iMBa9WVjRNDZjcGIuWuPP70eQw== 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=bWD5f7KqYpB5BoxAhzGJBucKJwDq65v7v62P36N49bs=; b=kCybjqwE8F1EKGEjOsX/UnTG1ygXTs0eDQDTsMFg5heIU4moorfb4ZZrjDtaXCWAwu0oOjBXoyhwYK88v2FxB5lT9+l217oXWn4cETH+azQZQsHwDlGDIDJww8H0Wy12ASXZdA8IGjdr/b73DiiTe8fGu78IXlYs2enAapeOUCDJ6rsUJhwxe5m9VYWcfnnWUIyFhWlHT+TPhJlQoaXsBKsuokYNL9Zx8/7iyYWo+5E0FVDoyLdRl2cWgizzQbjD9/ENljpkz85WVw8aicGHhsRz6uGI/62+2d4dpwrdESRC8Zqv/rj1uURsOR23r13KDOPCEtLDcfygDKSoD8xXNQ== 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=bWD5f7KqYpB5BoxAhzGJBucKJwDq65v7v62P36N49bs=; b=doaIavp/4escXdVKC8h3d9uyKzT7gSZBGX3N2fsKLZj1WsExqaBYzVIHOtK5kr1ksTr0uJWXgmVxJZuCehmGGR0gjETOUA35riGAHIkffPz+nTru6Z4dBqH8a3dt0LPvm39d0dzb/210Udxi6cH+aeDBc4GncZcHgghmrPacso4v8U4bYestMfeM9Zor2uJQEZG7T8TVt2+j3CsotMrlYM/I8Qg/y5g4IWt4bMYAKwK0cgM25UzrDqKlIQLpe18xWxWHMgzZ/0id7dD+LP5Wc4+lO49ErTIk1SYQ16rqx4BS2nhuEdvVel0wR6dZyTa2Zlf/aXOQOZiQM/9b+sTQMg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3959.eurprd03.prod.outlook.com (2603:10a6:20b:20::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.16; Tue, 9 Nov 2021 18:03:01 +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 18:03:01 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Nov 2021 19:01:53 +0100 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [3cZQQGwbgjcBJzgC+zkE9xFehfwIowK6] X-ClientProxiedBy: FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211109180155.881111-14-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.171.90) by FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.5 via Frontend Transport; Tue, 9 Nov 2021 18:02:59 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 96a4149b-7d38-43a7-eea2-08d9a3ab2bac X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UK0N58+FL4vqTETnLi+orS+j062VCIeXW9VuFa92Sd+d71GUkKFy/xoAMHKj54SjTiOjepccb/XPUvGEP19Jf3tiBsDgf8rjM9E3RRFIjqQUGQd3wmQa6NMSSPFg3LG43IT3qwV6ee9KR6x0BBr9pOc6mV3umiYkdJKXFw8hWizsJEjECIV4hZX5B5R/s0Vfxbjhlyt4p35rt3f1SU/d90RvpO9Tz4k8OmbQLi2hlWrHg+5fWYyOe/E1sEsyGMG0Sun/T8SSDG/aJKkgSCIoAZ6XOLnqt98BoNk1gAPh+LzL7VI/86BGJDoLR4gK2wSMUywJWw2ARYBuOrfre3dJzuBQw1MgBVW7Hu3AUJ+IWwImdgDrrEumWI+zXQeGodTeFSDaTOmppgs2NJyArQ6smlIDRXOMNNWUYBQXmbihfYyW3mRReb8178XYaRl9qOieO+xMm5bQjaNGD/xYg8M/NS8xuBg5VrUT2tipAz5qnoQBQBpEw/m1Oa4tqOv+v3bBx6OCDyQgcJ90jP6tzFr81xbnM4lanrofYOuGWhCnho0YQwGWhBbfBfjNDv0v2p6tOga/rU+Wu8jEyhP6ZR5RpwSZaVBLJqcj0tTPd2x/5gFeP+nvW5UkO1TC10DHOc5eoxd7Lre6BQUdTamS3x6Ba0kyGCO6E9LyjpwfbbmXT8b1yt6/vVRzOIvNSeoRbH81GpxqYYtTFEuUA== X-MS-TrafficTypeDiagnostic: AM6PR03MB3959: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6zlhwBZ4y/u3K7dEkWWTQwAIpGHyUCVWxmA5m/j8xEne5vXqvzQngZqn5vmhB9gDha/6FqIT9yhzvTA4+rCZlQSEYUHKV7hbiS03DlwBC3dFg2+yAcWeg29QtqScM+KA6LsJV5u2HMwq/6VsOJClDsNLv91hdToRqdJp4cbGnh4RQZB5O/SVNV8WeogYA5SwkCVxHzZ4WldRXYJmw1RysUg/sxZDedy4h16ZzY3g73Il9L3A2/YN+ozxXgphEsU+RDcKI2RXDVeVteunE9LV7cRzHWdJ2XO8GSa3+GdP/NGpTFS3ya+3Tsmse+5FD38OrnN44cNTuzfD3c5aTAksCoYWBzSreKxikGJx8JKDz6fZdMuodU6pBMg2FPdqgiTHWr4NJPbetxt8Q3RMlJCjMBYLHRle7eLAE1ugFObDRdDiW916RCDEekGXUMEnlsOFenfC6i6DuIuSrm3eFC3Fyr5pRUaKso1Qg3PpOODW9LPKwyU2ikZMnCBHKJTk4zhntAXhL9hkQklVKv8DAQNP+e3Q88f561rFlgpeqSzWEA4= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: mFo3+0+7mzxo+DTM1sKt1GKT7lvW+J1MfnZjJo8kSGCRCsHiHl4LOakuaCphrYVCih+K1vV74dFErcSp1Nf8/lmGz82WUE373Ak29oQv8G5JHRxHn3iCVRZ3wh7xaEDfK3iSz6TAqRyea7fSU+/BjiTg2dqyrKi68ySJ/OOj+0Bvje6JDfUvjreEJwdrHyciDuAjRKjiMuskjZKChA7Vx7VmQhZEEXtREniwZnY9fdeNp5TGipdJoMDZHg7pwBCyHOYrgSwmxbDS3rEUhQM/FSIkqKYib2hfECfrxWl/Ylw7ZnDtXg281iGTbcip1SH9qoaQ3cE3x8duBuVRGbkeplIfJN1QSYfFjRTBZ16BNvulrV4awOlz+fiZa/7QaP/sBR+cmHi9WC62XS7+sDmN7Pu+b7++l81YDNGr3ctYPqbCbujm76xWv3cdaYFlTBX12h+q8u1uJzlwucUzNSTSO7tlo5U+UAHYF2YiaZPiObWuHNmBXg4ipKyW73pFBvSf8g6xIntHK3WE7K9lJ3TdsAdpP+8+ggUBQNxfy3rb47jEtg2ANNbKBZaRFyOTfBdkFeVVmCs+/9GDJpXG8T6sMBRAJezL0y/C+MLNjmp8HDWsN1zUO9JwtBqhZExD0j2wXF6FEuVPH+rBCman7mzHq+ZdzEEIGXnUS67YkyVT8akm8DoYn+1olZGKVJZiwSFytIDJ/tlGBYYsb0EyPq+QKw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 96a4149b-7d38-43a7-eea2-08d9a3ab2bac X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2021 18:03:01.9135 (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: AM6PR03MB3959 Subject: [FFmpeg-devel] [PATCH 15/17] avformat/utils: Remove unused shorthand feature for auto-inserted 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: bWwXFhUvjnxe Besides being unused it should not be used at all: The order of options of bitstream filters is not guaranteed to be stable at all. Signed-off-by: Andreas Rheinhardt --- I wonder whether the undocumented and widely unknown shorthand stuff in bsf.c should be removed as well. libavformat/utils.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 509c0ecdce..b42f4d5ca0 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1760,13 +1760,7 @@ int ff_stream_add_bitstream_filter(AVStream *st, const char *name, const char *a } if (args && bsfc->filter->priv_class) { - const AVOption *opt = av_opt_next(bsfc->priv_data, NULL); - const char * shorthand[2] = {NULL}; - - if (opt) - shorthand[0] = opt->name; - - if ((ret = av_opt_set_from_string(bsfc->priv_data, args, shorthand, "=", ":")) < 0) { + if ((ret = av_set_options_string(bsfc->priv_data, args, "=", ":")) < 0) { av_bsf_free(&bsfc); return ret; } From patchwork Tue Nov 9 18:01:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31356 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp1496311iob; Tue, 9 Nov 2021 10:05:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJyksRB+sMlS5qwNDEA44ey0P46hMKXYfyDuVQU5oJZVr7dnd8EbxfkbGZEMEs+TLSC4awv/ X-Received: by 2002:a50:da0a:: with SMTP id z10mr12464570edj.298.1636481114971; Tue, 09 Nov 2021 10:05:14 -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 g11si32640303edq.65.2021.11.09.10.05.14; Tue, 09 Nov 2021 10:05:14 -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=hpVspoSF; 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 442AE68AE78; Tue, 9 Nov 2021 20:03:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067054.outbound.protection.outlook.com [40.92.67.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 586F068AB96 for ; Tue, 9 Nov 2021 20:03:07 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=a+atRxaSBl1ErcGF8hdcp4O+76SdSU2o0z2juEC+I1EXyMjv+GyowNwwrsLWOSzzc3laDma8GVdpW82V0VTfLtXpUR/yQV9oYGCP46C/9rm6gXvIVrZKXlRyTgM3TN+VonGqIOw6JHCLzEat9KYeivLIjXFeCyeks1E3SbXKOHwaw9/z9njSG11LLZd6Qrnu38zmF+dFO9lB2TmpVkJ2sfaXVGm9ONDSeFnMUvZn0toBf4ZKUBwrU6md4uX7wzW7Qsj4eA5loKFUUxQgL/HY8z+FTipLR8NccOEXFqcX4NhRUsPI+NRztnt3hLwpputO8y6F2nE2N6us5rFIKtamog== 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=PXnfVc237qRW1EvRm/NSzK0e435cm6Ta+v9m+PAjWtU=; b=NlohZdD5j4gVpNk4DibsRG2XAqOVPraDauiN7w2c48VlIs0jL6DCY1Nl2SOUA7vl2FOYMAn3ucV8ydk3JAgRUQ4s7p0/Tj3r2cjIhuYSBLz0P5kkrR+HuAdGeFKa+qp0U6sWyU7t4QEQ68An7sQaLZWhnuzZlkyhIMCvzqbk3Kotut6JwmDbBkzvJWQMJ54Y3CIWVelzsrZX+EhE55YNnnhBwkKRMCnYcm54yXpGG54PWyovATKyeBp7Nu3J3vuXgvZD3zqe69P6GmKXgyD0b8QIbllWIYAdT5+nvZ3M8HO8eo+LPC3D/rrH+lZW3gqgQT+hw5uKctLN4pNNhDQP+w== 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=PXnfVc237qRW1EvRm/NSzK0e435cm6Ta+v9m+PAjWtU=; b=hpVspoSFKUq7ZvDmD+2D++73P4SFspYpRmh/WAv8v6HUOz4Vejlqzg05DsGsJNFxw8o4se1VvzOpkwusJ7x6LaZzW9TWb76/5gCNFhdtHScQzit54jguG13yDuL7YXYYRJra3XBdePuQBqdlcEIPgPxlT2kfDJ7nJz/EEMabrHLcsICma4A3Lnt6DIISex+0S84tkYXyElP7p4A24Dhum5WfH8WAptJnCKe91VtCxVg0bj7pX/ZjfT2hHuSWFTfKv06nvCBGLYRN2ljHMnBcHA5MeDOwPmVBYizi0Lf81p1/x3OR3Fi7PUvYyJ6vymXUOXWW/7l/uMIfph9zTvyXmQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3959.eurprd03.prod.outlook.com (2603:10a6:20b:20::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.16; Tue, 9 Nov 2021 18:03:06 +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 18:03:06 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Nov 2021 19:01:54 +0100 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [6IxcL3nmeuy1jDSzA2dHn+DCmcsZYeh4] X-ClientProxiedBy: FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211109180155.881111-15-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.171.90) by FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.5 via Frontend Transport; Tue, 9 Nov 2021 18:03:02 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9265c111-1cc0-4647-8327-08d9a3ab2e0f X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRIlshE2JAC11E3nazVg9SynU313UCB+uDu97ie1faWLBqRrEWu7dz8yXVgEBiN5InxNJrNFijF0Vwyczd4b3pyqZfXJKfXj/flzjAzb7lzOvS5KHcTkrSl14Ryalc9yUyz8BJ4DwnuoGoDoYCTDhaX3IPYAEJeeBEX2NQ1SiUy8K8xpwqzPFQHunPS+Z+h5AxzwZHk3fynSHbfBmhYyHc5KkVQuzig9gFcCWDO4WMcCEDlrn7WbZNn7k2OjuNwAm73SUbCpGKxgFH5HsFUrx86zPr56v7an3/1VZsEPrFMUQbpmQuDP5EXFta1uyVZ2TOoydJ1Uapw0xnw1UwhZrEljb0xrfPtAvHb8XvtrdfNN69okxuOMvzRUZXMb5IcMwHYIqTHX6SsCc3utjO8NkgWEiK3hHyiWzAVvZHG2dMkPHCmmDtV0LPgX4bnZDcEPLCOi1d0k2uaNHCeCod78KfSGEa8aB1jCTaQsU6iQqbeNMN5R3Dg80DVWgTwLXRNKyH7aeT+pTuPvHwJl5JLV7MTwLUdKCLYzETG4oJJY1EG6jMfLUb9PhSvds6tkD3kHeoL1actJUsHN+PKB+/3e2vrsdKVju4bIYeRKdwd+tdxCVgQUEKYN/G/zlbCT7zq19JXx3jodpdBy3YS2GtRX2J+yM9EUgygjjhYhz6eEWytYDbLkiKWFAQRXFgQCcTp+fRBCKcbq7MnUl/1LFCFj21wl/ml2oWdazJVMRBRCjIjQ3u0NtXYf9vPVlXXgFbe2b8= X-MS-TrafficTypeDiagnostic: AM6PR03MB3959: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Uc8vELHxqVLJ5Au694P+o/ObYNd5G95TgZwWsPFNCzkgUA4tKnpWSYKc8wAJO9shxT3eeQPZ5al2eawTc1uwUtGdGEAA4/pTkJX6Eu2/pUswq9gtQdXTPXl3RIaegG7LWLwI9tP9lRuTedxbr/9MbIlbI8N7wN6+WPxxyrKkwphGfF5AXZwaAqNXXFw8MGZyck0HX1Cgq9j3DsGvaVVnDz/A0HmGn5DZDtPhjISPQ2DJYvVdHYhJyD6uXQ2eZ0QhhQiFaJ2X1ED8pD5qFiXjyAT6iK4cb9Z1+SZIp7BiHhqxXaP1p6426C1lxZjglA2LWjc2MZm7sJLrQHH5Q/v0Nr3I1wxLN6JNhhND3qGVeYgLlD23Ui7aPk+Y4qVVm3sf9ccBxyWl0QXeqM1OLG+MXUqwbSTmDlWs3XSBYmLOUvNIRFp/13BC/txQCTKkM0QCUKjHOdrSRuDe7lipUHBYq07yvDWcDU3D5gvJGBQN0p0h8ieYIJVTtneRG+QLvOrpelzZVC62aZdruq1divh70GN65VXu1Wi5keXR5XjBNIQ= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: z9ZDYWH9q4pl6DC2Ce+yR6XSnKFNJsTuYTBg0v+RHCGACZNApnpsIxd+XDvB4KCIjjqdm+ep3pviaojO9k46VHynndu+GP5eLQq/rK98gjE6/iqRXYdhWm4TaNZEQ6LhGP453DAmk6Nxgh7IzfNe+BFwoDv40P6dHOprZqa11kDU68aO/TGShDyBWHXPkn/pkAF1NY9huvAw8PwwZDdHRk76q1KNiUS5O1Ag1SZuV2Q5LTHsuQfzwZxFMj3Y1cgWCTeB2Qhds1rewtAFWiaTqP+KWq/qLj40V+vhPugHj8+r1GhIWlIa04aUMJicCDsuo/uCf0e8jGGZfOvo7pmnnuNc7VZvfzo3hA6E9P+gqE8ElNGWbuubMrEEiKsDiXD1WJiqKUxmPGmI9l/emPThg/4e5z4yv528JD8BvAgJjmr5pMRHC4X4OI3MGinSGCPsESmNKjoo0vFCqJJxzkkd4hafgibvrLFfSCcM+Q+7e+pIcSDh7kf+4dLHc+MHgiXC1Da04hyiv+skJ6PrpRGXd2aOxZ9N8yXp0KvcpUCuwcYXh1SF3jYDaTcoAAMXR1Z+UkwyvCjQN4JsVB0mqgHCyM4KPUgjGZPdkwaDIaC0opOe8lDYjb+tpeHOvnBRIiuCH7iBpJC8eDnBsw+BlLSiRxgMf2tGKMKqEWTZmNiyGitpQ3Gg7wZAexDXyMekyiqnLiOxCC+TQ9npPSyBLRHO1w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9265c111-1cc0-4647-8327-08d9a3ab2e0f X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2021 18:03:06.0196 (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: AM6PR03MB3959 Subject: [FFmpeg-devel] [PATCH 16/17] fftools/ffmpeg_opt: Fix copyinkf option name in warning message 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: CupZhE3b8gnY Signed-off-by: Andreas Rheinhardt --- fftools/ffmpeg_opt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 7aff43d917..ab4c63a362 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -79,7 +79,7 @@ static const char *const opt_name_inter_matrices[] = {"inter_matrix", static const char *const opt_name_chroma_intra_matrices[] = {"chroma_intra_matrix", NULL}; static const char *const opt_name_top_field_first[] = {"top", NULL}; static const char *const opt_name_presets[] = {"pre", "apre", "vpre", "spre", NULL}; -static const char *const opt_name_copy_initial_nonkeyframes[] = {"copyinkfr", NULL}; +static const char *const opt_name_copy_initial_nonkeyframes[] = {"copyinkf", NULL}; static const char *const opt_name_copy_prior_start[] = {"copypriorss", NULL}; static const char *const opt_name_filters[] = {"filter", "af", "vf", NULL}; static const char *const opt_name_filter_scripts[] = {"filter_script", NULL}; From patchwork Tue Nov 9 18:01:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31346 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp1496640iob; Tue, 9 Nov 2021 10:05:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJzL3HVV8iERD8zFIraKDgYaxGS4heH3avHIhGQhOTke2ho8PHHDevXDsEqtmzeMlXZiA55d X-Received: by 2002:a05:6402:520b:: with SMTP id s11mr12649554edd.363.1636481129345; Tue, 09 Nov 2021 10:05:29 -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 dr4si17581772ejc.671.2021.11.09.10.05.28; Tue, 09 Nov 2021 10:05:29 -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=KSLd8TfX; 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 6632868ACAB; Tue, 9 Nov 2021 20:03:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2031.outbound.protection.outlook.com [40.92.90.31]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C8EC868AE7A for ; Tue, 9 Nov 2021 20:03:09 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FD1621dMjqVllFGUSyI1FyuZYGCFyAjCz9CB3lZja2h7NsvikXIRMT/a6xSbK27ZcZMEmA5cwChA7MIq2GbJKxXj16K3om/L/uJD2j55Ay0biHlLShC/AfZ4FUWNvEZyziyaqFeiW/bi1kqRC3RD2h8bZvjspCCnniZa7FcI93te3IUivlHwvsI+AcKIt2CYKr5r98KGxBIlJzIhpm/y4aBOrP2wl6d4zd09VOSypZoVFhnDlwFwY75Nhhv/BcrOP7Et1a4op3WgM7P3FlDf15nBX8+tU2OYmKQ2+z9USD5X5a5LtJ9cMI5Mr+5+kYVZyG2ecMLRQoe0GuFdEBFQkg== 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=I5gk/72vi8dhLXt/60J8YWoCeCX7f4QAmaNwsHpqXAY=; b=MMQLVUwptFT8EmC/OdIQjyrO8ynM4XgG3zXyXMLFDPh2dmMQ9fcEwNiXFffg1jN+6w3dsrJYL0ghQ2Rv0IScWpfFnOT8vwYJZRyxm5TexIspDwiT+WOy01vIogNg0fD9L4mvZKPmDHTsJ7RjAvqDvbduOM7DPOjTsOkDdE7bThICkFWm0OX8Shb7IrR7rlN7JbS1uaAdH/9o8q0Z7cfF3SivO0J2OISx50tTUNG/aEesJNZV+Y6Hi9EY7ff2/ejwMUaT8/Jkj7wK+6je57xqfA5anFd2z0BUJ09fWhXaPNUBOewlIFjU23hTBOjpErsqCFIUosaglybvC8H0nO8Bvw== 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=I5gk/72vi8dhLXt/60J8YWoCeCX7f4QAmaNwsHpqXAY=; b=KSLd8TfXLyS+Urgh+NBhhsQ4sQUlIgI/ddtDqEvckjBfDQTMaEQNNE3KDrmrZEiBV6YS1CRwNRko4dg0JNKINux5gxXsm4zPH9QA2U3tQLRw+vkolwy07+kJczCfy2qCdy/XgtzNFxfjBRtJJMjATsQZ0pviuZIwBM869/FUm3sTDdFhmxmitepuCQWs+05yU13xnZWlYB9h/ppMRQSVuPxKtwz6gNscKjBDa75sN3U+Uet9TeBkaiRDUnT5d9+krlUnb7RgvEZ3VJ+vgWXFvi/6hr9ZRohzSkOZclhLOpbFiqnifzVomIaSg9NaC+/b1G7dlBsbcyXjqu8EdQBgTg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR03MB2929.eurprd03.prod.outlook.com (2603:10a6:206:1c::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.15; Tue, 9 Nov 2021 18:03:08 +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 18:03:08 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Nov 2021 19:01:55 +0100 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [KaSxOyK57HFGPGMPVE2cw3z1t5ryh1SU] X-ClientProxiedBy: FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211109180155.881111-16-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.171.90) by FR0P281CA0081.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.5 via Frontend Transport; Tue, 9 Nov 2021 18:03:06 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 689b8449-d221-4174-5dcd-08d9a3ab2f6f X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRIlshE2JAC11E3nazVg9SyK10yXtOTXmPOsiH9NMO9NEPq/WU3rmCz3lvm0OrdOmdbyN82Ednjboh3ffVbZXBrmVyzUgms0pavcmSLyKqwRFLOWwfF/pXEeiv5VEYlip0nKJCcb1eK1NtfmE79cfOBkMAblZx+1f4dw5k5wDj/t55FKiIyiLF921cmZspjWgKYJue4NNw3giexV4oOaj5wG4JEwibytDLXrNbW9nxlkHcWlir01BXxnZIbb/MLkiNENHKwNAXCO7rNoJAOmvGfuXKYkLmTdxAgbGZTAnGRye2FfX5OoEufBae6fcwJq1t3ZKVolKgNxa2F5FfyilIAtOesUJA4sm8Ocfb9qU+p0rde1RrncDzBk2C7uJmMFPqHU+ynbB2QCulq4xGHwx6AiBWT6vbOxgOVWKmLEMJi+U+FrNNOD8t5/l9l0tjRFtsRVnksaknTr2NuPbxueWcjuQd/OFPfh2+gSwT8Oe6SowMs6j0EoXkNJ32iTPSEATBU9pedVzRG91GueargYDYdUjCWSm/KVzYCD+2Uz7uIIstaRB75/LuGyDJyvYLO2wJheju1ll/aSvQ3R/gsM7uqtnkpU+t/wa933srFuXh5TBBvX3VGsMOQ+/e3MVHOYw/g3MqvJa53VfYTnzOLUsnSK0vGxFCXbspkTbcYseP+ITDfhHt/RWnJ5NPxb6ZcCoQ86C4Qe4MR4sC4Sjxc/04SrGuogvh85mhTydVHDRG6yQFmhCwmSyviXRGWsw22fpk= X-MS-TrafficTypeDiagnostic: AM5PR03MB2929: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 65GLiG/OioGHd2HorLwQvYZQ4YCWaJkAeB0oTKBze2PG9RrZbnzDKYnd0wziMBipREBX30rYvQE9h/cXOMeFYqdRY8o2QJwZZnEjEpDeFwv7hiMvdNQuWpgQ78a5i410C4Gn/T3XdJzcy2s1r8LCLbfiDCa5V1OBv9QxElZduoOhU31yRa3kZV7sHifAM3L5l6kcNAU0W0kDf4fpmVbNiyLEAsSZFXdtSaLSYao0Y+DHgrWGcepdZRW/4qzFhxu8dKX0KcljLqHqC/KCnk3EMfVIKL3rwneD75D+UlRrfTm4DmIR2hAhQCr3b+zN6SDfntbVJwIAwKnQAFqPnWzmNU/YhyMRu+FrBVxFRoDzOjJ7j9vdSTx36Z4KyjrbwXiA8MrzRqRvFtDEeF9x04KsuJIu8JeMaNvw8toFYYLLwLUpD0jGpR1Zr6f8s4Tj0MtmFjl2KKzXkX7ufMq0Uemcaj+fD2yocSdqw41G68CDtYcG13TvnN/deYDdTOK4Tt4H4c0ZOgUV8f0oTJatZYwv4AZfRUVEAwioRLPy0vAEWkQ= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GdK5TzQYlhBUam40CEoJBwWS9eCKnOtrGGThsEUu9sMMCEx+auAFARqc4y3E23RKsaPQ2o1bXbP8wYKVyKRcahGp7yRYUpOQI2V3v2zsX04rc2sahi7B8oOgSSGxvCFsp7oxQ4EVxPdjiVGUzjZKEGvRYnUrr1YshT7KZM4fnLMY2MLQnoRlaAGB4KZdDIL3f0Hv4OfE3xHr6soDZOz8F14B40zw1bvQ+BC8xNxMOf5A5fPBT9GzB3Mgvb6fqv5oZChEN3/0v9OP5UHXRfpEkqQz0V2grfTUuOFiFWeMhGucAqJeTt5MGMonoPU0PHZ/5KMUqML7mnlCpjhbWMS6fx4wVJx5oawBhc2mqv+YTlUNRkL1a+Ap3K19kV8E6kPku6xuzi4FMnu7eLqwt9BQyXtgyjlVk/VpDvS4l4yiUkmcLKXKrXdNIFNRLH6sCDSTD0/GLS1IBLx9rlYsAku88uKyWWrXuHN7VT1OJqvkPWEhVyIxLokdc5C1fYnxomC4p/SZCJ5bRnw4jr7M1oiIdH/r8WF6tebL5haHkHMlRcgqfX3tC5crMVflBFei2P6lPsgNke4Y1Ugcnq1K8HsqDPiSfog33eF3KAd5QwP0OHxReIogo3db2xpuOjV1EgB8svrvmiirbreb5IDGRPrG4kzmcKjuXfIyHr+2RtYvF7gusgnB7j9NS/wIEz5ItIdq9+M36DDB0SjPBtYnXUqapA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 689b8449-d221-4174-5dcd-08d9a3ab2f6f X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2021 18:03:08.2080 (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: AM5PR03MB2929 Subject: [FFmpeg-devel] [PATCH 17/17] fftools/ffmpeg_opt: Apply copyinkf for all stream types 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: pKY3OM3uEsye The earlier code has ignored it for all stream types except video and subtitles, probably because audio was presumed to only consist of keyframes. Yet this assumption is not true for e.g. TrueHD. Signed-off-by: Andreas Rheinhardt --- fftools/ffmpeg_opt.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index ab4c63a362..60ee6b16b5 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -1655,6 +1655,9 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e ost->muxing_queue = av_fifo_alloc(8 * sizeof(AVPacket)); if (!ost->muxing_queue) exit_program(1); + if (ost->stream_copy) + MATCH_PER_STREAM_OPT(copy_initial_nonkeyframes, i, + ost->copy_initial_nonkeyframes, oc, st); return ost; } @@ -1940,8 +1943,6 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, in ost->avfilter = get_ost_filters(o, oc, ost); if (!ost->avfilter) exit_program(1); - } else { - MATCH_PER_STREAM_OPT(copy_initial_nonkeyframes, i, ost->copy_initial_nonkeyframes, oc ,st); } if (ost->stream_copy) @@ -2069,8 +2070,6 @@ static OutputStream *new_subtitle_stream(OptionsContext *o, AVFormatContext *oc, subtitle_enc->codec_type = AVMEDIA_TYPE_SUBTITLE; - MATCH_PER_STREAM_OPT(copy_initial_nonkeyframes, i, ost->copy_initial_nonkeyframes, oc, st); - if (!ost->stream_copy) { char *frame_size = NULL;