summary for the adjustments: 1, remove the extra "," in the ,} ...{0.2004,0.3001,0.4008,0.5005,0.6002,0.7009,0.8006,0.9013,} to ...{0.2004,0.3001,0.4008,0.5005,0.6002,0.7009,0.8006,0.9013} 2, add "," between the } and new field } fraction_bright_pixels to }, fraction_bright_pixels 3, remove the extra space between "} }" ...{0.2004,0.3001,0.4008,0.5005,0.6002,0.7009,0.8006,0.9013,} } to ...{0.2004,0.3001,0.4008,0.5005,0.6002,0.7009,0.8006,0.9013,}}
Unified · Split
| @@ -221,7 +221,7 @@ static void dump_dynamic_hdr_plus(AVFilterContext *ctx, AVFrameSideData *sd) · 220 unmodified lines | |||
| 221 | av_log(ctx, AV_LOG_INFO, "num_windows: %d, ", hdr_plus->num_windows); | 221 | av_log(ctx, AV_LOG_INFO, "num_windows: %d, ", hdr_plus->num_windows); |
| 222 | for (int w = 1; w < hdr_plus->num_windows; w++) { | 222 | for (int w = 1; w < hdr_plus->num_windows; w++) { |
| 223 | AVHDRPlusColorTransformParams *params = &hdr_plus->params[w]; | 223 | AVHDRPlusColorTransformParams *params = &hdr_plus->params[w]; |
| 224 | av_log(ctx, AV_LOG_INFO, "window %d { ", w); | 224 | av_log(ctx, AV_LOG_INFO, w > 1 ? ", window %d { " : "window %d { ", w); |
| 225 | av_log(ctx, AV_LOG_INFO, "window_upper_left_corner: (%5.4f,%5.4f),", | 225 | av_log(ctx, AV_LOG_INFO, "window_upper_left_corner: (%5.4f,%5.4f),", |
| 226 | av_q2d(params->window_upper_left_corner_x), | 226 | av_q2d(params->window_upper_left_corner_x), |
| 227 | av_q2d(params->window_upper_left_corner_y)); | 227 | av_q2d(params->window_upper_left_corner_y)); |
| @@ -242,7 +242,7 @@ static void dump_dynamic_hdr_plus(AVFilterContext *ctx, AVFrameSideData *sd) · 14 unmodified lines | |||
| 242 | params->semimajor_axis_external_ellipse); | 242 | params->semimajor_axis_external_ellipse); |
| 243 | av_log(ctx, AV_LOG_INFO, "semiminor_axis_external_ellipse: %d, ", | 243 | av_log(ctx, AV_LOG_INFO, "semiminor_axis_external_ellipse: %d, ", |
| 244 | params->semiminor_axis_external_ellipse); | 244 | params->semiminor_axis_external_ellipse); |
| 245 | av_log(ctx, AV_LOG_INFO, "overlap_process_option: %d}, ", | 245 | av_log(ctx, AV_LOG_INFO, "overlap_process_option: %d}", |
| 246 | params->overlap_process_option); | 246 | params->overlap_process_option); |
| 247 | } | 247 | } |
| 248 | av_log(ctx, AV_LOG_INFO, "targeted_system_display_maximum_luminance: %9.4f, ", | 248 | av_log(ctx, AV_LOG_INFO, "targeted_system_display_maximum_luminance: %9.4f, ", |
| @@ -252,7 +252,7 @@ static void dump_dynamic_hdr_plus(AVFilterContext *ctx, AVFrameSideData *sd) · 3 unmodified lines | |||
| 252 | for (int i = 0; i < hdr_plus->num_rows_targeted_system_display_actual_peak_luminance; i++) { | 252 | for (int i = 0; i < hdr_plus->num_rows_targeted_system_display_actual_peak_luminance; i++) { |
| 253 | av_log(ctx, AV_LOG_INFO, "("); | 253 | av_log(ctx, AV_LOG_INFO, "("); |
| 254 | for (int j = 0; j < hdr_plus->num_cols_targeted_system_display_actual_peak_luminance; j++) { | 254 | for (int j = 0; j < hdr_plus->num_cols_targeted_system_display_actual_peak_luminance; j++) { |
| 255 | av_log(ctx, AV_LOG_INFO, "%5.4f,", | 255 | av_log(ctx, AV_LOG_INFO, i ? ",%5.4f" : "%5.4f", |
| 256 | av_q2d(hdr_plus->targeted_system_display_actual_peak_luminance[i][j])); | 256 | av_q2d(hdr_plus->targeted_system_display_actual_peak_luminance[i][j])); |
| 257 | } | 257 | } |
| 258 | av_log(ctx, AV_LOG_INFO, ")"); | 258 | av_log(ctx, AV_LOG_INFO, ")"); |
| @@ -264,9 +264,9 @@ static void dump_dynamic_hdr_plus(AVFilterContext *ctx, AVFrameSideData *sd) · 5 unmodified lines | |||
| 264 | AVHDRPlusColorTransformParams *params = &hdr_plus->params[w]; | 264 | AVHDRPlusColorTransformParams *params = &hdr_plus->params[w]; |
| 265 | av_log(ctx, AV_LOG_INFO, "window %d {maxscl: {", w); | 265 | av_log(ctx, AV_LOG_INFO, "window %d {maxscl: {", w); |
| 266 | for (int i = 0; i < 3; i++) { | 266 | for (int i = 0; i < 3; i++) { |
| 267 | av_log(ctx, AV_LOG_INFO, "%5.4f,",av_q2d(params->maxscl[i])); | 267 | av_log(ctx, AV_LOG_INFO, i ? ",%5.4f" : "%5.4f",av_q2d(params->maxscl[i])); |
| 268 | } | 268 | } |
| 269 | av_log(ctx, AV_LOG_INFO, "} average_maxrgb: %5.4f, ", | 269 | av_log(ctx, AV_LOG_INFO, "}, average_maxrgb: %5.4f, ", |
| 270 | av_q2d(params->average_maxrgb)); | 270 | av_q2d(params->average_maxrgb)); |
| 271 | av_log(ctx, AV_LOG_INFO, "distribution_maxrgb: {"); | 271 | av_log(ctx, AV_LOG_INFO, "distribution_maxrgb: {"); |
| 272 | for (int i = 0; i < params->num_distribution_maxrgb_percentiles; i++) { | 272 | for (int i = 0; i < params->num_distribution_maxrgb_percentiles; i++) { |
| @@ -274,35 +274,35 @@ static void dump_dynamic_hdr_plus(AVFilterContext *ctx, AVFrameSideData *sd) · 1 unmodified line | |||
| 274 | params->distribution_maxrgb[i].percentage, | 274 | params->distribution_maxrgb[i].percentage, |
| 275 | av_q2d(params->distribution_maxrgb[i].percentile)); | 275 | av_q2d(params->distribution_maxrgb[i].percentile)); |
| 276 | } | 276 | } |
| 277 | av_log(ctx, AV_LOG_INFO, "} fraction_bright_pixels: %5.4f, ", | 277 | av_log(ctx, AV_LOG_INFO, "}, fraction_bright_pixels: %5.4f", |
| 278 | av_q2d(params->fraction_bright_pixels)); | 278 | av_q2d(params->fraction_bright_pixels)); |
| 279 | if (params->tone_mapping_flag) { | 279 | if (params->tone_mapping_flag) { |
| 280 | av_log(ctx, AV_LOG_INFO, "knee_point: (%5.4f,%5.4f), ", av_q2d(params->knee_point_x), av_q2d(params->knee_point_y)); | 280 | av_log(ctx, AV_LOG_INFO, ", knee_point: (%5.4f,%5.4f), ", av_q2d(params->knee_point_x), av_q2d(params->knee_point_y)); |
| 281 | av_log(ctx, AV_LOG_INFO, "bezier_curve_anchors: {"); | 281 | av_log(ctx, AV_LOG_INFO, "bezier_curve_anchors: {"); |
| 282 | for (int i = 0; i < params->num_bezier_curve_anchors; i++) { | 282 | for (int i = 0; i < params->num_bezier_curve_anchors; i++) { |
| 283 | av_log(ctx, AV_LOG_INFO, "%5.4f,", | 283 | av_log(ctx, AV_LOG_INFO, i ? ",%5.4f" : "%5.4f", |
| 284 | av_q2d(params->bezier_curve_anchors[i])); | 284 | av_q2d(params->bezier_curve_anchors[i])); |
| 285 | } | 285 | } |
| 286 | av_log(ctx, AV_LOG_INFO, "} "); | 286 | av_log(ctx, AV_LOG_INFO, "}"); |
| 287 | } | 287 | } |
| 288 | if (params->color_saturation_mapping_flag) { | 288 | if (params->color_saturation_mapping_flag) { |
| 289 | av_log(ctx, AV_LOG_INFO, "color_saturation_weight: %5.4f", | 289 | av_log(ctx, AV_LOG_INFO, ", color_saturation_weight: %5.4f", |
| 290 | av_q2d(params->color_saturation_weight)); | 290 | av_q2d(params->color_saturation_weight)); |
| 291 | } | 291 | } |
| 292 | av_log(ctx, AV_LOG_INFO, "} "); | 292 | av_log(ctx, AV_LOG_INFO, "}"); |
| 293 | } | 293 | } |
| 294 | 294 | ||
| 295 | if (hdr_plus->mastering_display_actual_peak_luminance_flag) { | 295 | if (hdr_plus->mastering_display_actual_peak_luminance_flag) { |
| 296 | av_log(ctx, AV_LOG_INFO, "mastering_display_actual_peak_luminance: {"); | 296 | av_log(ctx, AV_LOG_INFO, ", mastering_display_actual_peak_luminance: {"); |
| 297 | for (int i = 0; i < hdr_plus->num_rows_mastering_display_actual_peak_luminance; i++) { | 297 | for (int i = 0; i < hdr_plus->num_rows_mastering_display_actual_peak_luminance; i++) { |
| 298 | av_log(ctx, AV_LOG_INFO, "("); | 298 | av_log(ctx, AV_LOG_INFO, "("); |
| 299 | for (int j = 0; j < hdr_plus->num_cols_mastering_display_actual_peak_luminance; j++) { | 299 | for (int j = 0; j < hdr_plus->num_cols_mastering_display_actual_peak_luminance; j++) { |
| 300 | av_log(ctx, AV_LOG_INFO, " %5.4f,", | 300 | av_log(ctx, AV_LOG_INFO, i ? ",%5.4f" : "%5.4f", |
| 301 | av_q2d(hdr_plus->mastering_display_actual_peak_luminance[i][j])); | 301 | av_q2d(hdr_plus->mastering_display_actual_peak_luminance[i][j])); |
| 302 | } | 302 | } |
| 303 | av_log(ctx, AV_LOG_INFO, ")"); | 303 | av_log(ctx, AV_LOG_INFO, ")"); |
| 304 | } | 304 | } |
| 305 | av_log(ctx, AV_LOG_INFO, "} "); | 305 | av_log(ctx, AV_LOG_INFO, "}"); |
| 306 | } | 306 | } |
| 307 | } | 307 | } |
| 308 | 308 | ||