From patchwork Tue Sep 10 14:06:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: martin schitter X-Patchwork-Id: 51490 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:41b1:b0:48e:c0f8:d0de with SMTP id le49csp374369vqb; Tue, 10 Sep 2024 05:34:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWfZB2EpAmnFzx0b0Lvid4dhehAuT4WdOfuFiJenHv1axWGAHzGqDcrYj5LlW37536BH8VEt5kSS0mw8Evd8Jtg@gmail.com X-Google-Smtp-Source: AGHT+IGhi6+s37JSrdle++g0cGJlyVvM+1xVEXUvW2fjwf0uq3eewGm6pycFbv8MECfEACnYRmN8 X-Received: by 2002:a17:907:72d4:b0:a8a:9054:83af with SMTP id a640c23a62f3a-a8ffade15famr32564566b.10.1725971651811; Tue, 10 Sep 2024 05:34:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725971651; cv=none; d=google.com; s=arc-20240605; b=aSq4PjTu287puFRaNMrohsW9U39x6FEyEXYtIaWk3dd6psQ/RLM+TQpZMAZLPvkJ6u F0fKb7dYi+yQXmwZ2VW2Sx17f3ARYjvvI6J5dKE3jommS3u34k0ej++BYoOb60yniY1E WRUlc1bH43TaUjli9BpyxGTUBP3A+rg+3MIQvLUFMXz4nrXHcpCytgP8WfZNqII6NGAJ ZAQF6H01/nwlGVwFVbrBxBhoqzlRnj9NR0+bTki3f5XJxNpALs4h1e0TWjN2J5Xr8ICb 6C81McyrwBql+M2L+i7wCDavkIIkXWO0ufes3qDT7sQDxfWj38FTLw9ap2JVLupEBMXR eyFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=+3NlTemKMitE8KKMkOOsWSf971CNwBis3GMgjMFkIus=; fh=igg3JDwkSkAbPTwY6V0OsEq0RUkG4DKWC8fVJg4GhMY=; b=Mt/sHBkDF6P2QNTD53I3DLVgxFawDKi2Tvff0j1i+uzDFMNAEbXE0r6VxFS5+KGK05 E5YmgDBKE7XeWWxtiZdGdLvP9S9fo+Eq75NI9Y35sy4OXvO0/fgY2XUvgHslU2OjuncO RX2zOmIZLAp+lFQwCildMe05S9gsIJ3JwSz+TFhSRxH5cqGRA/DFilR4gglmgPS78rRq 5EyiAE+xO6JxA2KQqS158sh33W4ZiptiWIp1kGLr+vlvWclX2xRGK3+Gqsbasjfnuao5 ghSK+wqCIiQit+XLLCwdS93TuIeoSHeA9Z+OK7lcjSMo6J+cs5FZiwmb/uGqLhTc0xlx md1Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mur.at header.s=dkim2 header.b=JX6xj2ab; 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=NONE dis=NONE) header.from=mur.at Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a8d25c60a91si562663766b.401.2024.09.10.05.34.11; Tue, 10 Sep 2024 05:34:11 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@mur.at header.s=dkim2 header.b=JX6xj2ab; 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=NONE dis=NONE) header.from=mur.at Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F1C5668DFA7; Tue, 10 Sep 2024 15:08:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from efeu.mur.at (efeu.mur.at [89.106.208.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 11DD568DDDF for ; Tue, 10 Sep 2024 15:08:27 +0300 (EEST) Received: from localhost.localdomain (lan1.raspi.ma39.ffgraz.net [10.12.1.243]) by efeu.mur.at (Postfix) with ESMTPSA id AF334461F1; Tue, 10 Sep 2024 14:08:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mur.at; s=dkim2; t=1725970106; bh=WPVWQZ6cku9EMGwIG0ZqMbukh63epzyEdBd+nmJCiAo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JX6xj2ab7mfoHa/MzdMg9Uoh1mKqPU05D/NhMDF+1f3RloaLvvrumodRetEWqZBQF BmZaEgjGurZoAzTOkGRXC46SLEwU37i+B1qRASjazITWvfmC08SgbyrXE+1P/MWO3N abodP4JzsaDo55ZnvdO1mxzwGj+zSP8Kw6Yj4U/qCofNZeeqyk0Kv+0lvEZUUykRBz Yf4zlY8WbKnycCAc26vpdD/bpSzgD+YfEAibqWuvyTk/xvXIe2S67yT9tbt6dW1NZo KJDQySC2TUh1tvlucg3agMQ5DIGv6r0FflsYSlrpwi9ZbhMSA7qEQCMxPl76yuLyGn YT1OwcBKpNzkjru5iSQrCrqMGvtzrHmfeer137RQipfCEXcaHfYPeymOdF8aUQkMS5 tiGQuGrA6pUmCMfDWuAgw7GuDNRJ5geOSmJCQ1jTFi4AXFOSPbzxmMgK9EHtYAFSF0 dP8DRDvrCXiqgCXmIPlgthID4/NSp+mVh+V4tnI9A/gPlCOHo7o From: Martin Schitter To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Sep 2024 16:06:02 +0200 Message-ID: <20240910140603.741345-4-ms+git@mur.at> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240910140603.741345-3-ms+git@mur.at> References: <20240910140603.741345-3-ms+git@mur.at> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 2/4] libavformat/mxf: DNxUncompressed MXF related changes 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: Martin Schitter Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: aN6E6NrDQuDr --- libavformat/mxf.c | 1 + libavformat/mxfdec.c | 1 + 2 files changed, 2 insertions(+) diff --git a/libavformat/mxf.c b/libavformat/mxf.c index a73e40e..35fb73e 100644 --- a/libavformat/mxf.c +++ b/libavformat/mxf.c @@ -61,6 +61,7 @@ const MXFCodecUL ff_mxf_codec_uls[] = { { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x71,0x00,0x00,0x00 }, 13, AV_CODEC_ID_DNXHD }, /* SMPTE VC-3/DNxHD */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x03,0x02,0x00,0x00 }, 14, AV_CODEC_ID_DNXHD }, /* SMPTE VC-3/DNxHD */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0E,0x04,0x02,0x01,0x02,0x04,0x01,0x00 }, 16, AV_CODEC_ID_DNXHD }, /* SMPTE VC-3/DNxHD Legacy Avid Media Composer MXF */ + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0E,0x04,0x02,0x01,0x02,0x1E,0x01,0x00 }, 16, AV_CODEC_ID_DNXUC }, /* DNxUncompressed/SMPTE RDD 50 */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x01,0x32,0x00,0x00 }, 14, AV_CODEC_ID_H264 }, /* H.264/MPEG-4 AVC Intra */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x02,0x01,0x31,0x11,0x01 }, 14, AV_CODEC_ID_H264 }, /* H.264/MPEG-4 AVC SPS/PPS in-band */ { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0A,0x04,0x01,0x02,0x01,0x01,0x02,0x02,0x01 }, 16, AV_CODEC_ID_V210 }, /* V210 */ diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index ac63c0d..142b3e6 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -1597,6 +1597,7 @@ static const MXFCodecUL mxf_picture_essence_container_uls[] = { { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x07,0x0d,0x01,0x03,0x01,0x02,0x0c,0x01,0x00 }, 14, AV_CODEC_ID_JPEG2000, NULL, 14, J2KWrap }, { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x02,0x0d,0x01,0x03,0x01,0x02,0x10,0x60,0x01 }, 14, AV_CODEC_ID_H264, NULL, 15 }, /* H.264 */ { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x02,0x0d,0x01,0x03,0x01,0x02,0x11,0x01,0x00 }, 14, AV_CODEC_ID_DNXHD, NULL, 14 }, /* VC-3 */ + { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x02,0x0d,0x01,0x03,0x01,0x02,0x1e,0x01,0x00 }, 14, AV_CODEC_ID_DNXUC, NULL, 14 }, /* DNxUncompressed / SMPTE RDD 50 */ { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x02,0x0d,0x01,0x03,0x01,0x02,0x12,0x01,0x00 }, 14, AV_CODEC_ID_VC1, NULL, 14 }, /* VC-1 */ { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x02,0x0d,0x01,0x03,0x01,0x02,0x14,0x01,0x00 }, 14, AV_CODEC_ID_TIFF, NULL, 14 }, /* TIFF */ { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x02,0x0d,0x01,0x03,0x01,0x02,0x15,0x01,0x00 }, 14, AV_CODEC_ID_DIRAC, NULL, 14 }, /* VC-2 */