From patchwork Fri Jan 1 21:35:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 24742 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 A702E44BCD1 for ; Fri, 1 Jan 2021 23:38:16 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 85CC268A9AA; Fri, 1 Jan 2021 23:38:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 611F268A957 for ; Fri, 1 Jan 2021 23:38:11 +0200 (EET) Received: by mail-wr1-f54.google.com with SMTP id y17so22909161wrr.10 for ; Fri, 01 Jan 2021 13:38:11 -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=agKenjm4YrSwcM6NxpkJ91495JnOXw4KCIb2XONUXi4=; b=OxI9LXRiR4uJn6Ov7jI8fOAPjQJr44Tlsizp2SpjGayM8FRPYZryQH5/GrExbJj3NJ WZ8KVwUxlGCL4Ht4cle5aixF5+p9njTf0HoUtXs4tN4Bh8KjVnJr4Z2RT55LsPsMUG1/ XQODhY/nPpu6bsc2L7nHA6p1ItIiFloR76lhLnsqx+/vpIhWjNwHv+8ilHnOGAtbXh4T 8ZgBpLTcyxW/gJxBUCzwettdLT6b6pu9o5G2U+mY7FhhNJ6odx9/9SvEAbvL55z+vdic i7is65zikkjuKGPN+AHAQK6cTzzHKckmYmgVKziH66r9eHdyz3d2TuwFUUVaMO8Tq26h Mdfw== 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=agKenjm4YrSwcM6NxpkJ91495JnOXw4KCIb2XONUXi4=; b=ioRbEM1CfG93yyQUJLRceaDdJS71wNkixy2efeGGPtPb60s9HWVeZrJMSJbqZQx8oe vmij3DETx5NJyGiJS4sKNOZslBHJj2NnA/WFmFMr/8wUR3efx3uZ8bkGQ44W9M27MmmT f850uNueukCzYHSpSo/tZEBTeqO5rV1CMtBOLFTTsPp/VPcM9w642IG7F4liU4FD0nZn E4gRAPSfjosITA98oHddRFAORD2bk+UTXnNEzbcUkDnkbSX0Zra7mnVE5e11Nd9FmemD 8NGyJAKgH+GAaitOC201NvogglqGDQt7h25+5rB6lIYjbmjvjHJLCmsPlCbsBkh8SaV7 O+4g== X-Gm-Message-State: AOAM533qDU+j1funMAUngUJT6jziA4AfqPazAjJaddEdUacWND81OeJ/ xefOz+gRNAT5vGXbiARh8+DKrLA7ipDmog== X-Google-Smtp-Source: ABdhPJyk9cIT3oP5LS+zI4U5M8yqHG+KBoVshzivQVXLPxq2E6CBnwjYqQoxPjT5Oyb1+7b2y7Qvhg== X-Received: by 2002:adf:84c1:: with SMTP id 59mr72423677wrg.409.1609537090840; Fri, 01 Jan 2021 13:38:10 -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:10 -0800 (PST) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Jan 2021 21:35:32 +0000 Message-Id: <20210101213537.169546-23-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 22/27] h264_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/h264_metadata_bsf.c | 25 +++++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/doc/bitstream_filters.texi b/doc/bitstream_filters.texi index 8a2f55cc41..695825d33f 100644 --- a/doc/bitstream_filters.texi +++ b/doc/bitstream_filters.texi @@ -285,6 +285,23 @@ level_idc value (for example, @samp{42}), 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.264 section D.2.29) +and content light level info (see H.264 section D.2.31) 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 h264_mp4toannexb diff --git a/libavcodec/h264_metadata_bsf.c b/libavcodec/h264_metadata_bsf.c index aae91a6e23..bdaee78d1e 100644 --- a/libavcodec/h264_metadata_bsf.c +++ b/libavcodec/h264_metadata_bsf.c @@ -78,6 +78,9 @@ typedef struct H264MetadataContext { int flip; int level; + + int mastering_display; + int content_light_level; } H264MetadataContext; @@ -449,6 +452,20 @@ static int h264_metadata_update_fragment(AVBSFContext *bsf, AVPacket *pkt, return err; } + 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; + } + if (pkt) ctx->done_first_au = 1; @@ -609,6 +626,14 @@ static const AVOption h264_metadata_options[] = { { LEVEL("6.2", 62) }, #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 } };