From patchwork Fri Jan 1 21:35:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 24743 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 A0F2944BCD1 for ; Fri, 1 Jan 2021 23:38:17 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8CB4D68AA00; Fri, 1 Jan 2021 23:38:17 +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 541AD68A995 for ; Fri, 1 Jan 2021 23:38:13 +0200 (EET) Received: by mail-wr1-f41.google.com with SMTP id a12so22897660wrv.8 for ; Fri, 01 Jan 2021 13:38:13 -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=e+A69b92CyJXk51Pidpe14TCeWBn9FZ9FSz92TV0wJY=; b=rhnqPDAkYzzbk1Lbij5Ps0bvL/ZA8kQmmOKiGSUDkMXwXXJH2eypLvvC/xcbdJMzQj UPYyey8aPtqhHiUfkN4f1xmjFMooc+jrAXASVS7s5jTu6j4w1am4yjHc1TjAN2O2x0Qi GODEWeUpeHtmZQdwAFUvLv/wuEYnE0chBZYWTwS5FvpedaWqImOAdKAQVVP/DC+1VULF 76wJ16jxDnGo7w36wmbteke6ZRPMrpoLUbBEALviWvzZipIMjE4aRiUkPUFizKraCd2T LdFwXdsQ1thneWg+xqKCnXQAqWwYinY1oH4DRa/2jO6wWDq0AvSCytoySxz8imS1WvDG oYWg== 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=e+A69b92CyJXk51Pidpe14TCeWBn9FZ9FSz92TV0wJY=; b=CAvWBky26fF/KD0qK0/cOwz9iqp5S/B1AFdYMzR/pZr1bAWiNDQDFd8Qlv+u+Y06hY zUePveG99xB8T61WwnsIjOtI3pMSWGBZH7YkawvqZwH99qef2LqCRxkwm25AyQJ9qFrY xdPz768FbtF1aMT4LTDX63mP1OEPSE4VDHNdpVZLZuQ1N93zt2SusMcvTLfIQTB7ejM+ 28yVcpVQ12bg0BnvHL//wCAdJLx+IPZ1Ku82BdHgM+uqECcHz0mnm8NmoLcY5O9Xmohg vfzC7G+d6gERXWDICqQO8TL7pmqsJmMrFqG7Sz4fX0stosnQkzQ0/TxMkXo2v4kHi/+i LcTg== X-Gm-Message-State: AOAM5322QSucgZk/N8HnTQs2T6KCziOLsp6jYA9p/EfZIfI1vlRF+CW+ ysYgLg7y8ZM922G4lPtFrC/mu24FXZH94Q== X-Google-Smtp-Source: ABdhPJw24hKbBuoejAfKBYVhZeVuv9Zxm1zLTWP8xQclcuWkXgoa3FWvjOR7Hs91pByI0WkwiFwpzQ== X-Received: by 2002:adf:dc8b:: with SMTP id r11mr71192270wrj.131.1609537092395; Fri, 01 Jan 2021 13:38:12 -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.11 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:34 +0000 Message-Id: <20210101213537.169546-25-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 24/27] av1_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/av1_metadata_bsf.c | 26 ++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/doc/bitstream_filters.texi b/doc/bitstream_filters.texi index 4c9a42c24a..3fea06fca7 100644 --- a/doc/bitstream_filters.texi +++ b/doc/bitstream_filters.texi @@ -90,6 +90,23 @@ has a fixed framerate. Ignored if @option{tick_rate} is not also set. @item delete_padding Deletes Padding OBUs. +@item hdr_cll +@item hdr_mdcv +Manipulate content light level (see AV1 section 6.7.3) and mastering +display colour volume (see AV1 section 6.7.4) metadata 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 chomp diff --git a/libavcodec/av1_metadata_bsf.c b/libavcodec/av1_metadata_bsf.c index 31fd4f0f41..8ac6e32b59 100644 --- a/libavcodec/av1_metadata_bsf.c +++ b/libavcodec/av1_metadata_bsf.c @@ -23,6 +23,7 @@ #include "cbs.h" #include "cbs_bsf.h" #include "cbs_av1.h" +#include "cbs_metadata.h" typedef struct AV1MetadataContext { CBSBSFContext common; @@ -40,6 +41,9 @@ typedef struct AV1MetadataContext { int num_ticks_per_picture; int delete_padding; + + int hdr_cll; + int hdr_mdcv; } AV1MetadataContext; @@ -143,6 +147,20 @@ static int av1_metadata_update_fragment(AVBSFContext *bsf, AVPacket *pkt, } } + if (pkt) { + err = ff_cbs_bsf_apply_metadata(bsf, pkt, frag, + CBS_METADATA_CONTENT_LIGHT_LEVEL, + ctx->hdr_mdcv); + if (err < 0) + return err; + + err = ff_cbs_bsf_apply_metadata(bsf, pkt, frag, + CBS_METADATA_MASTERING_DISPLAY, + ctx->hdr_mdcv); + if (err < 0) + return err; + } + return 0; } @@ -203,6 +221,14 @@ static const AVOption av1_metadata_options[] = { OFFSET(delete_padding), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS}, + BSF_ELEMENT_OPTIONS_PIRE("hdr_cll", + "HDR content light level metadata", + hdr_cll, "cll"), + + BSF_ELEMENT_OPTIONS_PIRE("hdr_mdcv", + "HDR mastering display colour volume metadata", + hdr_mdcv, "mdcv"), + { NULL } };