From 78d808c5bdeb7146374068c1f5c535d36c7a0001 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 13 Aug 2016 15:06:07 +0200 Subject: audio: log replaygain values in af_volume instead demuxer The demuxer layer usually doesn't log per-stream information, and even the replaygain information was logged only if it came from tags. So log it in af_volume instead. --- audio/filter/af_volume.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'audio') diff --git a/audio/filter/af_volume.c b/audio/filter/af_volume.c index 20031961b4..e1d5d45e89 100644 --- a/audio/filter/af_volume.c +++ b/audio/filter/af_volume.c @@ -71,15 +71,19 @@ static int control(struct af_instance *af, int cmd, void *arg) if (af_fmt_is_planar(in->format)) mp_audio_set_format(af->data, af_fmt_to_planar(af->data->format)); s->rgain = 1.0; - if ((s->rgain_track || s->rgain_album) && af->replaygain_data) { - float gain, peak; + struct replaygain_data *rg = af->replaygain_data; + if ((s->rgain_track || s->rgain_album) && rg) { + MP_VERBOSE(af, "Replaygain: Track=%f/%f Album=%f/%f\n", + rg->track_gain, rg->track_peak, + rg->album_gain, rg->album_peak); + float gain, peak; if (s->rgain_track) { - gain = af->replaygain_data->track_gain; - peak = af->replaygain_data->track_peak; + gain = rg->track_gain; + peak = rg->track_peak; } else { - gain = af->replaygain_data->album_gain; - peak = af->replaygain_data->album_peak; + gain = rg->album_gain; + peak = rg->album_peak; } gain += s->rgain_preamp; -- cgit v1.2.3