From patchwork Fri Jan 1 21:35:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 24741 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 6E75244BCD1 for ; Fri, 1 Jan 2021 23:38:15 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 603AE68A9E8; Fri, 1 Jan 2021 23:38:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4EEB468A92E for ; Fri, 1 Jan 2021 23:38:12 +0200 (EET) Received: by mail-wr1-f43.google.com with SMTP id t16so22930633wra.3 for ; Fri, 01 Jan 2021 13:38:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=MZk9uqPRZ8wbEgqaLtbjNrzzymaSMNkB21mH5cJR6ys=; b=laAQwXF5pYE6GswNLGPx2Swq6xfj+NroZBvdbscMuOST64YLuzrpgcILLFfzq84+Za q9mDVCw8coASKx8shohLwFu05rgpAlROyiTP5eaa8phMXnMIin4x/n1pMDP1ZaqWT947 vqmjtv7sut9HJx6El7bbnJQGl/h/X2KVMCjT/5fcd0Cw9ycRicBKpKPrneH/t4qLZPo9 r9fiKu+olBtPOU9YWbFDSMPbAsRxda6XZ7XzbtCxXU75bKCy3EIOAe35K1ukTsfSdgh9 1inovh1/yLsoIAG/bBXLZLxncLBbZR+rLFuXYPaWpOvcXtnAaWMsJ5YJ8lDfKb+2PqCa s5yA== 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=MZk9uqPRZ8wbEgqaLtbjNrzzymaSMNkB21mH5cJR6ys=; b=tdMgwNEbzF4AHHhAYIu6jvOZu6tl7SHAPtLlcViJR0aWCQt5mKNT8lTMMuArR0qDJk 7n0JBFRxA3B8eVmLx0IKV/dcF+wy8iLAgzGnuxdGnh+AT8hY2ylEyzMAmXtZsDkxqr5O fzRy9MtKKka4DwZcJQY8tp0MKKUAZmVyD2XGrkJT/p+P60UKbkHsIc9RxSO9noJ6Yg5o XeUsI/mxnOQ1LdUHsEeDBo/AGdlUj7A/9ZUtT3xRSeVnkBYaTgz5w956Oy6As8j72VME Peezyxf1HNdqpSq4cUJg7r7HVuz6a58nfRlnBEcAjtw5jbGuEgdSt/CnDPv89xwKDm3I kUNw== X-Gm-Message-State: AOAM530bV5QTARbmsRU1RueWh7UL8fqZXA5NtE471SHAXAvuwYm4ccnq 6w4YaeplgTg85zSSsuYSKFrJjP+Vyo8Dog== X-Google-Smtp-Source: ABdhPJyZutiPxq+MrP14exnLi8Iqom5UPF57M0peDzhVuF+HDS2GWmvMPqQvjAfJQF8agUdSnyhZkA== X-Received: by 2002:adf:fa86:: with SMTP id h6mr69062265wrr.103.1609537091638; Fri, 01 Jan 2021 13:38:11 -0800 (PST) Received: from localhost.localdomain (cpc91226-cmbg18-2-0-cust7.5-4.cable.virginm.net. [82.0.29.8]) by smtp.gmail.com with ESMTPSA id v20sm18784595wml.34.2021.01.01.13.38.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Jan 2021 13:38:11 -0800 (PST) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Jan 2021 21:35:33 +0000 Message-Id: <20210101213537.169546-24-sw@jkqxz.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210101213537.169546-1-sw@jkqxz.net> References: <20210101213537.169546-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 23/27] h265_metadata_bsf: Support HDR metadata 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" --- doc/bitstream_filters.texi | 17 +++++++++++++++++ libavcodec/h265_metadata_bsf.c | 26 ++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/doc/bitstream_filters.texi b/doc/bitstream_filters.texi index 695825d33f..4c9a42c24a 100644 --- a/doc/bitstream_filters.texi +++ b/doc/bitstream_filters.texi @@ -393,6 +393,23 @@ The argument must be the name of a level (for example, @samp{5.1}), a or the special name @samp{auto} indicating that the filter should attempt to guess the level from the input stream properties. +@item mastering_display +@item content_light_level +Manipulate mastering display colour volume (see H.265 section D.3.28) +and content light level info (see H.265 section D.3.35) SEI messages in +the stream. + +Possible actions: +@table @samp +@item insert +Insert this type of message, taking the values from packet side-data. +@item remove +Remove all instances of this message. +@item extract +Extract the content of this type of message, attaching it to the packets +as side-data. +@end table + @end table @section hevc_mp4toannexb diff --git a/libavcodec/h265_metadata_bsf.c b/libavcodec/h265_metadata_bsf.c index c3eadee92b..4c84d4f5a8 100644 --- a/libavcodec/h265_metadata_bsf.c +++ b/libavcodec/h265_metadata_bsf.c @@ -23,6 +23,7 @@ #include "cbs.h" #include "cbs_bsf.h" #include "cbs_h265.h" +#include "cbs_metadata.h" #include "hevc.h" #include "h265_profile_level.h" @@ -60,6 +61,9 @@ typedef struct H265MetadataContext { int level; int level_guess; int level_warned; + + int mastering_display; + int content_light_level; } H265MetadataContext; @@ -393,6 +397,20 @@ static int h265_metadata_update_fragment(AVBSFContext *bsf, AVPacket *pkt, } } + if (pkt) { + err = ff_cbs_bsf_apply_metadata(bsf, pkt, au, + CBS_METADATA_MASTERING_DISPLAY, + ctx->mastering_display); + if (err < 0) + return err; + + err = ff_cbs_bsf_apply_metadata(bsf, pkt, au, + CBS_METADATA_CONTENT_LIGHT_LEVEL, + ctx->content_light_level); + if (err < 0) + return err; + } + return 0; } @@ -484,6 +502,14 @@ static const AVOption h265_metadata_options[] = { { LEVEL("8.5", 255) }, #undef LEVEL + BSF_ELEMENT_OPTIONS_PIRE("mastering_display", + "Mastering display colour volume SEI", + mastering_display, "mdcv"), + + BSF_ELEMENT_OPTIONS_PIRE("content_light_level", + "Content light level information SEI", + content_light_level, "cll"), + { NULL } };