From patchwork Thu Mar 30 14:31:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Lhomme X-Patchwork-Id: 3194 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.44.195 with SMTP id s186csp1588586vss; Thu, 30 Mar 2017 07:39:25 -0700 (PDT) X-Received: by 10.223.166.97 with SMTP id k88mr57857wrc.33.1490884765459; Thu, 30 Mar 2017 07:39:25 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 199si4231553wmb.92.2017.03.30.07.39.25; Thu, 30 Mar 2017 07:39:25 -0700 (PDT) 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=@gmail.com; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EBE43689A2F; Thu, 30 Mar 2017 17:39:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 502CA6898F0 for ; Thu, 30 Mar 2017 17:39:17 +0300 (EEST) Received: by mail-wr0-f193.google.com with SMTP id k6so11485689wre.3 for ; Thu, 30 Mar 2017 07:39:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=dGP+hWg7A2JrffdGdTEUkoVvyvIkeC/hkvK87iZFhRk=; b=JgOPcJIKF0gBIIDSPPMAQWL8YCJrhLg1NZP5q/EQ//7Aq3Z8aNBRsMHjFGDjgInG+I rAawqQ98mvVUtbxdAcgBXVvzHYUaYZTeppyA+5fQ6H9qWAvZqdH7k5Dgkwa62/WNl++o l4KZnZzBWh9ufnl4zAUDAxnXS1zEbmXUGF+21+m/kJxHwprpBtp5ENGx7TOgMWtldxoC WcPyWbjGYb7T5Fq5G+HhnRE8PknLmSPJoFJW3H5MaViFl8rzQv52kfBJ8oSy8oomKjum uy7cXI771ovmvTfLGaJLLV69KOMv5UDMFZW1fbynlQZdujI1G+xoHjAemi/cp6H0YLzc dV5Q== 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; bh=dGP+hWg7A2JrffdGdTEUkoVvyvIkeC/hkvK87iZFhRk=; b=YK1x/yVNZEMF1NI4g6QB7d3HB3ywixv0HQdtIOXlQBfkfjxk4pWIewe26hSkxd7TAR kp+imL7kGX4K5P5P8IfvDkdHu2B0iu5smuASCS8PJ+FkX1CSNkktCVZMwO0/9YVk83Cb AMIehpiboZDhE56D/QqXrJIj4ad8oG/48Ph9MJml0ScYnPhUCK2uKCIYeReBT/MTG+c5 lEE2QqNoPZ0HjS7Ww88RURf0rMVkf3cCjm3p1BI63F8PWcjWUlZ3JWhzmDR+ltVJiKJO H+FjQo7lNFksRAZRCdhdCBQjTl6QG2uFO79kUk67nZaTdc15v6fb8UGfTm9CvjgUGVgs ZU/g== X-Gm-Message-State: AFeK/H0Oy01Df9Eo6lbfr6DJZOuexibn81hpNYVuHKreP6b9GoiEobP3s1og9uFq2zZC3w== X-Received: by 10.28.209.202 with SMTP id i193mr696649wmg.17.1490884326403; Thu, 30 Mar 2017 07:32:06 -0700 (PDT) Received: from localhost.localdomain (2a01cb0c000ea900c43cbe05db2bd7f2.ipv6.abo.wanadoo.fr. [2a01:cb0c:e:a900:c43c:be05:db2b:d7f2]) by smtp.gmail.com with ESMTPSA id 81sm3481967wmj.9.2017.03.30.07.32.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 30 Mar 2017 07:32:05 -0700 (PDT) From: Steve Lhomme To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Mar 2017 16:31:47 +0200 Message-Id: <20170330143149.3792-1-robux4@gmail.com> X-Mailer: git-send-email 2.11.1 Subject: [FFmpeg-devel] [PATCH 1/3] lavu: add support for Content Light Level side 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" As found in HEVC. I put the code in mastering_display_metadata as they usually go together in Blu-Ray UHD sources. --- libavutil/frame.c | 1 + libavutil/frame.h | 6 ++++++ libavutil/mastering_display_metadata.c | 18 ++++++++++++++++ libavutil/mastering_display_metadata.h | 39 ++++++++++++++++++++++++++++++++++ libavutil/version.h | 2 +- 5 files changed, 65 insertions(+), 1 deletion(-) diff --git a/libavutil/frame.c b/libavutil/frame.c index 8811dcdcfe..dd12c5549c 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -772,6 +772,7 @@ const char *av_frame_side_data_name(enum AVFrameSideDataType type) case AV_FRAME_DATA_SKIP_SAMPLES: return "Skip samples"; case AV_FRAME_DATA_AUDIO_SERVICE_TYPE: return "Audio service type"; case AV_FRAME_DATA_MASTERING_DISPLAY_METADATA: return "Mastering display metadata"; + case AV_FRAME_DATA_CONTENT_LIGHT_LEVEL: return "Content light level metadata"; case AV_FRAME_DATA_GOP_TIMECODE: return "GOP timecode"; } return NULL; diff --git a/libavutil/frame.h b/libavutil/frame.h index 7cb78a1a44..45e21a11d4 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -127,6 +127,12 @@ enum AVFrameSideDataType { * libavutil/spherical.h. */ AV_FRAME_DATA_SPHERICAL, + + /** + * Content light level (based on CEA 861.3). This payload containts data in + * the form of the AVContentLightMetadata struct. + */ + AV_FRAME_DATA_CONTENT_LIGHT_LEVEL, }; enum AVActiveFormatDescription { diff --git a/libavutil/mastering_display_metadata.c b/libavutil/mastering_display_metadata.c index e1683e55c7..c41c90db12 100644 --- a/libavutil/mastering_display_metadata.c +++ b/libavutil/mastering_display_metadata.c @@ -41,3 +41,21 @@ AVMasteringDisplayMetadata *av_mastering_display_metadata_create_side_data(AVFra return (AVMasteringDisplayMetadata *)side_data->data; } + +AVContentLightMetadata *av_content_light_metadata_alloc(void) +{ + return av_mallocz(sizeof(AVContentLightMetadata)); +} + +AVContentLightMetadata *av_content_light_metadata_create_side_data(AVFrame *frame) +{ + AVFrameSideData *side_data = av_frame_new_side_data(frame, + AV_FRAME_DATA_CONTENT_LIGHT_LEVEL, + sizeof(AVContentLightMetadata)); + if (!side_data) + return NULL; + + memset(side_data->data, 0, sizeof(AVContentLightMetadata)); + + return (AVContentLightMetadata *)side_data->data; +} diff --git a/libavutil/mastering_display_metadata.h b/libavutil/mastering_display_metadata.h index 936533fec4..5ad7f5bd42 100644 --- a/libavutil/mastering_display_metadata.h +++ b/libavutil/mastering_display_metadata.h @@ -86,4 +86,43 @@ AVMasteringDisplayMetadata *av_mastering_display_metadata_alloc(void); */ AVMasteringDisplayMetadata *av_mastering_display_metadata_create_side_data(AVFrame *frame); +/** + * Content light level needed by to transmit HDR over HDMI (CEA 861.3). + * + * To be used as payload of a AVFrameSideData or AVPacketSideData with the + * appropriate type. + * + * @note The struct should be allocated with av_content_light_metadata_alloc() + * and its size is not a part of the public ABI. + */ +typedef struct AVContentLightMetadata { + /** + * Max content light level (cd/m^2). + */ + AVRational max_content_light_level; + + /** + * Max avereage light level per picture (cd/m^2). + */ + AVRational max_pic_avg_light_level; +} AVContentLightMetadata; + +/** + * Allocate an AVContentLightMetadata structure and set its fields to + * default values. The resulting struct can be freed using av_freep(). + * + * @return An AVContentLightMetadata filled with default values or NULL + * on failure. + */ +AVContentLightMetadata *av_content_light_metadata_alloc(void); + +/** + * Allocate a complete AVContentLightMetadata and add it to the frame. + * + * @param frame The frame which side data is added to. + * + * @return The AVContentLightMetadata structure to be filled by caller. + */ +AVContentLightMetadata *av_content_light_metadata_create_side_data(AVFrame *frame); + #endif /* AVUTIL_MASTERING_DISPLAY_METADATA_H */ diff --git a/libavutil/version.h b/libavutil/version.h index a14c0e7eb2..fedc6fa177 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 55 -#define LIBAVUTIL_VERSION_MINOR 53 +#define LIBAVUTIL_VERSION_MINOR 54 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \