Changeset 4592:e51aef50fe8c in roaraudio

Timestamp:

11/07/10 05:56:17 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added metadata support

File:

• roard/codecfilter_flac.c (modified) (2 diffs)

roard/codecfilter_flac.c

@@ -102 +102 @@
 
 void cf_flac_cb_metadata(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data) {
+ struct codecfilter_flac_inst * self = client_data;
+ const FLAC__StreamMetadata_VorbisComment * vc;
+ FLAC__uint32 i;
+ const char * key, * value;
+ char keycopy[ROAR_META_MAX_NAMELEN];
+ int type;
+ float rpg_track = 0, rpg_album = 0;
+
+ if ( metadata->type == FLAC__METADATA_TYPE_VORBIS_COMMENT ) {
+  ROAR_DBG("cf_flac_cb_metadata(decoder=%p, metadata=%p, client_data=%p): have METADATA_TYPE_VORBIS_COMMENT", decoder, metadata, client_data);
+
+  stream_meta_clear(ROAR_STREAM(self->ss)->id);
+
+  vc = &(metadata->data.vorbis_comment);
+
+  for (i = 0; i < vc->num_comments; i++) {
+   //printf("c='%s'\n", vc->comments[i].entry);
+   key = (const char *)vc->comments[i].entry;
+   value = strstr(key, "=");
+   if ( value == NULL )
+    continue;
+
+   if ( (value - key + 1) > sizeof(keycopy) )
+    continue;
+
+   memcpy(keycopy, key, value - key);
+   keycopy[sizeof(keycopy)-1] = 0;
+   keycopy[value - key] = 0;
+
+   value++;
+
+   //printf("keycopy='%s', value='%s'\n", keycopy, value);
+
+   type = roar_meta_inttype(keycopy);
+   if ( type == -1 )
+    continue;
+
+   stream_meta_add(ROAR_STREAM(self->ss)->id, type, "", value);
+
+    if ( strcmp(keycopy, "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(keycopy, "REPLAYGAIN_ALBUM_PEAK") == 0 ) {
+     rpg_album = 1/atof(value);
+/*
+    } else if ( strcmp(key, "REPLAYGAIN_ALBUM_GAIN") == 0 ) {
+     rpg_album = powf(10, atof(value)/20);
+*/
+    }
+
+  }
+
+ if ( rpg_album ) {
+  self->ss->mixer.rpg_div = 2718;  // = int(exp(1)*1000)
+  self->ss->mixer.rpg_mul = (float)rpg_album*2718;
+ } else if ( rpg_track ) {
+  self->ss->mixer.rpg_div = 2718;
+  self->ss->mixer.rpg_mul = (float)rpg_track*2718;
+ }
+
+  stream_meta_finalize(ROAR_STREAM(self->ss)->id);
+ }
+
  ROAR_DBG("cf_flac_cb_metadata(decoder=%p, metadata=%p, client_data=%p) = (void)", decoder, metadata, client_data);
 }
@@ -138 +204 @@
  FLAC__stream_decoder_set_error_callback(self->decoder.decoder, cf_flac_cb_error);
  FLAC__stream_decoder_set_client_data(self->decoder.decoder, self);
+
+ FLAC__stream_decoder_set_metadata_respond(self->decoder.decoder, FLAC__METADATA_TYPE_VORBIS_COMMENT);
 
  FLAC__stream_decoder_init(self->decoder.decoder);