From patchwork Sun Apr 2 08:08:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Lhomme X-Patchwork-Id: 3239 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.44.195 with SMTP id s186csp2726250vss; Sun, 2 Apr 2017 01:08:48 -0700 (PDT) X-Received: by 10.28.125.14 with SMTP id y14mr4925478wmc.101.1491120528121; Sun, 02 Apr 2017 01:08:48 -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 u199si10480917wmu.140.2017.04.02.01.08.47; Sun, 02 Apr 2017 01:08:48 -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 F0351688338; Sun, 2 Apr 2017 11:08:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f170.google.com (mail-wr0-f170.google.com [209.85.128.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0BC48688269 for ; Sun, 2 Apr 2017 11:08:36 +0300 (EEST) Received: by mail-wr0-f170.google.com with SMTP id w43so129816284wrb.0 for ; Sun, 02 Apr 2017 01:08:38 -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=JmuyQyOuE3W3qXD1NtVlAYT6yEnxiUv4Dhs/qfidBWw=; b=gKzNd1s17QIXxB//31O/T+9UIa8sUsr9UFoxQw+y0InhHCIgPLfk+rJWv7HrM8SGdY EUSgvtNQ0jqNZHhV2rKU+LIYtpD4Nh3OYbAJo28S7xSWCNhzifLuxTHMZVwmtYV12QHl 0jGRyUstor1yaj2A9ngPmCB90gdvfA6QdQFTmM7gxRHTtF2vg4nFk4knkwgbm8mCMd7m ftNGF/VrGXo8OAoRUxX54hGITxz14w3A2N9+zY+Sc6ab6Wgh3K3nCri9CvTwhBDmdsfW SVPnUOp3eXStI5ralI8yT3a8Z+Au21U517fbGaPRqFkOioE66A/NXkrO5dXE9ROVrFAa tJNA== 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=JmuyQyOuE3W3qXD1NtVlAYT6yEnxiUv4Dhs/qfidBWw=; b=TBvyE5xvW6zWGKdn2Vbe4/n/EDcm7s0rSqgsWZ87ViKxSTt0KOBBzXsGtCZl8hLp6N GWyM5Z1aShqJaspkw925cdfKqj8Z0VZ4qeMUQW1LTsODy3JySfP+kxZyMHtoGSdsXu1s EB5Bw8em2lgOYjkgDzI4LiFtgLbVrTzhWTdC8pwp1aB/VXYUOrCzHfhqEGPYG5aVmdL5 86KX2y+kxn2ujsU8eAPkGC1a8KN/ep1Q6ugY4yjBMbHUHDegOP469wX0HqUi519Hjg82 /ScjixIdYrPqhp6OHweRG+xt8ofZh4j7h58K0NgrVS2YRrBJqh7K4TqY02/aIonEQOvM XHPw== X-Gm-Message-State: AFeK/H1+6nElPTS0rPdrYsXGqNc33Wc0AQel7oX7yANN+3M8sCRRNoiN/rCs7n/CpfPwkw== X-Received: by 10.223.153.108 with SMTP id x99mr9955952wrb.55.1491120517194; Sun, 02 Apr 2017 01:08:37 -0700 (PDT) Received: from localhost.localdomain (2a01cb0c000ea900b139156697821910.ipv6.abo.wanadoo.fr. [2a01:cb0c:e:a900:b139:1566:9782:1910]) by smtp.gmail.com with ESMTPSA id u63sm9383015wmu.22.2017.04.02.01.08.36 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 02 Apr 2017 01:08:36 -0700 (PDT) From: Steve Lhomme To: ffmpeg-devel@ffmpeg.org Date: Sun, 2 Apr 2017 10:08:23 +0200 Message-Id: <20170402080825.2168-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. --- update the previous patch: - rename CEA 861.3 to CTA-861.3 - use MaxCLL and MaxFALL names that are more commonly found - use unsigned integer rather than rational numbers as (supposedly) in the specs - provide the structure size on output of av_content_light_metadata_alloc() update the previous patch: - rebased and updated version bump --- libavutil/frame.c | 1 + libavutil/frame.h | 6 ++++++ libavutil/mastering_display_metadata.c | 23 ++++++++++++++++++++ libavutil/mastering_display_metadata.h | 39 ++++++++++++++++++++++++++++++++++ libavutil/version.h | 2 +- 5 files changed, 70 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..1ecb6a087a 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 CTA-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..6069347617 100644 --- a/libavutil/mastering_display_metadata.c +++ b/libavutil/mastering_display_metadata.c @@ -41,3 +41,26 @@ AVMasteringDisplayMetadata *av_mastering_display_metadata_create_side_data(AVFra return (AVMasteringDisplayMetadata *)side_data->data; } + +AVContentLightMetadata *av_content_light_metadata_alloc(size_t *size) +{ + AVContentLightMetadata *metadata = av_mallocz(sizeof(AVContentLightMetadata)); + + if (size) + *size = sizeof(*metadata); + + return metadata; +} + +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..847b0b62c6 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 (CTA-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). + */ + unsigned MaxCLL; + + /** + * Max average light level per frame (cd/m^2). + */ + unsigned MaxFALL; +} 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(size_t *size); + +/** + * 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 d89a4187e8..abea2163be 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 55 -#define LIBAVUTIL_VERSION_MINOR 57 +#define LIBAVUTIL_VERSION_MINOR 58 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \