virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-23 21:54:53 +02:00
Code Issues Releases Activity

avformat/dump: fix log level passed to av_log when printing stream group side data

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2025-10-13 23:39:52 -03:00
parent 74a3c1ddb6
commit 2e1d702cfc
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
libavformat/dump.c
View File

@@ -367,11 +367,11 @@ static void dump_content_light_metadata(void *ctx, const AVPacketSideData *sd,
metadata->MaxCLL, metadata->MaxFALL); 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 *ambient =
(const AVAmbientViewingEnvironment *)sd->data; (const AVAmbientViewingEnvironment *)sd->data;
av_log(ctx, AV_LOG_INFO, av_log(ctx, log_level,
"ambient_illuminance=%f, ambient_light_x=%f, ambient_light_y=%f", "ambient_illuminance=%f, ambient_light_x=%f, ambient_light_y=%f",
av_q2d(ambient->ambient_illuminance), av_q2d(ambient->ambient_illuminance),
av_q2d(ambient->ambient_light_x), 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; uint32_t top, bottom, left, right;
if (sd->size < sizeof(uint32_t) * 4) { 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; return;
} }
@@ -459,15 +459,15 @@ static void dump_cropping(void *ctx, const AVPacketSideData *sd)
left = AV_RL32(sd->data + 8); left = AV_RL32(sd->data + 8);
right = AV_RL32(sd->data + 12); 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 *tdrdi =
(const AV3DReferenceDisplaysInfo *)sd->data; (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, static void dump_sidedata(void *ctx, const AVPacketSideData *side_data, int nb_side_data,
@@ -485,7 +485,7 @@ static void dump_sidedata(void *ctx, const AVPacketSideData *side_data, int nb_s
av_log(ctx, log_level, "%s ", indent); av_log(ctx, log_level, "%s ", indent);
if (name) if (name)
av_log(ctx, AV_LOG_INFO, "%s: ", name); av_log(ctx, log_level, "%s: ", name);
switch (sd->type) { switch (sd->type) {
case AV_PKT_DATA_PARAM_CHANGE: case AV_PKT_DATA_PARAM_CHANGE:
dump_paramchange(ctx, sd, log_level); dump_paramchange(ctx, sd, log_level);
@@ -526,13 +526,13 @@ static void dump_sidedata(void *ctx, const AVPacketSideData *side_data, int nb_s
dump_s12m_timecode(ctx, avg_frame_rate, sd, log_level); dump_s12m_timecode(ctx, avg_frame_rate, sd, log_level);
break; break;
case AV_PKT_DATA_AMBIENT_VIEWING_ENVIRONMENT: case AV_PKT_DATA_AMBIENT_VIEWING_ENVIRONMENT:
dump_ambient_viewing_environment_metadata(ctx, sd); dump_ambient_viewing_environment_metadata(ctx, sd, log_level);
break; break;
case AV_PKT_DATA_FRAME_CROPPING: case AV_PKT_DATA_FRAME_CROPPING:
dump_cropping(ctx, sd); dump_cropping(ctx, sd, log_level);
break; break;
case AV_PKT_DATA_3D_REFERENCE_DISPLAYS: case AV_PKT_DATA_3D_REFERENCE_DISPLAYS:
dump_tdrdi(ctx, sd); dump_tdrdi(ctx, sd, log_level);
break; break;
default: default:
if (name) if (name)
@@ -678,7 +678,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
if (st->start_time != AV_NOPTS_VALUE && st->start_time != 0 && st->time_base.den && st->time_base.num) { 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; 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); dump_disposition(st->disposition, log_level);