Changeset 4765:c9adc34b0b5b in roaraudio

Timestamp:

02/15/11 17:33:38 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

fix needed for libvorbisfile as it does not support native endiness

Location:

roard

Files:

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

roard/codecfilter_vorbis.c

@@ -87 +87 @@
  *inst = (CODECFILTER_USERDATA_T) self;
 
+#if ROAR_CODEC_DEFAULT == ROAR_CODEC_PCM_S_LE
+ self->bigendianp = 0;
  s->info.codec = ROAR_CODEC_DEFAULT;
+#else
+ self->bigendianp = 1;
+ s->info.codec = ROAR_CODEC_PCM_S_BE; // force because ROAR_CODEC_DEFAULT can be something non-BE, too.
+#endif
+
  s->info.bits  = 16;
 
@@ -251 +258 @@
 
  while (todo) {
-  r = ov_read(&(self->vf), buf+done, todo, 0, 2, 1, &(self->current_section));
+  r = ov_read(&(self->vf), buf+done, todo, self->bigendianp, 2, 1, &(self->current_section));
   if ( r == OV_HOLE ) {
    ROAR_DBG("cf_vorbis_read(*): Hole in stream");
@@ -291 +298 @@
  s->info.rate     = vi->rate;
  s->info.bits     = 16;
+#if ROAR_CODEC_DEFAULT == ROAR_CODEC_PCM_S_LE
  s->info.codec    = ROAR_CODEC_DEFAULT;
+#else
+ s->info.codec    = ROAR_CODEC_PCM_S_BE;
+#endif
 
  stream_meta_clear(s->id);

roard/include/codecfilter_vorbis.h

@@ -46 +46 @@
  OggVorbis_File vf;
  int got_it_running;
+ int bigendianp;
 #ifdef ROAR_HAVE_LIBVORBISENC
  int encoding;