From patchwork Wed Sep 9 14:56:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harry Mallon X-Patchwork-Id: 22233 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 C250244A89F for ; Wed, 9 Sep 2020 19:05:26 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9F63A68B8E5; Wed, 9 Sep 2020 19:05:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f182.google.com (mail-lj1-f182.google.com [209.85.208.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DC68568B8C1 for ; Wed, 9 Sep 2020 19:05:19 +0300 (EEST) Received: by mail-lj1-f182.google.com with SMTP id b19so4229253lji.11 for ; Wed, 09 Sep 2020 09:05:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=codex.online; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=iOKQ9y7iYbmRH0hXpzWnnRNxNomA2WEIjK6DY0GM5is=; b=CxtIeM6kcl+KCOx1LkfpdKGtgi8wGMomltJ5qEyP7Qa2NNxKaI4sm1Ec3UiX+YHy30 1h9EiLxSND7QtWKN4/OEmZooqM7SgpcyclrPaseEp5a80IBq5rAKbq527jvZDP6f6qlL ZVThlZ2gMDSvLbGbuJ6ProzUvFhKbGI0GfOEM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iOKQ9y7iYbmRH0hXpzWnnRNxNomA2WEIjK6DY0GM5is=; b=BXMXJVWNotJX8YzX1pKzIMe1LcUV6mY9xpgxNGCHCVdvI3oqendFkBOmE+/3GmUq3V YUGtlbSBO/jpuyZBjClF6JpEb9+oexAjG8jwaOMP21ER4qEk7KrXQodEy7/MjF8MYrie y4zCX3+6KpvAeg+g07HDEn4b4XJq7RooxsLupaPtJ2HJOrA4JGa900Xdtiyk9cU9yG1k njBcGDKtCkYg7/Yngwt3NELvBlU5q+E7T9J0EtQzJ9piD1b/cSo8kI1/6FKiEusc8zH+ aCrSNGmtZKcWMbtANHETX4fdehexxZfB7L21XzUqfG48aKgZTJm+OhY94Ni16zOHCiU5 w0gQ== X-Gm-Message-State: AOAM533SAPlLPT2f/KWjoChEJpLo+FjJRjknEMUPtQSnM5s8YgRJwpeg TeC9PZe5a3QiDwDPuGfSAZXDu60uYUCTcBNj X-Google-Smtp-Source: ABdhPJxMwZeKgBXfOdvmfzbtQvaAY0KuDYQzRhBcxvXd5RXGjaKncJSNm2X+5TRZSNuQNL0KXTz2Cw== X-Received: by 2002:a5d:458e:: with SMTP id p14mr4340166wrq.61.1599663403766; Wed, 09 Sep 2020 07:56:43 -0700 (PDT) Received: from localhost ([2a01:4b00:8571:3800:9b7:7612:40c6:2653]) by smtp.gmail.com with ESMTPSA id k22sm4613898wrd.29.2020.09.09.07.56.43 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 09 Sep 2020 07:56:43 -0700 (PDT) From: Harry Mallon To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 Sep 2020 15:56:38 +0100 Message-Id: <20200909145639.14922-2-harry.mallon@codex.online> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200909145639.14922-1-harry.mallon@codex.online> References: <20200831190756.80515-1-harry.mallon@codex.online> <20200909145639.14922-1-harry.mallon@codex.online> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/3] avformat/mxfenc: Write Mastering Display Colour Volume to MXF 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" Described in Annex B SMPTE ST 2067-21:2020 Signed-off-by: Harry Mallon --- libavformat/mxfenc.c | 50 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index 733c747a9a..cbb0fc5a6a 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -44,6 +44,7 @@ #include "libavutil/random_seed.h" #include "libavutil/timecode.h" #include "libavutil/avassert.h" +#include "libavutil/mastering_display_metadata.h" #include "libavutil/pixdesc.h" #include "libavutil/time_internal.h" #include "libavcodec/bytestream.h" @@ -505,6 +506,7 @@ static void mxf_write_primer_pack(AVFormatContext *s) AVIOContext *pb = s->pb; int local_tag_number, i = 0; int avc_tags_count = 0; + int mastering_tags_count = 0; local_tag_number = FF_ARRAY_ELEMS(mxf_local_tag_batch); local_tag_number += mxf->store_user_comments * FF_ARRAY_ELEMS(mxf_user_comments_local_tag); @@ -513,10 +515,15 @@ static void mxf_write_primer_pack(AVFormatContext *s) MXFStreamContext *sc = s->streams[i]->priv_data; if (s->streams[i]->codecpar->codec_id == AV_CODEC_ID_H264 && !sc->avc_intra) { avc_tags_count = FF_ARRAY_ELEMS(mxf_avc_subdescriptor_local_tags); - local_tag_number += avc_tags_count; + } + if (av_stream_get_side_data(s->streams[i], AV_PKT_DATA_MASTERING_DISPLAY_METADATA, NULL)) { + mastering_tags_count = FF_ARRAY_ELEMS(ff_mxf_mastering_display_local_tags); } } + local_tag_number += avc_tags_count; + local_tag_number += mastering_tags_count; + avio_write(pb, primer_pack_key, 16); klv_encode_ber_length(pb, local_tag_number * 18 + 8); @@ -534,6 +541,8 @@ static void mxf_write_primer_pack(AVFormatContext *s) } if (avc_tags_count > 0) mxf_write_local_tags(pb, mxf_avc_subdescriptor_local_tags, avc_tags_count); + if (mastering_tags_count > 0) + mxf_write_local_tags(pb, ff_mxf_mastering_display_local_tags, mastering_tags_count); } static void mxf_write_local_tag(AVIOContext *pb, int size, int tag) @@ -1043,6 +1052,16 @@ static const UID mxf_generic_sound_descriptor_key = { 0x06,0x0E,0x2B,0x34,0x02,0 static const UID mxf_avc_subdescriptor_key = { 0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x6E,0x00 }; +static inline uint16_t rescale_mastering_chroma(AVRational q) +{ + return av_clip_uint16(av_rescale(q.num, FF_MXF_MASTERING_CHROMA_DEN, q.den)); +} + +static inline uint32_t rescale_mastering_luma(AVRational q) +{ + return av_rescale(q.num, FF_MXF_MASTERING_LUMA_DEN, q.den); +} + static int64_t mxf_write_cdci_common(AVFormatContext *s, AVStream *st, const UID key) { MXFStreamContext *sc = st->priv_data; @@ -1055,6 +1074,7 @@ static int64_t mxf_write_cdci_common(AVFormatContext *s, AVStream *st, const UID const MXFCodecUL *color_trc_ul; const MXFCodecUL *color_space_ul; int64_t pos = mxf_write_generic_desc(s, st, key); + uint8_t *side_data; color_primaries_ul = mxf_get_codec_ul_by_id(ff_mxf_color_primaries_uls, st->codecpar->color_primaries); color_trc_ul = mxf_get_codec_ul_by_id(ff_mxf_color_trc_uls, st->codecpar->color_trc); @@ -1223,6 +1243,34 @@ static int64_t mxf_write_cdci_common(AVFormatContext *s, AVStream *st, const UID mxf_write_local_tag(pb, 16, 0x3201); avio_write(pb, *sc->codec_ul, 16); + // Mastering Display metadata + side_data = av_stream_get_side_data(st, AV_PKT_DATA_MASTERING_DISPLAY_METADATA, NULL); + if (side_data) { + const AVMasteringDisplayMetadata *metadata = (const AVMasteringDisplayMetadata*)side_data; + if (metadata->has_primaries) { + mxf_write_local_tag(pb, 12, ff_mxf_mastering_display_local_tags[0].local_tag); + avio_wb16(pb, rescale_mastering_chroma(metadata->display_primaries[0][0])); + avio_wb16(pb, rescale_mastering_chroma(metadata->display_primaries[0][1])); + avio_wb16(pb, rescale_mastering_chroma(metadata->display_primaries[1][0])); + avio_wb16(pb, rescale_mastering_chroma(metadata->display_primaries[1][1])); + avio_wb16(pb, rescale_mastering_chroma(metadata->display_primaries[2][0])); + avio_wb16(pb, rescale_mastering_chroma(metadata->display_primaries[2][1])); + mxf_write_local_tag(pb, 4, ff_mxf_mastering_display_local_tags[1].local_tag); + avio_wb16(pb, rescale_mastering_chroma(metadata->white_point[0])); + avio_wb16(pb, rescale_mastering_chroma(metadata->white_point[1])); + } else { + av_log(NULL, AV_LOG_VERBOSE, "Not writing mastering display primaries. Missing data.\n"); + } + if (metadata->has_luminance) { + mxf_write_local_tag(pb, 4, ff_mxf_mastering_display_local_tags[2].local_tag); + avio_wb32(pb, rescale_mastering_luma(metadata->max_luminance)); + mxf_write_local_tag(pb, 4, ff_mxf_mastering_display_local_tags[3].local_tag); + avio_wb32(pb, rescale_mastering_luma(metadata->min_luminance)); + } else { + av_log(NULL, AV_LOG_VERBOSE, "Not writing mastering display luminances. Missing data.\n"); + } + } + if (sc->interlaced && sc->field_dominance) { mxf_write_local_tag(pb, 1, 0x3212); avio_w8(pb, sc->field_dominance);