The branch, release/8.0 has been updated
via 558994b051424534fc598d7569fe2b896f103110 (commit)
from dd00a614e16a15db0b230dfe45790e913e593695 (commit)
- Log -----------------------------------------------------------------
commit 558994b051424534fc598d7569fe2b896f103110
Author: James Almer <[email protected]>
AuthorDate: Mon Oct 13 23:39:52 2025 -0300
Commit: James Almer <[email protected]>
CommitDate: Wed Oct 15 20:31:21 2025 -0300
avformat/dump: fix log level passed to av_log when printing stream group
side data
Signed-off-by: James Almer <[email protected]>
(cherry picked from commit 2e1d702cfc5c530c213361e6a1b77dca847a30e7)
diff --git a/libavformat/dump.c b/libavformat/dump.c
index 02f69f9a3a..a5cdf0b45b 100644
--- a/libavformat/dump.c
+++ b/libavformat/dump.c
@@ -367,11 +367,11 @@ static void dump_content_light_metadata(void *ctx, const
AVPacketSideData *sd,
metadata->MaxCLL, metadata->MaxFALL);
}
-static void dump_ambient_viewing_environment_metadata(void *ctx, const
AVPacketSideData *sd)
+static void dump_ambient_viewing_environment_metadata(void *ctx, const
AVPacketSideData *sd, int log_level)
{
const AVAmbientViewingEnvironment *ambient =
(const AVAmbientViewingEnvironment *)sd->data;
- av_log(ctx, AV_LOG_INFO, "Ambient Viewing Environment, "
+ av_log(ctx, log_level, "Ambient Viewing Environment, "
"ambient_illuminance=%f, ambient_light_x=%f, ambient_light_y=%f",
av_q2d(ambient->ambient_illuminance),
av_q2d(ambient->ambient_light_x),
@@ -445,12 +445,12 @@ static void dump_s12m_timecode(void *ctx, AVRational
avg_frame_rate, const AVPac
}
}
-static void dump_cropping(void *ctx, const AVPacketSideData *sd)
+static void dump_cropping(void *ctx, const AVPacketSideData *sd, int log_level)
{
uint32_t top, bottom, left, right;
if (sd->size < sizeof(uint32_t) * 4) {
- av_log(ctx, AV_LOG_ERROR, "invalid data\n");
+ av_log(ctx, log_level, "invalid data\n");
return;
}
@@ -459,15 +459,15 @@ static void dump_cropping(void *ctx, const
AVPacketSideData *sd)
left = AV_RL32(sd->data + 8);
right = AV_RL32(sd->data + 12);
- av_log(ctx, AV_LOG_INFO, "%d/%d/%d/%d", left, right, top, bottom);
+ av_log(ctx, log_level, "%d/%d/%d/%d", left, right, top, bottom);
}
-static void dump_tdrdi(void *ctx, const AVPacketSideData *sd)
+static void dump_tdrdi(void *ctx, const AVPacketSideData *sd, int log_level)
{
const AV3DReferenceDisplaysInfo *tdrdi =
(const AV3DReferenceDisplaysInfo *)sd->data;
- av_log(ctx, AV_LOG_INFO, "number of reference displays: %u",
tdrdi->num_ref_displays);
+ av_log(ctx, log_level, "number of reference displays: %u",
tdrdi->num_ref_displays);
}
static void dump_sidedata(void *ctx, const AVPacketSideData *side_data, int
nb_side_data,
@@ -543,15 +543,15 @@ static void dump_sidedata(void *ctx, const
AVPacketSideData *side_data, int nb_s
dump_s12m_timecode(ctx, avg_frame_rate, sd, log_level);
break;
case AV_PKT_DATA_AMBIENT_VIEWING_ENVIRONMENT:
- dump_ambient_viewing_environment_metadata(ctx, sd);
+ dump_ambient_viewing_environment_metadata(ctx, sd, log_level);
break;
case AV_PKT_DATA_FRAME_CROPPING:
av_log(ctx, AV_LOG_INFO, "Frame cropping: ");
- dump_cropping(ctx, sd);
+ dump_cropping(ctx, sd, log_level);
break;
case AV_PKT_DATA_3D_REFERENCE_DISPLAYS:
av_log(ctx, log_level, "3D Reference Displays Information: ");
- dump_tdrdi(ctx, sd);
+ dump_tdrdi(ctx, sd, log_level);
break;
default:
av_log(ctx, log_level, "unknown side data type %d "
@@ -693,7 +693,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
if (st->start_time != AV_NOPTS_VALUE && st->start_time != 0 &&
st->time_base.den && st->time_base.num) {
const double stream_start = av_q2d(st->time_base) * st->start_time;
- av_log(NULL, AV_LOG_INFO, ", start %.6f", stream_start);
+ av_log(NULL, log_level, ", start %.6f", stream_start);
}
dump_disposition(st->disposition, log_level);
-----------------------------------------------------------------------
Summary of changes:
libavformat/dump.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
hooks/post-receive
--
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
