From patchwork Fri Oct 4 21:07:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Schitter X-Patchwork-Id: 52057 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:938f:0:b0:48e:c0f8:d0de with SMTP id z15csp673817vqg; Fri, 4 Oct 2024 14:19:09 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVEQxYgVy7WkGJ13jSHRwyK/B55x7wnniA6SrDSrrOFXTYkLHEV1ZUynL9kzw6RTsTeGRIZ0FJ3pVHXyeBmszZG@gmail.com X-Google-Smtp-Source: AGHT+IEY7eGlqCAhzZW3VH+iKpj5ijm1dmWblgMHY76zkWFhfySWtMl76GBuZueLN9XnnQ2b5dsd X-Received: by 2002:a17:907:e2a8:b0:a86:700f:93c0 with SMTP id a640c23a62f3a-a991bd49049mr375940466b.35.1728076749173; Fri, 04 Oct 2024 14:19:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728076749; cv=none; d=google.com; s=arc-20240605; b=EmHSBv2h7cFOJaqIOTlOwGFHf13DsXpIOpU+zvUKl1ihgUcvX55ElCmHAfIcVNqjf5 6G208XIpqEwsyGyOguC1751hj143CcXX0mcelgc+fDkczk1BxBvLmgEqY3HvJhKw/pD2 XxLp0bIDKyB7bNC/bWmLm4gaDdMCYP6C40Q+kx/xM/6tLOHefEo+H3F81H8b4WZOQMyv jg/DwDhpMaEGe6LoVr3+h9rW6P/cslyQYB9oa5WhUqsLEac10Nh1S7MTFG2Lq7L1nXcl 9QpJKlkoR8OPqXfPuChnL+td/uYn8rHlob3TukqIGDQnOdgBAY0EqbX52rJLx012gV2i J8lA== 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=OVJXPdcQxvE2QE4heFiPjG75T0HhAMRmm+q37bxYPWc=; fh=SY+A8HDvCKivsvOlugO0byaDvZLxc2A9PIXlqXmaPLE=; b=TJBX2kiyvLvc+lO3nLxxaRg+3SuQ38Z7Q7sCYR4gSkw9dKGMIn51+GbsZz5NpcJiZa 0LCzxB8ucy6OUYPLoIRxDjJQIUAixegUOp8AJVIpdKr4Mt3dIjs5meiiK/JNIZ0wK9of XcaOZDPL1i7g9LyyVwgmNTaGs86CWOHNeUvoZwzLV6uAUo8NIWGeqdgZllfCtmt3m0An aDoxxJbEoQDZh31FK8C8sVjjRdiUEW+AJhOFrK08krQQhHTi18ZzPXIEWFqa0Fl1ljd9 dP/vAieaga29FRWhKY5C6EvcC3HYot0pk1SCmLupHZgsCqN8m7+CPDxuvE9vkYqoaADr ld+g==; 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=jmqTyZ2Q; 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-a9937d13c7esi6482866b.970.2024.10.04.14.19.08; Fri, 04 Oct 2024 14:19:09 -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=jmqTyZ2Q; 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 8126F68DB0F; Sat, 5 Oct 2024 00:10:59 +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 3FCE368DAEF for ; Sat, 5 Oct 2024 00:10:50 +0300 (EEST) Received: from localhost.localdomain (lan1.raspi.ma39.ffgraz.net [10.12.1.243]) by efeu.mur.at (Postfix) with ESMTPSA id A5107461D8; Fri, 4 Oct 2024 23:10:42 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mur.at; s=dkim2; t=1728076242; bh=XNnUblzy4H7+qN9UcxWhzBh84hBIfd+gRlmxfiCeFEU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jmqTyZ2QCOvwhZDu8g2aX4RaWOw30crZUoI3IdifEJ7mpxIEqDwZ30krKa2sJy/Cg SrlIJs9lMoib9eZJ6YsrTYM1NwafCcOAqUJ0u12nuAMRyyIMsIDn1Nl87llHmgaQpk MIUIk4u+uAwj8GPMKpoKJUz1nhE9sPZdD/i9Lal3Yyf3Ojn7/iKFpG4geNLTQz6q9x qoX5H7wBR0dAPLALlIuG3L9NPWkayHKuaWXW5pzDf73QHHqyqWzBV457RsvBLNLi/3 ng2Qrp5z4hIPw70YY8QtKuS2RUvNQ+KQJu7IbrVX+q5XJYI9h3X4w2PTBfsrS/FWBG H9skwiZ7uS83IPL1BsqkFEFgBE9aHKWgWCO3Wx/7CFa5Fzp+1/LldZ2rcx06Kpnusx XMf2+4duUXNzKXOdzEmVLioahnBptTOOSJGGEr87ulk/61MG59jpdQ2aw++ah8Fdrg sn0OPqvMuXlSMe3/J3ZbyUKPTHBspAcCH6Ex6+FX5SOuO7r52VD From: Martin Schitter To: ffmpeg-devel@ffmpeg.org Date: Fri, 4 Oct 2024 23:07:31 +0200 Message-ID: <20241004210734.3145612-4-ms+git@mur.at> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241004210734.3145612-2-ms+git@mur.at> References: <20241004210734.3145612-2-ms+git@mur.at> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v10 2/6] 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: michael@niedermayer.cc, Martin Schitter Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ImQdvdWZwXt1 --- 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 1b53a97..e5f5908 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -1617,6 +1617,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,0x0d,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 */