Changeset 222:3975f41364fa in roaraudio

Timestamp:

07/22/08 20:34:11 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added ReplayGain? support to codecfilter_vorbis

Location:

roard

Files:

• codecfilter_vorbis.c (modified) (2 diffs)
• include/codecfilter_vorbis.h (modified) (1 diff)

roard/codecfilter_vorbis.c

@@ -94 +94 @@
  int type;
  int j, h = 0;
+ float rpg_track = 0, rpg_album = 0;
 
  s->info.channels = vi->channels;
@@ -116 +117 @@
 
    ROAR_DBG("cf_vorbis_update_stream(*): Meta %-16s: %s", key, value);
+
+   if ( strcmp(key, "REPLAYGAIN_TRACK_PEAK") == 0 ) {
+    rpg_track = 1/atof(value);
+/*
+   } else if ( strcmp(key, "REPLAYGAIN_TRACK_GAIN") == 0 ) {
+    rpg_track = powf(10, atof(value)/20);
+*/
+   } else if ( strcmp(key, "REPLAYGAIN_ALBUM_PEAK") == 0 ) {
+    rpg_album = 1/atof(value);
+/* 
+   } else if ( strcmp(key, "REPLAYGAIN_ALBUM_GAIN") == 0 ) {
+    rpg_album = powf(10, atof(value)/20);
+*/
+   }
+
    ++ptr;
  }
 
+ if ( rpg_album ) {
+  self->stream->mixer.rpg_div = 2718;  // = int(exp(1)*1000)
+  self->stream->mixer.rpg_mul = (float)rpg_album*2718;
+ } else if ( rpg_track ) {
+  self->stream->mixer.rpg_div = 2718;
+  self->stream->mixer.rpg_mul = (float)rpg_track*2718;
+ }
+
+ printf("RPG: mul=%i, div=%i\n", self->stream->mixer.rpg_mul, self->stream->mixer.rpg_div);
  return 0;
 }

roard/include/codecfilter_vorbis.h

@@ -7 +7 @@
 #include <vorbis/codec.h>
 #include <vorbis/vorbisfile.h>
+#include <math.h>
 
 struct codecfilter_vorbis_inst {