From patchwork Mon Sep 23 09:16:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Schitter X-Patchwork-Id: 51738 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d154:0:b0:48e:c0f8:d0de with SMTP id bt20csp2328392vqb; Mon, 23 Sep 2024 02:29:16 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX5a8LHR92nWoqrVRCGMVLj7e6+85hSbus2MmMCn4064pln3txMfKNmB4g4vzXajTeW5ifRe18NGaMrjeZKeNtD@gmail.com X-Google-Smtp-Source: AGHT+IHsWajyTMKhxDKQqdOlttasexR844iunv96I143dN/TfqLKpa9NZ+sXmkFBL2XpOfPuFARJ X-Received: by 2002:a05:6512:3b20:b0:52e:be84:225c with SMTP id 2adb3069b0e04-536ac2f5128mr5273811e87.33.1727083756721; Mon, 23 Sep 2024 02:29:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727083756; cv=none; d=google.com; s=arc-20240605; b=TxF3VmmZ812dg1pD3CpvnkgZ4SMj0inEn0aGhpGaLhzLvug0PlQXgKEeDXLfbNaQIc vd1WsZkH2L9GE695kvUlhQ+Ec9nUzTB2odhyTafganS3SheUKeZ87YRjqlZEwA90MAMK ej0qXBlk1mD46Bb/5rOgKeVzT6apGL+6ttVRL9OJVizjB3deOouerlae0c1QOU7m/R3a 1RYKX0p3/9VR9eKTuXfoo4biM5TKWgX3qq2Pxc3okoNh6raIaxe61YJ2O6ITvfH1LmmE Yq9pVL7Y4rN3o2XYnbbK+FGcSk88fqJgWEcmE6hpy+AmXzXJrn32WMiXz3xh61TIt1sd Jw7w== 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=YZOdnPLPkfkSXMeVqVW84bBw3IuRxTT6p2F/e9cfKvY=; fh=igg3JDwkSkAbPTwY6V0OsEq0RUkG4DKWC8fVJg4GhMY=; b=OqZoxCV4KH5IICviq3lI/zOAnZPotO7pmv1pyvPi66FvRMFwpR344Vf8suCaKLtEXS HsStCCoP70ptSV+FWczHEbg3wv2HDBvltZsfrYXCQhldq7FJjQARwedxJTD8krFer2/K EwzPmMoHSwZiX3jgyN5DlmHZdXSPqnZfzl4In9W4IijuOqHkj2AvC1ky1v+IumBjXKa+ 5jS5KUdlNWphE10E1+p1/tWNLCONqho8Yl7lGACqdzb9A3H8q1QM5+9pBVH2Hq4igM6i +yKG6wyD5pyTinSGUOazjEbhNhGvKJXTG9d7gHyJKn9FocQq/G1JWjc2UIleBe3c2N3l Ev8Q==; 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=siYKijZP; 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 2adb3069b0e04-5369a0102casi5398053e87.0.2024.09.23.02.29.16; Mon, 23 Sep 2024 02:29:16 -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=siYKijZP; 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 9B22968DB8A; Mon, 23 Sep 2024 12:22:36 +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 DA0EC68DB65 for ; Mon, 23 Sep 2024 12:22:29 +0300 (EEST) Received: from localhost.localdomain (lan1.raspi.ma39.ffgraz.net [10.12.1.243]) by efeu.mur.at (Postfix) with ESMTPSA id 84D1F4610E; Mon, 23 Sep 2024 11:22:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mur.at; s=dkim2; t=1727083349; bh=y+VYjjloyo7j9r1abvSUPvGbTUbRD2jtBke/UbGwgFE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=siYKijZPFPvq2SlDKeS9KcwxM+cRxQWtSqSbufQY7v/XgGmtM7XVQSvOdvunHm/G4 ZW+bflj6x1e9XWGo3Ct18TVoWZNydJc4n+2+ZbR2y2oDxn9aGtzbx89BhuKTgVetcJ OtpIW4XnJNiH2d6xFRMWrM3H09f3tXz7/Rvq7Xy/0jY2Nf1SP/yV3JAXizLo321fiP oOL+Al6ZwVhYqZgyfS2c+W52l1CaevvRiIN3aEor9UcqpnixYc2/zbWOzIx5U2H15G HqWL5szmCfwRqkzUFjFCorpE7/f66hHx9AQ7S0+xX9m8rWT1X7ojrOmw/uFfIj3Xy9 W5Y2KepcdEk6Je7cYh1sbSA3dFS+AVN3JFAybSe7acnF1BHPG0tSdb/X0S9D1hMSa/ pFLEQEzDP73ECfBZDcCM9By91YrWxJiAc+mNiAX/i1lChOyyvlm9ds6UL728irggzt rV0CjHq08CbR7Kt1sTrdQfIzFe6E/YgTtnNyZGyxp9Cl0hssSCI From: Martin Schitter To: ffmpeg-devel@ffmpeg.org Date: Mon, 23 Sep 2024 11:16:43 +0200 Message-ID: <20240923091645.2309922-4-ms+git@mur.at> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240923091645.2309922-3-ms+git@mur.at> References: <20240923091645.2309922-3-ms+git@mur.at> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v9 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: Martin Schitter Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: S1eqoqItS3xx --- 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 24f4ed1..7460799 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -1594,6 +1594,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 */