From patchwork Sun Feb 21 19:51:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 25869 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 B1E80449DB5 for ; Sun, 21 Feb 2021 21:53:45 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9C8A468A8FA; Sun, 21 Feb 2021 21:53:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9C65D68A558 for ; Sun, 21 Feb 2021 21:53:39 +0200 (EET) Received: by mail-wr1-f41.google.com with SMTP id b3so16895431wrj.5 for ; Sun, 21 Feb 2021 11:53:39 -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=n0i/EZqyhI8NIKAxEmXUcTtl8cV6Mrju9aMqTUk8Xm0=; b=1pKvEHVu6gQTMDPCYOKnuReoiyrsNt0AlU7ybo/2pb8Xd3WLxhvSvzs9f3wO9STFWZ 1LWYAIHiSNf6+HbTVu+vcss9bC9/ZL8T4FcXIztcGXBckMk7O9K183HEvXJAFGXvYtz+ w4rcsQAk9Ab5Un8Av+aSj+34UmYBagiYLae+CuvgaRtgK6SQQe+1MkU60u03DZHQbeg1 St1DoPq+C2vEyvukicSqkjYZdGph7lHC+BU0RwmextOtjDvNzZvXzv223VwI6yKWDY+n b95gwLR1bov71r2Sxt8WryMDEC42bOHDR4StQKPeouMjAq3ztdHGYhCAd59KUgDgN5RK GuHA== 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=n0i/EZqyhI8NIKAxEmXUcTtl8cV6Mrju9aMqTUk8Xm0=; b=Clb99KSX4A4UIDLu6aA2HrKNpB/RmFy7vLjQGVOtVwRRlBGY0EbcFPg4oJ9fHDLloA 4rbgrZET+wk4uia5dCZ8+YfS6Eoomj/LLumqvgwYR6MS6Arzq/yrypv/7SF1jNKZS3Pc +9mL9ZFsJGTlWLdhzb9yD7rBsAkRVNjugngBZCuTWOag/nPeZvTUu4q43NO8e8rsvpzY 1qi64wyyuE5yeVdPNK+yzAycSbvVdOPexcX6MwmT1HNQAL00uoT3Nfxac774lkFEnwKy fXR1GIVQVuMDUEzttyPF9znTa7HS7y2SNGElAUfxTtVsDpSccuYr2bWQmOqo6/u0P3eL ZZyA== X-Gm-Message-State: AOAM530rvqJPDyV8yIJoa4dMxbL1BMHXO8Iyt4G8lY5Ix7ZOZpqYDH2z ce75AJkVKc/4d/Uczz5ggX/ip+3fALY9ig== X-Google-Smtp-Source: ABdhPJwq0mdfPt+wP6hPzo+dyOU5oEk7RpFMQVZqND5JbaMNS+ieGjitrSRm3Y10XtubbW7Ncmz97A== X-Received: by 2002:a5d:43c2:: with SMTP id v2mr18065440wrr.81.1613937219053; Sun, 21 Feb 2021 11:53:39 -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 z18sm1780372wrs.19.2021.02.21.11.53.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 11:53:38 -0800 (PST) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 21 Feb 2021 19:51:20 +0000 Message-Id: <20210221195125.1901683-13-sw@jkqxz.net> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210221195125.1901683-1-sw@jkqxz.net> References: <20210221195125.1901683-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 13/18] 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 0ff76b86f0..e739832665 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 59325c0471..0986564237 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, FLAGS), + + BSF_ELEMENT_OPTIONS_PIRE("content_light_level", + "Content light level information SEI", + content_light_level, FLAGS), + { NULL } };