From patchwork Wed Sep 11 10:56:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: martin schitter X-Patchwork-Id: 51506 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:14c:b0:48e:c0f8:d0de with SMTP id h12csp209889vqi; Wed, 11 Sep 2024 03:06:21 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUmmOKMYCkoBcct0Xg2L52VRydRE/y0GJFtSSWD3Ox+N/u/wNPqbkyOw/+cHg+mj2a25Na7VkFI3vaer3fJCAoo@gmail.com X-Google-Smtp-Source: AGHT+IEETEvl8Q/U8223KP19D9BeGQq1zuE8qwOLQOguTKaXncLYyZpadv2wlxV71gxFIVF1H/o1 X-Received: by 2002:a17:907:ea4:b0:a7a:b4bd:d0eb with SMTP id a640c23a62f3a-a900481d1c3mr199431666b.24.1726049181430; Wed, 11 Sep 2024 03:06:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726049181; cv=none; d=google.com; s=arc-20240605; b=Z7Cv6CmIAM/jjtWWD0vKy3iWL7g7+2mebbF9L81BtYxuMwG/lrXxfdD2iRopD2ToLd 6taOjkFXobduquheuJZZITL9ui6UEX5ToxmolG5UdynMd91rW58K9bSobgthrNnDrQcI vDcpJOWKkH6+R8cTqkKAPeKSM1VKAbt3qJUn8iI4AuTGiHw9YfOtGHmStSQsCm4h44ph C8w2ZmxbZxiW3AAazNiwPu+QwCM5AgeBTC9txVMPyM/6LJwlSpvUbOEBO8eJSUwgJjFb 3J9bNuyNYgFMbZg79L1uRLmJwmZj8cuVw9B+4J+88xnjwUm+jjq78KVWhdG7eEUL5nmp awYQ== 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=DrvUkoEssRJUWyS5e+req6+37SQi5j9oJnpou6I0K2w=; fh=igg3JDwkSkAbPTwY6V0OsEq0RUkG4DKWC8fVJg4GhMY=; b=lmwBcOgJJ4f4Eup98ouJVRp+O5jQWiObzFO4Z8M7z+rEG5NMXHpCASxbvG4Kkmvlpm AC7AssQtAqhcP/2M+fHuNOmWVc1pW8Dh5eGlv9Bc5Rz6eq8lHnIYQL7kuNAq2ffMu43K qRSS6mU6e2NdQYVD7diSf8sxPqD+Tpagg3qmmKC1BORmwfvQgAn4vCn/TpjbsSCbBK6o EMu2/UH+00hGFSlDdVqk385r9mBOHcEfimUPFrU4+gES5AssxIqdHAy/NBPF0m32UCWf ZqqxVzLL7YKU/shjoADSogwMn66oGgIpSLi+ZvuNodVFDPCbytkvPU/yCA8f+XY41oYK 69Zg==; 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="aSYwR/pA"; 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-a8d25c60b9asi679743566b.437.2024.09.11.03.06.20; Wed, 11 Sep 2024 03:06:21 -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="aSYwR/pA"; 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 6FB3468E089; Wed, 11 Sep 2024 13:06:05 +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 6626D68DF1C for ; Wed, 11 Sep 2024 13:05:57 +0300 (EEST) Received: from localhost.localdomain (lan1.raspi.ma39.ffgraz.net [10.12.1.243]) by efeu.mur.at (Postfix) with ESMTPSA id 0FC2A46233; Wed, 11 Sep 2024 12:05:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mur.at; s=dkim2; t=1726049157; bh=BlF9cqSZZGfUgwf4J3P3yAlAhigvQ8sBjEtPD2dFsJk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aSYwR/pAqxmoRpFDWulDQv5oMxO11zKbNlZngDbS71QVGRwu/AUJeFBeSdwnT1Yfu oxj7lXtZsjFJ8Si9mIPjMnpgo6Hy32J5KHwbzXfQXWwF4YgjcDQgPK0ktWsVIvS2+u ql0SnUZ9rAfEdyIY+30lzSQpR3P5YbRVeSucWIcGeBY+EFPtpEsn/BqkIjZLKuu02P HkdyFmW/1R1H/poXIt77oGFAZ2H44Lt5cMATKfhHODINri67HgjK5MgH8zl9flDs4U QYOicpIBI/h8iaVCpfrYgw2hN3wHqjv9JrwLEV/gAfp+oOskWp7RT1kyeUuTQaGjP5 DsEieQJmYPyYAMBp0Y6YyUrrXJfAS4wNGo3a1UGUdo/N9vpWsLK/ioOi5sfUaqnOmW uw6DxWzzkEHxOZVxjbuDZHwe0Pgfvste3Lqnncmyj6aifzkfEGYOyojEwosiysnGsB +CsM2OR/zv4Tv+9iSZRfbiNxUqUKnNO1Jd3XY7emQDKJxXvb4IK From: Martin Schitter To: ffmpeg-devel@ffmpeg.org Date: Wed, 11 Sep 2024 12:56:15 +0200 Message-ID: <20240911105616.849239-3-ms+git@mur.at> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240911105616.849239-2-ms+git@mur.at> References: <20240911105616.849239-2-ms+git@mur.at> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 2/4] libavformat/mxf: add DNxUncompressed MXF ULs 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: pXGv+7VX2c6Z --- 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..885b4df 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 }, 15, 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 */