From patchwork Mon Mar 4 13:06:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 46758 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a919:b0:19e:cdac:8cce with SMTP id cd25csp2789485pzb; Mon, 4 Mar 2024 05:09:01 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWl2BFviPpIzMn+lhRBzX93dECOFkTuV2RfIxx7zW7XiknsDjS1IJvkO9Co31gh5CZa6jcfTS4NjXTiyhGZ/mQfsdJmc3H2PLWpWA== X-Google-Smtp-Source: AGHT+IGOjGIwqKh7RS6rp0J7Hm69FCCZ+HL5IFSuHJSr4ex9qcauB1r8hZRGfSIhOhgv6LCuUmG9 X-Received: by 2002:a17:906:11ce:b0:a44:1fcf:9b9c with SMTP id o14-20020a17090611ce00b00a441fcf9b9cmr5935757eja.51.1709557741499; Mon, 04 Mar 2024 05:09:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709557741; cv=none; d=google.com; s=arc-20160816; b=XWrazom9CV5d9+M/4jGHxTVTEpYW0bMfCowGRHC8ko617e6qCE5HWM6IZ3sFtIYK82 xSbmFCGQoFuDL05i7796Ng4MRVAtTC+bGT8Dkmg1TchCszWe8Fb3qVuP8mPNALz/t+xc eB4Q9zoJtqd+mB/DCbnMreYdERr4Yc1W9Y8NJrqAqhcmC2rt+jPIEZUk+Q5C84y+0LWa nrdXuBaR3OoRGpQB26/a2vCHbzD/U6jPYU1XhvZreaBVYWEaQxWnoLg1i57BY9bAbAVs ti/tZRxlNpWWwtLoyhQabpIwPuI5Ggj7ykIys0jlryCejtk4Nsfp4MwcHHOyhRIHh5K2 Bvbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=QYI7mrupt7gFhMVBzz8gwlPqQaQHCd2f5zo2fYiXj14=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=m+UfL1c20M3myo+tdEhRe1q60mkbFp2sIFcfymDSg450lh3/a10YN99jOKVLm3qBld a+pt2nCdA9Dhuo5hCTQRTMS2DY1DGRiRTDlZ4Aw5ZFtNKky/DYQa8BXob0/ZxIJ7abKt 5XHYkj627mp3OO0KNDccET7LC0JATcYCd5zBYTn1SosvTp7e590Yj47URs5ddeNOIuCv B52E0nUoH8NrPMZfrVMkcjFr5bS1/k9NL42Wxyx0YE2vGefa7ZxHr9k/eMESk/Usg7DS s8tLwIvMTpKVUTOX508/w2HODIT3CdyyDhAUC0IJEW6gTdHvMl+GSLc0V30KZ14IQQZP yAUg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=Jq8oCw6H; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id pj17-20020a170906d79100b00a443cb3efb3si3982205ejb.795.2024.03.04.05.09.01; Mon, 04 Mar 2024 05:09:01 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=Jq8oCw6H; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0811A68D450; Mon, 4 Mar 2024 15:07:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 686FC68D439 for ; Mon, 4 Mar 2024 15:07:14 +0200 (EET) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=Jq8oCw6H; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 77F064D52 for ; Mon, 4 Mar 2024 14:07:09 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id TIGa9beIqEYm for ; Mon, 4 Mar 2024 14:07:09 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1709557626; bh=Cm29a1RiIiiniy8cMsuxqld0ojoTAILEKPXsxe9rWxY=; h=From:To:Subject:Date:In-Reply-To:References:From; b=Jq8oCw6H9mNPlEJEOQin9FN/aZ6Mr4JP//bbVTiIV1m7e4utpieDcY/Amb/B5dnFD uG9lBQsnXu3xyYWgviDeAgHM5v3wRMQ7+VsjLuu709JQf8y48hUPB0YsC4iTQAN8D4 HMkAEIxRSVzHM9Ad3OPGHS6kB9zMA2ELFI5cqLAFOreIlDeCPLRNbu476P4LfdwxIV R8Yx+EzXO48Q2KvRoDlRcDtQF/RyXY50rH1UlwxqO9pUO0G3s8mhO1k1h8YgGtGWKY ndX3BpCBW7Kiam2W9UYJf2VnJq6rFFOVrVoIDqGSzygcs9S6PjDtVijPO2dg+6I/0y +suslv9HOgZ+A== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id 7635E4D58 for ; Mon, 4 Mar 2024 14:07:06 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 45C7E3A0F49 for ; Mon, 4 Mar 2024 14:07:00 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Mar 2024 14:06:24 +0100 Message-ID: <20240304130657.30631-9-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240304130657.30631-1-anton@khirnov.net> References: <20240304130657.30631-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 09/29] lavc: add content light/mastering display side data wrappers X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: FNK5I/3zSV50 --- libavcodec/decode.c | 25 +++++++++++++++++++++++++ libavcodec/decode.h | 21 +++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index f3e8b72be7..105c9c5c39 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -35,6 +35,7 @@ #include "libavutil/hwcontext.h" #include "libavutil/imgutils.h" #include "libavutil/internal.h" +#include "libavutil/mastering_display_metadata.h" #include "avcodec.h" #include "avcodec_internal.h" @@ -1923,6 +1924,30 @@ finish: return ret; } +int ff_decode_mastering_display_new(const AVCodecContext *avctx, AVFrame *frame, + AVMasteringDisplayMetadata **mdm) +{ + if (side_data_pref(avctx, frame, AV_FRAME_DATA_MASTERING_DISPLAY_METADATA)) { + *mdm = NULL; + return 0; + } + + *mdm = av_mastering_display_metadata_create_side_data(frame); + return *mdm ? 0 : AVERROR(ENOMEM); +} + +int ff_decode_content_light_new(const AVCodecContext *avctx, AVFrame *frame, + AVContentLightMetadata **clm) +{ + if (side_data_pref(avctx, frame, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL)) { + *clm = NULL; + return 0; + } + + *clm = av_content_light_metadata_create_side_data(frame); + return *clm ? 0 : AVERROR(ENOMEM); +} + int ff_copy_palette(void *dst, const AVPacket *src, void *logctx) { size_t size; diff --git a/libavcodec/decode.h b/libavcodec/decode.h index b269b5a43b..4ffbd9db8e 100644 --- a/libavcodec/decode.h +++ b/libavcodec/decode.h @@ -175,4 +175,25 @@ int ff_frame_new_side_data_from_buf(const AVCodecContext *avctx, AVFrame *frame, enum AVFrameSideDataType type, AVBufferRef **buf, AVFrameSideData **sd); +struct AVMasteringDisplayMetadata; +struct AVContentLightMetadata; + +/** + * Wrapper around av_mastering_display_metadata_create_side_data(), which + * rejects side data overridden by the demuxer. Returns 0 on success, and a + * negative error code otherwise. If successful, *mdm may either be a pointer to + * the new side data, or NULL in case the side data was already present. + */ +int ff_decode_mastering_display_new(const AVCodecContext *avctx, AVFrame *frame, + struct AVMasteringDisplayMetadata **mdm); + +/** + * Wrapper around av_content_light_metadata_create_side_data(), which + * rejects side data overridden by the demuxer. Returns 0 on success, and a + * negative error code otherwise. If successful, *clm may either be a pointer to + * the new side data, or NULL in case the side data was already present. + */ +int ff_decode_content_light_new(const AVCodecContext *avctx, AVFrame *frame, + struct AVContentLightMetadata **clm); + #endif /* AVCODEC_DECODE_H */