From patchwork Sun Feb 21 19:51:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 25871 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 A5250449DB5 for ; Sun, 21 Feb 2021 21:53:47 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8CA9068A8F5; Sun, 21 Feb 2021 21:53:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 127DA68A626 for ; Sun, 21 Feb 2021 21:53:40 +0200 (EET) Received: by mail-wr1-f46.google.com with SMTP id v1so16894775wrd.6 for ; Sun, 21 Feb 2021 11:53:40 -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=+lWwVoLtWITqmPTARsZA/Cm2R5QuqTD61g/LAacmBms=; b=D/9lrjhRL6qLu01fX/B22UO84hghg6W6cOkcatuWHcJkfvBpS7mjXnsJoBkVMBouBw cy+9dBYN5ui904A92asUWY1UOz9SKsQ6jcitR9xg9KmGv/oRt8ZI6l7hONE5M4uTISMi qtPidoyRaTjDh0Psvl9iJ1Lz/UpBg3C4E40gl7EYmp3m5fDAZuO1apa/g6xdLUiw05f8 +M+nZrhoB883zEqDApA/ry5XRHGUmvQ7GUxOFwHp062cpOu1xB30tnopemNxnY3pebG4 r1Xiuafp4ZKM+5OoIzEqDA+C5ijeo/oYwZOeex6GBtZrmJ6+sGatgFRcDN5Z1mRI6q6f 9BwA== 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=+lWwVoLtWITqmPTARsZA/Cm2R5QuqTD61g/LAacmBms=; b=SMNXuehUpoXSBRyFK6ucGpdL3K5aPhWyRz9CNJVGPMH5KsbxoN7nZN+ory5k0EaZH3 0JkbHesJnIzYHIzVQO2vdZrTpVZug8ur39m4AibVR6Zfw5pH5niELV68mYpTKrp1GqUU UWiJeNoZlkAy7YJHfP50mjcgmxEXLVK2A1S2jA+Lb6eAqUYJMs+jP/6IqArb5cXlK1eO LaGxEwBaCLEyZEFff4Y6NdIXNcmgZOMIzlqRAzHm5cyQbNxba5zv4vryM30mcnHy952U DNIS6R5e2XryvPfHedGji8/1RErvx3RLh6Gr9sUVwyc4BBU3T6OV5a777cczKISTXOTk r61A== X-Gm-Message-State: AOAM531xRib1xenC7sJcSquvcJZaAyJqnFKIDC/nUrTuPVFtn3WpQLsy 4tUCj4/awLTepvUQ62rBp9ti9Jtk8AmWBg== X-Google-Smtp-Source: ABdhPJxFEWmxbDCz3Yh5kKHsgXTbUqbS5YZEK7nUzmtXD7N2U4jpV4GImYf9FgLCshgS3WdDJWzkRg== X-Received: by 2002:adf:ee0e:: with SMTP id y14mr5133904wrn.380.1613937219680; 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.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 11:53:39 -0800 (PST) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 21 Feb 2021 19:51:21 +0000 Message-Id: <20210221195125.1901683-14-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 14/18] 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 e739832665..6a4c0cfe5e 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 8cafe461d1..77062e0400 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, FLAGS), + + BSF_ELEMENT_OPTIONS_PIRE("hdr_mdcv", + "HDR mastering display colour volume metadata", + hdr_mdcv, FLAGS), + { NULL } };