From patchwork Wed Aug 12 12:43:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harry Mallon X-Patchwork-Id: 21606 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 54CD344B4CD for ; Wed, 12 Aug 2020 15:43:30 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 25EAF68B490; Wed, 12 Aug 2020 15:43:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f97.google.com (mail-qv1-f97.google.com [209.85.219.97]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8CAA9689F22 for ; Wed, 12 Aug 2020 15:43:23 +0300 (EEST) Received: by mail-qv1-f97.google.com with SMTP id y11so922200qvl.4 for ; Wed, 12 Aug 2020 05:43:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=codex.online; s=google; h=from:mime-version:subject:message-id:date:to; bh=kTaYHcWoZqcO4lWh0LmsO1vH5fWLr+tHAHQUoEH30/0=; b=mAWd2fsGwo8M4TUrXtfRiWUW/xNl6EdA5sK/OsexPSPydkShUR6t/1RMywK5zVDM6K cV3kHOYovFVXEInd4CpgOHD7qzmF5jwRZHTLddgVhgza4sa6GWBGHOEssVObTcGbvCAk xHRkOg6jotbFjKPXt1cKlXobSBkpDOg64v4FI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:mime-version:subject:message-id:date:to; bh=kTaYHcWoZqcO4lWh0LmsO1vH5fWLr+tHAHQUoEH30/0=; b=AnCCxuxzcCyEHFF9XwJ807vmhfnFw/4eEHE7XlfUmgs2QyOLpPewbi9kZyml+TAnB4 BTaIHvaZy35ccAPRjIDAXnUHQpSWoSckUn8UGyElLIEbnO/6FF5IKbrwCD4oOK/4xOWp pEHe+wFfCod/DhOP18I7a32UWz8BQptOIbqac+vOJojV6C9iryTTpUBin7mZjAg8bzFI Fv1w4F3Rcr/rqCnHQroodW3IxL6Dqn0QC/AR684b3mxN1IkHhmnhXmtjNZTaTffjuF8A RgfMrRvB7+mszEqgmLNAf33bblEJ8YKg7JuJZ1rS4VkrFjxuUIZiqGaCAifRdq3nMxeF /aXg== X-Gm-Message-State: AOAM531CAbsUDQ9UfdRq/XVmWZzk/jGQlLtBrSY0eWdebfAnwncsqH1b /Sy+wiiAqJiDERjt4ruwy8Flu5D6P9ecBq5I4V6qbCg90WcZbA== X-Google-Smtp-Source: ABdhPJza+/3GBppAHk9gw7YMaVCUYE5OWXXPd3Xf+F7CNDLPqRZnd1JnA6PKyclC/SOi0aMnqvuh/FT8CYBJ X-Received: by 2002:a0c:d98d:: with SMTP id y13mr6500141qvj.203.1597236202039; Wed, 12 Aug 2020 05:43:22 -0700 (PDT) Received: from us3.smtp.exclaimer.net (us3.smtp.exclaimer.net. [23.100.16.236]) by smtp-relay.gmail.com with ESMTPS id i27sm227345qkl.2.2020.08.12.05.43.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Aug 2020 05:43:22 -0700 (PDT) X-Relaying-Domain: pixsystem.com Received: from mail-wm1-f70.google.com (209.85.128.70) by us3.smtp.exclaimer.net (23.100.16.236) with Exclaimer Signature Manager ESMTP Proxy us3.smtp.exclaimer.net (tlsversion=TLS12, tlscipher=TLS_ECDHE_WITH_AES256_SHA1); Wed, 12 Aug 2020 12:43:20 +0000 X-ExclaimerHostedSignatures-MessageProcessed: true X-ExclaimerProxyLatency: 6129491 X-ExclaimerImprintLatency: 2476830 X-ExclaimerImprintAction: 32f463810351488c9687cb172976770a Received: by mail-wm1-f70.google.com with SMTP id q15so844146wmj.6 for ; Wed, 12 Aug 2020 05:43:21 -0700 (PDT) X-Received: by 2002:adf:f289:: with SMTP id k9mr34372505wro.203.1597236199975; Wed, 12 Aug 2020 05:43:19 -0700 (PDT) X-Received: by 2002:adf:f289:: with SMTP id k9mr34372493wro.203.1597236199769; Wed, 12 Aug 2020 05:43:19 -0700 (PDT) Received: from ?IPv6:2a01:4b00:8571:3800:40f8:ddf2:24e:8b9? ([2a01:4b00:8571:3800:40f8:ddf2:24e:8b9]) by smtp.gmail.com with ESMTPSA id p14sm4195962wrx.90.2020.08.12.05.43.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Aug 2020 05:43:19 -0700 (PDT) From: Harry Mallon Mime-Version: 1.0 Message-Id: Date: Wed, 12 Aug 2020 13:43:18 +0100 To: ffmpeg-devel@ffmpeg.org X-Mailer: Apple Mail (2.3608.120.23.2.1) X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] [PATCH v3] avformat/mxfdec: Read video range from PictureDescriptor 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" I'm very sorry for the noise, I just thought of a way that the last patch could be troublesome. Fixed here. From 31ce817887ec84907b3aadb5dc1657b01b8d0dbd Mon Sep 17 00:00:00 2001 From: Harry Mallon Date: Wed, 12 Aug 2020 10:26:23 +0100 Subject: [PATCH v3] avformat/mxfdec: Read video range from PictureDescriptor * Capture black_ref, white_ref and color_range and recognise full and narrow range. Signed-off-by: Harry Mallon Signed-off-by: Harry Mallon --- libavformat/mxfdec.c | 24 ++++++++++++++++++++++++ tests/ref/fate/mxf-probe-dnxhd | 2 +- tests/ref/fate/mxf-probe-dv25 | 2 +- 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 4b56984b77..172210acfe 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -199,6 +199,9 @@ typedef struct MXFDescriptor { int bits_per_sample; int64_t duration; /* ContainerDuration optional property */ unsigned int component_depth; + unsigned int black_ref_level; + unsigned int white_ref_level; + unsigned int color_range; unsigned int horiz_subsampling; unsigned int vert_subsampling; UID *sub_descriptors_refs; @@ -1222,6 +1225,15 @@ static int mxf_read_generic_descriptor(void *arg, AVIOContext *pb, int tag, int case 0x3302: descriptor->horiz_subsampling = avio_rb32(pb); break; + case 0x3304: + descriptor->black_ref_level = avio_rb32(pb); + break; + case 0x3305: + descriptor->white_ref_level = avio_rb32(pb); + break; + case 0x3306: + descriptor->color_range = avio_rb32(pb); + break; case 0x3308: descriptor->vert_subsampling = avio_rb32(pb); break; @@ -2492,6 +2504,18 @@ static int mxf_parse_structural_metadata(MXFContext *mxf) } if (descriptor->aspect_ratio.num && descriptor->aspect_ratio.den) st->display_aspect_ratio = descriptor->aspect_ratio; + if (descriptor->component_depth && + descriptor->black_ref_level == 0 && + descriptor->white_ref_level == ((1<component_depth) - 1) && + descriptor->color_range == ((1<component_depth) - 1)) { + st->codecpar->color_range = AVCOL_RANGE_JPEG; + } + else if (descriptor->component_depth >= 8 && + descriptor->black_ref_level == (1 <<(descriptor->component_depth - 4)) && + descriptor->white_ref_level == (235<<(descriptor->component_depth - 8)) && + descriptor->color_range == ((14<<(descriptor->component_depth - 4)) + 1)) { + st->codecpar->color_range = AVCOL_RANGE_MPEG; + } st->codecpar->color_primaries = mxf_get_codec_ul(ff_mxf_color_primaries_uls, &descriptor->color_primaries_ul)->id; st->codecpar->color_trc = mxf_get_codec_ul(ff_mxf_color_trc_uls, &descriptor->color_trc_ul)->id; st->codecpar->color_space = mxf_get_codec_ul(ff_mxf_color_space_uls, &descriptor->color_space_ul)->id; diff --git a/tests/ref/fate/mxf-probe-dnxhd b/tests/ref/fate/mxf-probe-dnxhd index 012d3ea1d9..5a6221b1d5 100644 --- a/tests/ref/fate/mxf-probe-dnxhd +++ b/tests/ref/fate/mxf-probe-dnxhd @@ -124,7 +124,7 @@ sample_aspect_ratio=1:1 display_aspect_ratio=4:3 pix_fmt=yuv422p level=-99 -color_range=unknown +color_range=tv color_space=bt709 color_transfer=bt709 color_primaries=bt709 diff --git a/tests/ref/fate/mxf-probe-dv25 b/tests/ref/fate/mxf-probe-dv25 index 810f145f41..ffd26c4dfd 100644 --- a/tests/ref/fate/mxf-probe-dv25 +++ b/tests/ref/fate/mxf-probe-dv25 @@ -16,7 +16,7 @@ sample_aspect_ratio=16:15 display_aspect_ratio=4:3 pix_fmt=yuv420p level=-99 -color_range=unknown +color_range=tv color_space=unknown color_transfer=bt470m color_primaries=unknown