From patchwork Wed Feb 5 18:46:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mohammad Izadi X-Patchwork-Id: 17695 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 EC3B04485ED for ; Wed, 5 Feb 2020 20:52:28 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C07DD68A516; Wed, 5 Feb 2020 20:52:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f66.google.com (mail-pj1-f66.google.com [209.85.216.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 98B6368A41E for ; Wed, 5 Feb 2020 20:52:21 +0200 (EET) Received: by mail-pj1-f66.google.com with SMTP id r67so1365701pjb.0 for ; Wed, 05 Feb 2020 10:52:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=f3Kf+w8LfAONJ7rAYSZwnwLrPpcFLsGYavA2IjMZAN0=; b=p6bYxC5PBk0Vy4BoeWJIhhDH85x3p6dIa21KBYiFSAvSGMcUF/nbrHxkfWk2FRoz+d qc7CF4WXVoiV0HVQIdx6+ltww6j/z12K79sILGN5uxpfn4J4RAugvJDIgXHtoP2aDYyc B5XndChf89Jf5LzpCT78qR1qoBy6/6JeE9aFL/eR6doS4bQWQKCZAnbtgQ0HS6QB4eit 408zeviu5WNrmGeq0Gl92k9pZMxrVAT2E3MwrM5Hj1PYbkB6mkDPTsiZEzK51jyjNzD+ Imdj2dmxYJ4chqskkCPFTgkl2OsXvy5J+B40nyB3FTHbtJrt8tvbxivyqlr0dQcm02NR zIfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=f3Kf+w8LfAONJ7rAYSZwnwLrPpcFLsGYavA2IjMZAN0=; b=U0xiTkmE15DswLrm4gJdtqTjZbLE7CCTM6ImoqskxVgFS2YIZFm8hlwQxCEfZzJWhC R3oG+vqWXC5dRE1QPVqJEmkPFnZ8IyyQ3bW/bOwClWTpQnrYlrv6+riS2EfErzJwkvFZ Ya9fKScdBIoDaWnGiBl3jcrILf3sh3SyuSswPXh4psTSHi6j4dmWf7G68+BxYhCkUXrt DAusiaSZh+FvzN0Fifvfw8wYZDSTWj1rnQ6bJx7DDIM7w9JoiaBJbZ6vU9z5tO2gZDY9 Mx2yUIYjKZXbc4r4fAYOkx3EERPqBwizT7/IBlX1qqkaZB+vSdzB9W2OwSbKGaDfziaF DZuA== X-Gm-Message-State: APjAAAW53xEIUIWuDtuy6mqjxB6Dmb1mXMurESu5qesvcD+RyqpxBT+n pMSjekYPfcl23NB076yp8vz9pJI= X-Google-Smtp-Source: APXvYqzBEKugb0OzcqbtXlriKzKoflPLwvqyZokgzjxfYa1FngwEqfmzhyDHDk1i2xlQBIbmW9WBRQ== X-Received: by 2002:a17:902:7449:: with SMTP id e9mr35274045plt.139.1580928385960; Wed, 05 Feb 2020 10:46:25 -0800 (PST) Received: from izadi.mtv.corp.google.com ([2620:0:1000:4001:366c:3b00:ff02:a7ea]) by smtp.gmail.com with ESMTPSA id f81sm211763pfa.118.2020.02.05.10.46.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Feb 2020 10:46:25 -0800 (PST) From: Mohammad Izadi To: ffmpeg-devel@ffmpeg.org Date: Wed, 5 Feb 2020 10:46:16 -0800 Message-Id: <20200205184616.18661-1-moh.izadi@gmail.com> X-Mailer: git-send-email 2.25.0.341.g760bfbb309-goog In-Reply-To: <20200205134826.GA8817@sunshine.barsnick.net> References: <20200205134826.GA8817@sunshine.barsnick.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] Update HDR10+ metadata structure. 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 Cc: Mohammad Izadi Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Mohammad Izadi Trying to read HDR10+ metadata from HEVC/SEI and pass it to packet side data in the follow-up CLs. --- libavutil/hdr_dynamic_metadata.c | 165 +++++++++++++++++++++++++++++++ libavutil/hdr_dynamic_metadata.h | 12 ++- libavutil/version.h | 2 +- 3 files changed, 177 insertions(+), 2 deletions(-) diff --git a/libavutil/hdr_dynamic_metadata.c b/libavutil/hdr_dynamic_metadata.c index 0fa1ee82de..a988bcd2d5 100644 --- a/libavutil/hdr_dynamic_metadata.c +++ b/libavutil/hdr_dynamic_metadata.c @@ -19,8 +19,17 @@ */ #include "hdr_dynamic_metadata.h" +#include "libavcodec/get_bits.h" #include "mem.h" +static const int64_t luminance_den = 1; +static const int32_t peak_luminance_den = 15; +static const int64_t rgb_den = 100000; +static const int32_t fraction_pixel_den = 1000; +static const int32_t knee_point_den = 4095; +static const int32_t bezier_anchor_den = 1023; +static const int32_t saturation_weight_den = 8; + AVDynamicHDRPlus *av_dynamic_hdr_plus_alloc(size_t *size) { AVDynamicHDRPlus *hdr_plus = av_mallocz(sizeof(AVDynamicHDRPlus)); @@ -45,3 +54,159 @@ AVDynamicHDRPlus *av_dynamic_hdr_plus_create_side_data(AVFrame *frame) return (AVDynamicHDRPlus *)side_data->data; } + +int av_dynamic_hdr_plus_decode(const uint8_t *data, size_t size, + AVDynamicHDRPlus *s) +{ + int w, i, j; + GetBitContext gb; + if (!data) + return AVERROR_INVALIDDATA; + + int ret = init_get_bits8(&gb, data, size); + if (ret < 0) + return AVERROR_INVALIDDATA; + + if (get_bits_left(&gb) < 2) + return AVERROR_INVALIDDATA; + s->num_windows = get_bits(&gb, 2); + + if (s->num_windows < 1 || s->num_windows > 3) + return AVERROR_INVALIDDATA; + + if (get_bits_left(&gb) < ((19 * 8 + 1) * (s->num_windows - 1))) + return AVERROR_INVALIDDATA; + for (w = 1; w < s->num_windows; w++) { + s->params[w].window_upper_left_corner_x.num = get_bits(&gb, 16); + s->params[w].window_upper_left_corner_y.num = get_bits(&gb, 16); + s->params[w].window_lower_right_corner_x.num = get_bits(&gb, 16); + s->params[w].window_lower_right_corner_y.num = get_bits(&gb, 16); + // The corners are set to absolute coordinates here. They should be + // converted to the relative coordinates (in [0, 1]) in the decoder. + s->params[w].window_upper_left_corner_x.den = 1; + s->params[w].window_upper_left_corner_y.den = 1; + s->params[w].window_lower_right_corner_x.den = 1; + s->params[w].window_lower_right_corner_y.den = 1; + + s->params[w].center_of_ellipse_x = get_bits(&gb, 16); + s->params[w].center_of_ellipse_y = get_bits(&gb, 16); + s->params[w].rotation_angle = get_bits(&gb, 8); + s->params[w].semimajor_axis_internal_ellipse = get_bits(&gb, 16); + s->params[w].semimajor_axis_external_ellipse = get_bits(&gb, 16); + s->params[w].semiminor_axis_external_ellipse = get_bits(&gb, 16); + s->params[w].overlap_process_option = get_bits1(&gb); + } + + if (get_bits_left(&gb) < 28) + return AVERROR(EINVAL); + s->targeted_system_display_maximum_luminance.num = get_bits(&gb, 27); + s->targeted_system_display_maximum_luminance.den = luminance_den; + s->targeted_system_display_actual_peak_luminance_flag = get_bits1(&gb); + + if (s->targeted_system_display_actual_peak_luminance_flag) { + int rows, cols; + if (get_bits_left(&gb) < 10) + return AVERROR(EINVAL); + rows = get_bits(&gb, 5); + cols = get_bits(&gb, 5); + if (((rows < 2) || (rows > 25)) || ((cols < 2) || (cols > 25))) + return AVERROR_INVALIDDATA; + + s->num_rows_targeted_system_display_actual_peak_luminance = rows; + s->num_cols_targeted_system_display_actual_peak_luminance = cols; + + if (get_bits_left(&gb) < (rows * cols * 4)) + return AVERROR(EINVAL); + + for (i = 0; i < rows; i++) { + for (j = 0; j < cols; j++) { + s->targeted_system_display_actual_peak_luminance[i][j].num = get_bits(&gb, 4); + s->targeted_system_display_actual_peak_luminance[i][j].den = peak_luminance_den; + } + } + } + for (w = 0; w < s->num_windows; w++) { + if (get_bits_left(&gb) < (3 * 17 + 17 + 4)) + return AVERROR(EINVAL); + for (i = 0; i < 3; i++) { + s->params[w].maxscl[i].num = get_bits(&gb, 17); + s->params[w].maxscl[i].den = rgb_den; + } + s->params[w].average_maxrgb.num = get_bits(&gb, 17); + s->params[w].average_maxrgb.den = rgb_den; + s->params[w].num_distribution_maxrgb_percentiles = get_bits(&gb, 4); + + if (get_bits_left(&gb) < + (s->params[w].num_distribution_maxrgb_percentiles * 24)) + return AVERROR(EINVAL); + for (i = 0; i < s->params[w].num_distribution_maxrgb_percentiles; i++) { + s->params[w].distribution_maxrgb[i].percentage = get_bits(&gb, 7); + s->params[w].distribution_maxrgb[i].percentile.num = get_bits(&gb, 17); + s->params[w].distribution_maxrgb[i].percentile.den = rgb_den; + } + + if (get_bits_left(&gb) < 10) + return AVERROR(EINVAL); + s->params[w].fraction_bright_pixels.num = get_bits(&gb, 10); + s->params[w].fraction_bright_pixels.den = fraction_pixel_den; + } + if (get_bits_left(&gb) < 1) + return AVERROR(EINVAL); + s->mastering_display_actual_peak_luminance_flag = get_bits1(&gb); + if (s->mastering_display_actual_peak_luminance_flag) { + int rows, cols; + if (get_bits_left(&gb) < 10) + return AVERROR(EINVAL); + rows = get_bits(&gb, 5); + cols = get_bits(&gb, 5); + if (((rows < 2) || (rows > 25)) || ((cols < 2) || (cols > 25))) + return AVERROR_INVALIDDATA; + + s->num_rows_mastering_display_actual_peak_luminance = rows; + s->num_cols_mastering_display_actual_peak_luminance = cols; + + if (get_bits_left(&gb) < (rows * cols * 4)) + return AVERROR(EINVAL); + + for (i = 0; i < rows; i++) { + for (j = 0; j < cols; j++) { + s->mastering_display_actual_peak_luminance[i][j].num = get_bits(&gb, 4); + s->mastering_display_actual_peak_luminance[i][j].den = peak_luminance_den; + } + } + } + + for (w = 0; w < s->num_windows; w++) { + if (get_bits_left(&gb) < 1) + return AVERROR(EINVAL); + s->params[w].tone_mapping_flag = get_bits1(&gb); + if (s->params[w].tone_mapping_flag) { + if (get_bits_left(&gb) < 28) + return AVERROR(EINVAL); + s->params[w].knee_point_x.num = get_bits(&gb, 12); + s->params[w].knee_point_x.den = knee_point_den; + s->params[w].knee_point_y.num = get_bits(&gb, 12); + s->params[w].knee_point_y.den = knee_point_den; + s->params[w].num_bezier_curve_anchors = get_bits(&gb, 4); + + if (get_bits_left(&gb) < (s->params[w].num_bezier_curve_anchors * 10)) + return AVERROR(EINVAL); + for (i = 0; i < s->params[w].num_bezier_curve_anchors; i++) { + s->params[w].bezier_curve_anchors[i].num = get_bits(&gb, 10); + s->params[w].bezier_curve_anchors[i].den = bezier_anchor_den; + } + } + + if (get_bits_left(&gb) < 1) + return AVERROR(EINVAL); + s->params[w].color_saturation_mapping_flag = get_bits1(&gb); + if (s->params[w].color_saturation_mapping_flag) { + if (get_bits_left(&gb) < 6) + return AVERROR(EINVAL); + s->params[w].color_saturation_weight.num = get_bits(&gb, 6); + s->params[w].color_saturation_weight.den = saturation_weight_den; + } + } + + return 0; +} diff --git a/libavutil/hdr_dynamic_metadata.h b/libavutil/hdr_dynamic_metadata.h index 2d72de56ae..28c657481f 100644 --- a/libavutil/hdr_dynamic_metadata.h +++ b/libavutil/hdr_dynamic_metadata.h @@ -265,7 +265,7 @@ typedef struct AVDynamicHDRPlus { /** * The nominal maximum display luminance of the targeted system display, - * in units of 0.0001 candelas per square metre. The value shall be in + * in units of 1 candelas per square metre. The value shall be in * the range of 0 to 10000, inclusive. */ AVRational targeted_system_display_maximum_luminance; @@ -340,4 +340,14 @@ AVDynamicHDRPlus *av_dynamic_hdr_plus_alloc(size_t *size); */ AVDynamicHDRPlus *av_dynamic_hdr_plus_create_side_data(AVFrame *frame); +/** + * Decode SMPTE ST 2094-40 (the user data registered ITU-T T.35) to AVDynamicHDRPlus. + * @param data The user data registered ITU-T T.35 (SMPTE ST 2094-40). + * @param size The size of the user data registered ITU-T T.35 (SMPTE ST 2094-40). + * @param s The decoded AVDynamicHDRPlus structure. + * + * @return 0 if succeed. Otherwise, returns the appropriate AVERROR. + */ +int av_dynamic_hdr_plus_decode(const uint8_t *data, size_t size, AVDynamicHDRPlus *s); + #endif /* AVUTIL_HDR_DYNAMIC_METADATA_H */ diff --git a/libavutil/version.h b/libavutil/version.h index af8f614aff..2bc1b98615 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 56 -#define LIBAVUTIL_VERSION_MINOR 38 +#define LIBAVUTIL_VERSION_MINOR 39 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \