summaryrefslogtreecommitdiffstats
path: root/gst/id3demux
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.net>2006-03-16 16:06:22 +0000
committerTim-Philipp Müller <tim@centricular.net>2006-03-16 16:06:22 +0000
commitf8d30d4744294da9f759a7842f44dafff46f0ec4 (patch)
tree4c24be8c1a90941788c30a1a6823e6101802dda7 /gst/id3demux
parent1cf900d58cb606a25a17686ef874a96f159d6c50 (diff)
gst/id3demux/id3v2frames.c: We only care about gain and peak data for the master volume.
Original commit message from CVS: * gst/id3demux/id3v2frames.c: (parse_relative_volume_adjustment_two): We only care about gain and peak data for the master volume.
Diffstat (limited to 'gst/id3demux')
-rw-r--r--gst/id3demux/id3v2frames.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/gst/id3demux/id3v2frames.c b/gst/id3demux/id3v2frames.c
index 0c866f76..8e1ee048 100644
--- a/gst/id3demux/id3v2frames.c
+++ b/gst/id3demux/id3v2frames.c
@@ -359,6 +359,8 @@ parse_unique_file_identifier (ID3TagsWorking * work, const gchar ** tag_name)
return ret;
}
+#define ID3V2_RVA2_CHANNEL_MASTER 1
+
static gboolean
parse_relative_volume_adjustment_two (ID3TagsWorking * work)
{
@@ -410,14 +412,14 @@ parse_relative_volume_adjustment_two (ID3TagsWorking * work)
GST_LOG ("RVA2 frame: id=%s, chan=%u, adj=%.2fdB, peak_bits=%u, peak=%.2f",
id, chan, gain_dB, (guint) peak_bits, peak_val);
- if (strcmp (id, "track") == 0) {
+ if (chan == ID3V2_RVA2_CHANNEL_MASTER && strcmp (id, "track") == 0) {
gain_tag_name = GST_TAG_TRACK_GAIN;
peak_tag_name = GST_TAG_TRACK_PEAK;
- } else if (strcmp (id, "album") == 0) {
+ } else if (chan == ID3V2_RVA2_CHANNEL_MASTER && strcmp (id, "album") == 0) {
gain_tag_name = GST_TAG_ALBUM_GAIN;
peak_tag_name = GST_TAG_ALBUM_PEAK;
} else {
- GST_INFO ("Unhandled RVA2 frame id '%s'", id);
+ GST_INFO ("Unhandled RVA2 frame id '%s' for channel %d", id, chan);
}
if (gain_tag_name) {