From patchwork Thu Sep 12 05:52:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: martin schitter X-Patchwork-Id: 51534 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:14c:b0:48e:c0f8:d0de with SMTP id h12csp712491vqi; Wed, 11 Sep 2024 22:56:01 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXYpCT5UqlXPXsrr7vTEt68H0S7A1HzEHkniVzAn25httBcqC0kj+0tzvQ5L9xPGtLIa58qgiXk8XiW+yXIACq7@gmail.com X-Google-Smtp-Source: AGHT+IFOTuGsd6DzSbJAxZ1aDqBoXIgAGSolte3v0xt1ydBH25WecT/blG+hcY5zKsNHOeaoPVvh X-Received: by 2002:a05:6402:5207:b0:5c2:5f43:3e8 with SMTP id 4fb4d7f45d1cf-5c413e0fa0cmr1554944a12.9.1726120560994; Wed, 11 Sep 2024 22:56:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726120560; cv=none; d=google.com; s=arc-20240605; b=evacbCHPJm5EtsE5QrZIUbBbDug3808O3Rr4veuVPmr7v3Gw8husLo/VVLyRlHopKl MF+4rzMiU3kLWf6yxk3pA8XBHEnTjKWTcHy2ByQntsevbp28dE8NpK1q6ohWbe5OoE5e ngki7/TB4Z0msgYzY1isKs3pCrz5+Ay+D/+3cteo+sJmcJRKq/Fz4mFiezOjPZkdiqHv Hz83ppqz0n3LfSxREigp4xX6lOzHpKDXno7ryn4M5RivWbvOeo/Yj5b2SIRgVrYHTwNG OOr/QpyywgBVy7lki3AJSvKU/Cnm2WWdd01niLeVMSiVw6kZw4aIhacilpsvto3H2g0z XmZg== 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=2aurXPeT2EksYdyTntAzJFtZMhvs5hCwDrt52YFZ97M=; fh=igg3JDwkSkAbPTwY6V0OsEq0RUkG4DKWC8fVJg4GhMY=; b=QTletnLN5Hy0qpvAjon6H5PQ9WkLxPBFpFbVtBNiTCKoJYJ0BkUuUFqLXlcGtXltMN FyLJcDtWE5vqQsmgrqpc6efLJdIXagmwpHX7THX3jxadCdrHIIrxMjBArJ0tw6OI7sRH fPq4L+GXxHgHP6WX3BT8uWh2McVVqxu8i4s7GNyFQ+xnJnoZH32vqQ88veyctF5TrlaR 2gx6FvV0ML50x9YgPghTUhrVtdLLQEhMlbQbGlFC2Uq3jP45q5RkQMilAl4apq1g7ANi cBL00A6Cym4/GkJiCkNES0ob9afP8eC12IiwJKKeFsoN4JrH+6uog3HwKA+bGgY5LbuP jHkg==; 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=GSlA2BLZ; 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 4fb4d7f45d1cf-5c3ebdb6dafsi8183126a12.663.2024.09.11.22.56.00; Wed, 11 Sep 2024 22:56:00 -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=GSlA2BLZ; 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 5CED368DD76; Thu, 12 Sep 2024 08:55:56 +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 E3C6468DD2D for ; Thu, 12 Sep 2024 08:55:48 +0300 (EEST) Received: from localhost.localdomain (lan1.raspi.ma39.ffgraz.net [10.12.1.243]) by efeu.mur.at (Postfix) with ESMTPSA id 8002C4623B; Thu, 12 Sep 2024 07:55:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mur.at; s=dkim2; t=1726120548; bh=WkrRu+Rx2kvVJztmLAHFRfe3yQuFBI5SUgSlrMu5xyo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GSlA2BLZ4F883VTCmz0DMw0uLvQEdE196v2ZB+eWQx1a07slxiHXhlsrHbOwcn2yB HV1XeDkDIXE1dTWbHoXiraH/3MofpWL9jMzVhRwGQpMZOD9k08K39NFpdl8MtlM1An snvH3vnDfRK/DHSLS1ZGTWr42f2kZt7WBTICgvP9DXv+M0A7ZQwjoMDTM6FDSTurnj cR1ubFtrOtkbipc8FdAs0DFtz08DHnU2CZ6juOMjPMSUXBN/MX74lQ/b/VKkxoT+pK lpd3YcXPnrE0km/RQtrSAIofKkr7T4sdacJN/kUjCJ6WODLqoTNu3wnJDhVmCO36/y a+H/DvfW9YYOMu2+w7Vm/ez+HkZMJxnc8PLTLqF+EbJpzVoF6wDFWNGxqNL7NUUQ0Q 7gFAYMpUBjA0HXrHzrFqkE6kM10hYA9F1ia90BpNWkaC2S4t8ae18lfqiWDywvC9db ilU2xCvvYBILlwNaVUSLmRps/WSItOaG9H/dS9Scca2Xd8MCfSt From: Martin Schitter To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Sep 2024 07:52:36 +0200 Message-ID: <20240912055238.965068-3-ms+git@mur.at> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240912055238.965068-2-ms+git@mur.at> References: <20240912055238.965068-2-ms+git@mur.at> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v6 2/5] libavformat/mxf: Add ULs for DNxUncompressed 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: bQjlO90jTCm5 --- 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..b6c1f17 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,0x0D,0x04,0x01,0x02,0x02,0x03,0x07,0x01,0x00 }, 14, 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 */