Unified · Split
| @@ -42,6 +42,7 @@ · 41 unmodified lines | |||
| 42 | #include "libavutil/mastering_display_metadata.h" | 42 | #include "libavutil/mastering_display_metadata.h" |
| 43 | #include "libavutil/video_enc_params.h" | 43 | #include "libavutil/video_enc_params.h" |
| 44 | #include "libavutil/detection_bbox.h" | 44 | #include "libavutil/detection_bbox.h" |
| 45 | #include "libavutil/ambient_viewing_environment.h" | ||
| 45 | #include "libavutil/uuid.h" | 46 | #include "libavutil/uuid.h" |
| 46 | 47 | ||
| 47 | #include "avfilter.h" | 48 | #include "avfilter.h" |
| @@ -601,6 +602,17 @@ static void dump_dovi_metadata(AVFilterContext *ctx, const AVFrameSideData *sd) · 553 unmodified lines | |||
| 601 | av_log(ctx, AV_LOG_INFO, "source_diagonal=%"PRIu16"; ", color->source_diagonal); | 602 | av_log(ctx, AV_LOG_INFO, "source_diagonal=%"PRIu16"; ", color->source_diagonal); |
| 602 | } | 603 | } |
| 603 | 604 | ||
| 605 | static void dump_ambient_viewing_environment(AVFilterContext *ctx, const AVFrameSideData *sd) | ||
| 606 | { | ||
| 607 | const AVAmbientViewingEnvironment *ambient_viewing_environment = | ||
| 608 | (const AVAmbientViewingEnvironment *)sd->data; | ||
| 609 | |||
| 610 | av_log(ctx, AV_LOG_INFO, "ambient_illuminance=%f, ambient_light_x=%f, ambient_light_y=%f", | ||
| 611 | av_q2d(ambient_viewing_environment->ambient_illuminance), | ||
| 612 | av_q2d(ambient_viewing_environment->ambient_light_x), | ||
| 613 | av_q2d(ambient_viewing_environment->ambient_light_y)); | ||
| 614 | } | ||
| 615 | |||
| 604 | static void dump_color_property(AVFilterContext *ctx, AVFrame *frame) | 616 | static void dump_color_property(AVFilterContext *ctx, AVFrame *frame) |
| 605 | { | 617 | { |
| 606 | const char *color_range_str = av_color_range_name(frame->color_range); | 618 | const char *color_range_str = av_color_range_name(frame->color_range); |
| @@ -797,6 +809,9 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) · 190 unmodified lines | |||
| 797 | case AV_FRAME_DATA_DOVI_METADATA: | 809 | case AV_FRAME_DATA_DOVI_METADATA: |
| 798 | dump_dovi_metadata(ctx, sd); | 810 | dump_dovi_metadata(ctx, sd); |
| 799 | break; | 811 | break; |
| 812 | case AV_FRAME_DATA_AMBIENT_VIEWING_ENVIRONMENT: | ||
| 813 | dump_ambient_viewing_environment(ctx, sd); | ||
| 814 | break; | ||
| 800 | default: | 815 | default: |
| 801 | if (name) | 816 | if (name) |
| 802 | av_log(ctx, AV_LOG_INFO, | 817 | av_log(ctx, AV_LOG_INFO, |