mirror of https://github.com/FFmpeg/FFmpeg.git
Signed-off-by: Raphaël Zumer <rzumer@tebako.net> Signed-off-by: James Almer <jamrial@gmail.com>pull/389/head
Raphaël Zumer
2 years ago
committed by
James Almer
parent
1e406692e5
commit
6f2413a203
8 changed files with 215 additions and 245 deletions
@ -1,198 +0,0 @@ |
||||
/*
|
||||
* This file is part of FFmpeg. |
||||
* |
||||
* FFmpeg is free software; you can redistribute it and/or |
||||
* modify it under the terms of the GNU Lesser General Public |
||||
* License as published by the Free Software Foundation; either |
||||
* version 2.1 of the License, or (at your option) any later version. |
||||
* |
||||
* FFmpeg is distributed in the hope that it will be useful, |
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
||||
* Lesser General Public License for more details. |
||||
* |
||||
* You should have received a copy of the GNU Lesser General Public |
||||
* License along with FFmpeg; if not, write to the Free Software |
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
||||
*/ |
||||
|
||||
#include "dynamic_hdr10_plus.h" |
||||
#include "get_bits.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; |
||||
|
||||
int ff_parse_itu_t_t35_to_dynamic_hdr10_plus(AVDynamicHDRPlus *s, const uint8_t *data, |
||||
int size) |
||||
{ |
||||
GetBitContext gbc, *gb = &gbc; |
||||
int ret; |
||||
|
||||
if (!s) |
||||
return AVERROR(ENOMEM); |
||||
|
||||
ret = init_get_bits8(gb, data, size); |
||||
if (ret < 0) |
||||
return ret; |
||||
|
||||
if (get_bits_left(gb) < 10) |
||||
return AVERROR_INVALIDDATA; |
||||
|
||||
s->application_version = get_bits(gb, 8); |
||||
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 (int w = 1; w < s->num_windows; w++) { |
||||
// The corners are set to absolute coordinates here. They should be
|
||||
// converted to the relative coordinates (in [0, 1]) in the decoder.
|
||||
AVHDRPlusColorTransformParams *params = &s->params[w]; |
||||
params->window_upper_left_corner_x = |
||||
(AVRational){get_bits(gb, 16), 1}; |
||||
params->window_upper_left_corner_y = |
||||
(AVRational){get_bits(gb, 16), 1}; |
||||
params->window_lower_right_corner_x = |
||||
(AVRational){get_bits(gb, 16), 1}; |
||||
params->window_lower_right_corner_y = |
||||
(AVRational){get_bits(gb, 16), 1}; |
||||
|
||||
params->center_of_ellipse_x = get_bits(gb, 16); |
||||
params->center_of_ellipse_y = get_bits(gb, 16); |
||||
params->rotation_angle = get_bits(gb, 8); |
||||
params->semimajor_axis_internal_ellipse = get_bits(gb, 16); |
||||
params->semimajor_axis_external_ellipse = get_bits(gb, 16); |
||||
params->semiminor_axis_external_ellipse = get_bits(gb, 16); |
||||
params->overlap_process_option = get_bits1(gb); |
||||
} |
||||
|
||||
if (get_bits_left(gb) < 28) |
||||
return AVERROR_INVALIDDATA; |
||||
|
||||
s->targeted_system_display_maximum_luminance = |
||||
(AVRational){get_bits_long(gb, 27), 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_INVALIDDATA; |
||||
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_INVALIDDATA; |
||||
|
||||
for (int i = 0; i < rows; i++) { |
||||
for (int j = 0; j < cols; j++) { |
||||
s->targeted_system_display_actual_peak_luminance[i][j] = |
||||
(AVRational){get_bits(gb, 4), peak_luminance_den}; |
||||
} |
||||
} |
||||
} |
||||
for (int w = 0; w < s->num_windows; w++) { |
||||
AVHDRPlusColorTransformParams *params = &s->params[w]; |
||||
if (get_bits_left(gb) < (3 * 17 + 17 + 4)) |
||||
return AVERROR_INVALIDDATA; |
||||
|
||||
for (int i = 0; i < 3; i++) { |
||||
params->maxscl[i] = |
||||
(AVRational){get_bits(gb, 17), rgb_den}; |
||||
} |
||||
params->average_maxrgb = |
||||
(AVRational){get_bits(gb, 17), rgb_den}; |
||||
params->num_distribution_maxrgb_percentiles = get_bits(gb, 4); |
||||
|
||||
if (get_bits_left(gb) < |
||||
(params->num_distribution_maxrgb_percentiles * 24)) |
||||
return AVERROR_INVALIDDATA; |
||||
|
||||
for (int i = 0; i < params->num_distribution_maxrgb_percentiles; i++) { |
||||
params->distribution_maxrgb[i].percentage = get_bits(gb, 7); |
||||
params->distribution_maxrgb[i].percentile = |
||||
(AVRational){get_bits(gb, 17), rgb_den}; |
||||
} |
||||
|
||||
if (get_bits_left(gb) < 10) |
||||
return AVERROR_INVALIDDATA; |
||||
|
||||
params->fraction_bright_pixels = (AVRational){get_bits(gb, 10), fraction_pixel_den}; |
||||
} |
||||
if (get_bits_left(gb) < 1) |
||||
return AVERROR_INVALIDDATA; |
||||
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_INVALIDDATA; |
||||
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_INVALIDDATA; |
||||
|
||||
for (int i = 0; i < rows; i++) { |
||||
for (int j = 0; j < cols; j++) { |
||||
s->mastering_display_actual_peak_luminance[i][j] = |
||||
(AVRational){get_bits(gb, 4), peak_luminance_den}; |
||||
} |
||||
} |
||||
} |
||||
|
||||
for (int w = 0; w < s->num_windows; w++) { |
||||
AVHDRPlusColorTransformParams *params = &s->params[w]; |
||||
if (get_bits_left(gb) < 1) |
||||
return AVERROR_INVALIDDATA; |
||||
|
||||
params->tone_mapping_flag = get_bits1(gb); |
||||
if (params->tone_mapping_flag) { |
||||
if (get_bits_left(gb) < 28) |
||||
return AVERROR_INVALIDDATA; |
||||
|
||||
params->knee_point_x = |
||||
(AVRational){get_bits(gb, 12), knee_point_den}; |
||||
params->knee_point_y = |
||||
(AVRational){get_bits(gb, 12), knee_point_den}; |
||||
params->num_bezier_curve_anchors = get_bits(gb, 4); |
||||
|
||||
if (get_bits_left(gb) < (params->num_bezier_curve_anchors * 10)) |
||||
return AVERROR_INVALIDDATA; |
||||
|
||||
for (int i = 0; i < params->num_bezier_curve_anchors; i++) { |
||||
params->bezier_curve_anchors[i] = |
||||
(AVRational){get_bits(gb, 10), bezier_anchor_den}; |
||||
} |
||||
} |
||||
|
||||
if (get_bits_left(gb) < 1) |
||||
return AVERROR_INVALIDDATA; |
||||
params->color_saturation_mapping_flag = get_bits1(gb); |
||||
if (params->color_saturation_mapping_flag) { |
||||
if (get_bits_left(gb) < 6) |
||||
return AVERROR_INVALIDDATA; |
||||
params->color_saturation_weight = |
||||
(AVRational){get_bits(gb, 6), saturation_weight_den}; |
||||
} |
||||
} |
||||
|
||||
return 0; |
||||
} |
||||
@ -1,35 +0,0 @@ |
||||
/*
|
||||
* This file is part of FFmpeg. |
||||
* |
||||
* FFmpeg is free software; you can redistribute it and/or |
||||
* modify it under the terms of the GNU Lesser General Public |
||||
* License as published by the Free Software Foundation; either |
||||
* version 2.1 of the License, or (at your option) any later version. |
||||
* |
||||
* FFmpeg is distributed in the hope that it will be useful, |
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
||||
* Lesser General Public License for more details. |
||||
* |
||||
* You should have received a copy of the GNU Lesser General Public |
||||
* License along with FFmpeg; if not, write to the Free Software |
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
||||
*/ |
||||
|
||||
#ifndef AVCODEC_DYNAMIC_HDR10_PLUS_H |
||||
#define AVCODEC_DYNAMIC_HDR10_PLUS_H |
||||
|
||||
#include "libavutil/hdr_dynamic_metadata.h" |
||||
|
||||
/**
|
||||
* Parse the user data registered ITU-T T.35 to AVbuffer (AVDynamicHDRPlus). |
||||
* @param s A pointer containing the decoded AVDynamicHDRPlus structure. |
||||
* @param data The byte array containing the raw ITU-T T.35 data. |
||||
* @param size Size of the data array in bytes. |
||||
* |
||||
* @return 0 if succeed. Otherwise, returns the appropriate AVERROR. |
||||
*/ |
||||
int ff_parse_itu_t_t35_to_dynamic_hdr10_plus(AVDynamicHDRPlus *s, const uint8_t *data, |
||||
int size); |
||||
|
||||
#endif /* AVCODEC_DYNAMIC_HDR10_PLUS_H */ |
||||
Loading…
Reference in new issue