From patchwork Sun Sep 13 18:45:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?R=C3=A9mi_Achard?= X-Patchwork-Id: 22341 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 0BE35448FAF for ; Sun, 13 Sep 2020 21:45:26 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E075168BB08; Sun, 13 Sep 2020 21:45:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 44F7868BB01 for ; Sun, 13 Sep 2020 21:45:19 +0300 (EEST) Received: by mail-wr1-f45.google.com with SMTP id a17so16355201wrn.6 for ; Sun, 13 Sep 2020 11:45:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+nVhUETLF06ZS3GV2V+J12a2VojRLy9BT2GAcewFbw8=; b=Ieh+uIha68jhCoXopVfRlWw2Tya9K1eJv3aHZxzzmmIlkIRqYjrXv2oGbrFRipMJZt OzWuL6MFWz5zN+bCaXLprBvi1l6jvAVH8b7vdd+SjZkB3HxtgT0H3697jY+KURqaZHWM 5gd6y93MAi18sc03u2daDRrwQeCNJ/3/DcYtlA3aYEzPi3yuicoFbLgtv/wLKTx72RTc ySStm5n2dnGCT5fozYW4n7zEN9PCD4FvNNkeb/cFT8yY2ECnYrpoyNYEeBP/B+IRXMo2 OlXRiActm04KXDtGOof3Q7inIuYqSUbkTAUl4cBNTOWnP45cEZnmoWGocFSmF+XgyWlt GiWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+nVhUETLF06ZS3GV2V+J12a2VojRLy9BT2GAcewFbw8=; b=qD9w9dkseMoRL0s8SR8jC24nYmAccr5tUZxEBSFbzkZSqMhMI6wlGQndbhKDsc5syx w7ZXfSBB9bTgbvvn/WprR53kRkgFgcLv3navvfstRejN4zXWjrCgctOr7AnPMZDq/smq syQiAoUBwOZ+ZO4PZwtl2/KMhyXpssZF5ly2fiSOLXGKvFt9Q/+ilr/MtXRpEZFZjXPB Mcp3965NONmrAoKr6c8knJkFDL6ydwyc3jKgBbW8KNQTfj05rTA0PF5W72W+w3yocjsQ w+IJECD3PGuKQ3o+SOFlUetAD5+Hy5lnTRA6c/RU63ykmh8YOLN4vIhvlOf1UoZ9nr/3 aNFA== X-Gm-Message-State: AOAM530ugLe/MzACK9dpkqLQ+Hot0Z7HSCPnScf9h88+QhG2XmBliOUl ByCb79glZgvBIaq007Lja6xMYeg/ym0= X-Google-Smtp-Source: ABdhPJxubFpZeLaMDLP5lr7TFUl0u7+4POCZqtey65AYdnIHNfz+7NfQs58wB5IPdGQoNF46S+Mc3Q== X-Received: by 2002:a5d:4fcc:: with SMTP id h12mr12130320wrw.199.1600022718261; Sun, 13 Sep 2020 11:45:18 -0700 (PDT) Received: from localhost.localdomain (host86-144-145-253.range86-144.btcentralplus.com. [86.144.145.253]) by smtp.gmail.com with ESMTPSA id o16sm15685672wrp.52.2020.09.13.11.45.17 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 13 Sep 2020 11:45:17 -0700 (PDT) From: =?utf-8?q?R=C3=A9mi_Achard?= To: ffmpeg-devel@ffmpeg.org Date: Sun, 13 Sep 2020 19:45:10 +0100 Message-Id: <20200913184510.85070-1-remiachard@gmail.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/mxfdec: fix pixel format extraction for cinema j2k X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: =?utf-8?q?R=C3=A9mi_Achard?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/mxf.h | 1 + libavformat/mxfdec.c | 20 +++++++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/libavformat/mxf.h b/libavformat/mxf.h index fc587f19f0..3fb3c6d74d 100644 --- a/libavformat/mxf.h +++ b/libavformat/mxf.h @@ -49,6 +49,7 @@ enum MXFMetadataSetType { TaggedValue, TapeDescriptor, AVCSubDescriptor, + JPEG2000PictureSubDescriptor, }; enum MXFFrameLayout { diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 6f6e8d586c..8eac7fc944 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -325,9 +325,11 @@ static const uint8_t mxf_encrypted_essence_container[] = { 0x06,0x0e,0x2b,0x static const uint8_t mxf_random_index_pack_key[] = { 0x06,0x0e,0x2b,0x34,0x02,0x05,0x01,0x01,0x0d,0x01,0x02,0x01,0x01,0x11,0x01,0x00 }; static const uint8_t mxf_sony_mpeg4_extradata[] = { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x01,0x0e,0x06,0x06,0x02,0x02,0x01,0x00,0x00 }; static const uint8_t mxf_avid_project_name[] = { 0xa5,0xfb,0x7b,0x25,0xf6,0x15,0x94,0xb9,0x62,0xfc,0x37,0x17,0x49,0x2d,0x42,0xbf }; -static const uint8_t mxf_jp2k_rsiz[] = { 0x06,0x0e,0x2b,0x34,0x02,0x05,0x01,0x01,0x0d,0x01,0x02,0x01,0x01,0x02,0x01,0x00 }; +static const uint8_t mxf_jp2k_rsiz[] = { 0x06,0x0e,0x2b,0x34,0x01,0x01,0x01,0x0a,0x04,0x01,0x06,0x03,0x01,0x00,0x00,0x00 }; static const uint8_t mxf_indirect_value_utf16le[] = { 0x4c,0x00,0x02,0x10,0x01,0x00,0x00,0x00,0x00,0x06,0x0e,0x2b,0x34,0x01,0x04,0x01,0x01 }; static const uint8_t mxf_indirect_value_utf16be[] = { 0x42,0x01,0x10,0x02,0x00,0x00,0x00,0x00,0x00,0x06,0x0e,0x2b,0x34,0x01,0x04,0x01,0x01 }; +static const uint8_t mxf_subdescriptor_array_smpte[] = { 0x06,0x0e,0x2b,0x34,0x01,0x01,0x01,0x09,0x06,0x01,0x01,0x04,0x06,0x10,0x00,0x00 }; +static const uint8_t mxf_subdescriptor_array_interop[] = { 0x06,0x0e,0x2b,0x34,0x01,0x01,0x01,0x02,0x06,0x01,0x01,0x04,0x06,0x10,0x00,0x00 }; #define IS_KLV_KEY(x, y) (!memcmp(x, y, sizeof(y))) @@ -1272,6 +1274,11 @@ static int mxf_read_generic_descriptor(void *arg, AVIOContext *pb, int tag, int rsiz == FF_PROFILE_JPEG2000_DCINEMA_4K) descriptor->pix_fmt = AV_PIX_FMT_XYZ12; } + if (IS_KLV_KEY(uid, mxf_subdescriptor_array_smpte) + || IS_KLV_KEY(uid, mxf_subdescriptor_array_interop)) { + mxf_read_strong_ref_array(pb, &descriptor->sub_descriptors_refs, + &descriptor->sub_descriptors_count); + } break; } return 0; @@ -2498,6 +2505,16 @@ static int mxf_parse_structural_metadata(MXFContext *mxf) } } + if (st->codecpar->codec_id == AV_CODEC_ID_JPEG2000) { + MXFDescriptor *desc = NULL; + for (k = 0; k < descriptor->sub_descriptors_count; k++) { + if ((desc = mxf_resolve_strong_ref(mxf, &descriptor->sub_descriptors_refs[k], JPEG2000PictureSubDescriptor))) { + st->codecpar->format = desc->pix_fmt; + break; + } + } + } + if (st->codecpar->codec_id == AV_CODEC_ID_RAWVIDEO) { st->codecpar->format = descriptor->pix_fmt; if (st->codecpar->format == AV_PIX_FMT_NONE) { @@ -2753,6 +2770,7 @@ static const MXFMetadataReadTableEntry mxf_metadata_read_table[] = { { { 0x06,0x0e,0x2b,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x5c,0x00 }, mxf_read_generic_descriptor, sizeof(MXFDescriptor), Descriptor }, /* VANC/VBI - SMPTE 436M */ { { 0x06,0x0e,0x2b,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x5e,0x00 }, mxf_read_generic_descriptor, sizeof(MXFDescriptor), Descriptor }, /* MPEG2AudioDescriptor */ { { 0x06,0x0e,0x2b,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x64,0x00 }, mxf_read_generic_descriptor, sizeof(MXFDescriptor), Descriptor }, /* DC Timed Text Descriptor */ + { { 0x06,0x0e,0x2b,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x5a,0x00 }, mxf_read_generic_descriptor, sizeof(MXFDescriptor), JPEG2000PictureSubDescriptor }, /* JPEG2000PictureSubDescriptor */ { { 0x06,0x0e,0x2b,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x3A,0x00 }, mxf_read_track, sizeof(MXFTrack), Track }, /* Static Track */ { { 0x06,0x0e,0x2b,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x3B,0x00 }, mxf_read_track, sizeof(MXFTrack), Track }, /* Generic Track */ { { 0x06,0x0e,0x2b,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x14,0x00 }, mxf_read_timecode_component, sizeof(MXFTimecodeComponent), TimecodeComponent },