summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-08-13 15:06:07 +0200
committerwm4 <wm4@nowhere>2016-08-13 15:06:07 +0200
commit78d808c5bdeb7146374068c1f5c535d36c7a0001 (patch)
tree00861eee4a711139f3e883037b04124453aff419 /audio
parentb9ba9a898a9354b52c2154e25a0b5afcb359c5b1 (diff)
downloadmpv-78d808c5bdeb7146374068c1f5c535d36c7a0001.tar.bz2
mpv-78d808c5bdeb7146374068c1f5c535d36c7a0001.tar.xz
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.
Diffstat (limited to 'audio')
-rw-r--r--audio/filter/af_volume.c16
1 files changed, 10 insertions, 6 deletions
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;