icanhasaudio 0.0.1 → 0.0.2

data/History.txt

@@ -1,3 +1,7 @@
+== 0.0.2
+* 1 major enhancement
+  * I can has ogg decoder!
+
 == 0.0.1 / 2007-07-10
 
 * 1 major enhancement

data/Manifest.txt

@@ -11,5 +11,10 @@ ext/extconf.rb
 ext/get_audio.c
 ext/get_audio.h
 ext/icanhasaudio.c
+ext/rb_ogg.c
+ext/rb_wav.c
+ext/rb_wav.h
 ext/syncword.c
 ext/syncword.h
+lib/icanhasaudio/mpeg.rb
+lib/icanhasaudio/ogg.rb

data/README.txt

@@ -5,7 +5,7 @@
 == DESCRIPTION.  LULZ
 
 Hai! icanhasaudio? is an interface to lame for decoding ur MP3s.  I iz in ur
-computer. Decodin ur mp3s.
+computer. Decodin ur mp3s.  Whatevs!  I also decodin ur OGGz!
 
 == SYNOPSYS ROFLOL
 
@@ -20,22 +20,22 @@ computer. Decodin ur mp3s.
 
 Or even smaller:
 
-  reader = Audio::MPEG::Decoder.new
+  reader = Audio::OGG::Decoder.new
   reader.decode(File.open(ARGV[0], 'rb'), File.open(ARGV[1], 'wb'))
 
 == PROBLEMS
 
-Currently only decodes MP3 data.  Plus many other problems....  YYMV. LOL.
+Currently only decodes MP3/OGG data.  Plus many other problems....  YMMV. LOL.
 Not laugh plz!
 
 == DEPENDENSEEZ
 
-Make sure lame is installed on ur 'puter.
+Make sure lame is installed on ur 'puter.  Also ogg and vorbisfile!
 
 == CREDITZ
 
 Thanx Ryan for mah name!  Also, most of this code was taken from the lame
-front end.  So thank you to the lame team!
+front end.  So thank you to the lame team!  THX VORBIS!
 
 == LICENSE
 

data/Rakefile

@@ -2,11 +2,11 @@ require 'hoe'
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), "lib")
 
-Hoe.new('icanhasaudio', '0.0.1') do |p|
+Hoe.new('icanhasaudio', '0.0.2') do |p|
   p.rubyforge_name  = 'seattlerb'
   p.author          = 'Aaron Patterson'
   p.email           = 'aaronp@rubyforge.org'
-  p.summary         = "icanhasaudio is a wrappers lame for decoding ur mp3s."
+  p.summary         = "icanhasaudio is a lame/vorbis wrapper for decoding ur mp3s and ur oggs."
   p.description     = p.paragraphs_of('README.txt', 3..6).join("\n\n")
   p.url             = p.paragraphs_of('README.txt', 1).first.strip
   p.changes         = p.paragraphs_of('History.txt', 0..2).join("\n\n")

data/ext/decoder.c

@@ -1,8 +1,9 @@
 #include <ruby.h>
 #include <lame/lame.h>
 #include <assert.h>
-#include "decoder.h"
-#include "get_audio.h"
+#include <decoder.h>
+#include <get_audio.h>
+#include <rb_wav.h>
 
 int
 lame_decoder(VALUE self, VALUE infile, VALUE outf, mp3data_struct * mp3data)
@@ -14,20 +15,31 @@ lame_decoder(VALUE self, VALUE infile, VALUE outf, mp3data_struct * mp3data)
   int     i;
   int tmp_num_channels;
   int skip;
+  char headbuf[44];
+  VALUE raw;
+
+  raw = rb_iv_get(self, "@raw");
+  if(raw == Qnil) {
+    raw = Qfalse;
+    rb_iv_set(self, "@raw", Qfalse);
+  }
 
   Data_Get_Struct(self, lame_global_flags, gfp);
   tmp_num_channels = lame_get_num_channels( gfp );
 
   skip = lame_get_encoder_delay(gfp)+528+1;
 
-  /* FIXME: Not sure if necessary
-  if ( 0 == disable_wav_header )
-  */
-  WriteWaveHeader(outf, 0x7FFFFFFF, lame_get_in_samplerate( gfp ),
-                        tmp_num_channels,
-                        16);
-
-    /* unknown size, so write maximum 32 bit signed value */
+  if(!raw) {
+    rb_iv_set(self, "@bits", INT2NUM(16));
+    prelim_header(  self,
+                    headbuf,
+                    0x7FFFFFFF,
+                    0,
+                    tmp_num_channels,
+                    lame_get_in_samplerate( gfp )
+                    );
+    rb_funcall(outf, rb_intern("write"), 1, rb_str_new(headbuf, 44));
+  }
 
   wavsize = -skip;
   mp3data->totalframes = mp3data->nsamp / mp3data->framesize;
@@ -46,16 +58,7 @@ lame_decoder(VALUE self, VALUE infile, VALUE outf, mp3data_struct * mp3data)
 
     skip -= (i = skip < iread ? skip : iread); /* 'i' samples are to skip in this frame */
 
-    //printf("Writing: %d\n", mp3data->framenum);
     for (; i < iread; i++) {
-      /*
-      if ( disable_wav_header ) {
-          WriteFunction(outf, (char *) &Buffer[0][i], sizeof(short));
-          if (tmp_num_channels == 2)
-              WriteFunction(outf, (char *) &Buffer[1][i], sizeof(short));
-      }
-      else { */
-
       /* Write the 0 channel */
       BitBuffer16[bit_16_i] = Buffer[0][i] & 0xFF;
       BitBuffer16[bit_16_i + 1] = ((Buffer[0][i] >> 8) & 0xFF);
@@ -67,13 +70,6 @@ lame_decoder(VALUE self, VALUE infile, VALUE outf, mp3data_struct * mp3data)
       } else {
         bit_16_i += 2;
       }
-
-      /*
-      Write16BitsLowHigh(outf, Buffer[0][i]);
-      if (tmp_num_channels == 2)
-          Write16BitsLowHigh(outf, Buffer[1][i]);
-          */
-      /* } */
     }
     rb_funcall(outf, rb_intern("write"), 1, rb_str_new(BitBuffer16, bit_16_i));
   } while (iread);
@@ -90,16 +86,16 @@ lame_decoder(VALUE self, VALUE infile, VALUE outf, mp3data_struct * mp3data)
       wavsize *= i;
   }
 
-  if(rb_respond_to(outf, rb_intern("seek")) == Qtrue) {
+  if(!raw && rb_respond_to(outf, rb_intern("seek")) == Qtrue) {
     rb_funcall( outf,
                 rb_intern("seek"),
                 2,
                 INT2NUM(0),
                 rb_const_get(rb_cIO, rb_intern("SEEK_SET")) );
-    WriteWaveHeader(outf, (int)wavsize, lame_get_in_samplerate(gfp),
-      tmp_num_channels, 16);
-  }
 
+    rewrite_header(headbuf, (int)wavsize);
+    rb_funcall(outf, rb_intern("write"), 1, rb_str_new(headbuf, 44));
+  }
   return 0;
 }
 

data/ext/extconf.rb

@@ -1,6 +1,10 @@
 require 'mkmf'
 
 have_header("lame/lame.h")
+have_header("ogg/ogg.h")
+have_header("vorbis/vorbisfile.h")
 have_library("mp3lame")
+have_library("vorbis")
+have_library("vorbisfile")
 dir_config('icanhasaudio')
 create_makefile('icanhasaudio')

data/ext/get_audio.c

@@ -18,19 +18,6 @@ int
 lame_decode_fromfile(VALUE file, short pcm_l[], short pcm_r[],
                      mp3data_struct * mp3data);
 
-static void
-Write16BitsLowHigh(VALUE file, int i) {
-  rb_funcall(file, rb_intern("putc"), 1, INT2NUM(i & 0xFF));
-  rb_funcall(file, rb_intern("putc"), 1, INT2NUM((i >> 8) & 0xFF));
-}
-
-void
-Write32BitsLowHigh(VALUE fp, int i)
-{
-	Write16BitsLowHigh(fp,(int)(i&0xffffL));
-	Write16BitsLowHigh(fp,(int)((i>>16)&0xffffL));
-}
-
 /*
   get_audio16 - behave as the original get_audio function, with a limited
                 16 bit per sample output
@@ -143,27 +130,6 @@ read_samples_mp3(VALUE self, VALUE musicin,
 }
 
 
-void
-WriteWaveHeader(VALUE fp, const int pcmbytes,
-                const int freq, const int channels, const int bits)
-{
-  int     bytes = (bits + 7) / 8;
-  
-  /* quick and dirty, but documented */
-  rb_funcall(fp, rb_intern("write"), 1, rb_str_new2("RIFF"));
-  Write32BitsLowHigh(fp, pcmbytes + 44 - 8); /* length in bytes without header */
-  rb_funcall(fp, rb_intern("write"), 1, rb_str_new2("WAVEfmt "));
-  Write32BitsLowHigh(fp, 2 + 2 + 4 + 4 + 2 + 2); /* length of PCM format declaration area */
-  Write16BitsLowHigh(fp, 1); /* is PCM? */
-  Write16BitsLowHigh(fp, channels); /* number of channels */
-  Write32BitsLowHigh(fp, freq); /* sample frequency in [Hz] */
-  Write32BitsLowHigh(fp, freq * channels * bytes); /* bytes per second */
-  Write16BitsLowHigh(fp, channels * bytes); /* bytes per sample time */
-  Write16BitsLowHigh(fp, bits); /* bits per sample */
-  rb_funcall(fp, rb_intern("write"), 1, rb_str_new2("data"));
-  Write32BitsLowHigh(fp, pcmbytes); /* length in bytes of raw PCM data */
-}
-
 /*
 For lame_decode_fromfile:  return code
   -1     error

data/ext/get_audio.h

@@ -2,7 +2,3 @@
 int
 get_audio16(VALUE self, VALUE musicin, short buffer[2][1152],
     mp3data_struct * mp3data);
-
-void
-WriteWaveHeader(VALUE fp, const int pcmbytes,
-                const int freq, const int channels, const int bits);

data/ext/icanhasaudio.c

@@ -16,12 +16,22 @@
 static VALUE rb_mAudio;
 static VALUE rb_mMpeg;
 static VALUE rb_cDecoder;
+static VALUE rb_mOgg;
+static VALUE rb_cOggDecoder;
 
 static void reader_mark(lame_global_flags * lgf) {}
 static void reader_free(lame_global_flags * gfp) {
   lame_close(gfp);
 }
 
+/*
+ * call-seq:
+ *    decoder.decode(input_io, output_io)
+ *
+ * Decode the input IO and write it to the output IO.
+ */
+VALUE method_ogg_decode(VALUE self, VALUE infile, VALUE outf);
+
 /*
  * call-seq:
  *    Audio::MPEG::Decoder.new
@@ -150,8 +160,12 @@ void Init_icanhasaudio() {
   rb_mAudio = rb_define_module("Audio");
   rb_mMpeg = rb_define_module_under(rb_mAudio, "MPEG");
   rb_cDecoder = rb_define_class_under(rb_mMpeg, "Decoder", rb_cObject);
-  /* VERSION = '0.0.1' */
-  rb_define_const(rb_cDecoder, "VERSION", rb_str_new2("0.0.1"));
+
+  rb_mOgg = rb_define_module_under(rb_mAudio, "OGG");
+  rb_cOggDecoder = rb_define_class_under(rb_mOgg, "Decoder", rb_cObject);
+
+  /* VERSION = '0.0.2' */
+  rb_define_const(rb_cDecoder, "VERSION", rb_str_new2("0.0.2"));
   rb_define_singleton_method(
       rb_cDecoder,
       "lame_version",
@@ -161,5 +175,8 @@ void Init_icanhasaudio() {
 
   rb_define_alloc_func(rb_cDecoder, reader_allocate);
   rb_define_method(rb_cDecoder, "decode", method_lame_decode, 2);
+  rb_define_method(rb_cOggDecoder, "decode", method_ogg_decode, 2);
+  rb_require("icanhasaudio/mpeg");
+  rb_require("icanhasaudio/ogg");
 }
 

data/ext/rb_ogg.c

@@ -0,0 +1,139 @@
+#include <ruby.h>
+#include <ogg/ogg.h>
+#include <vorbis/vorbisfile.h>
+#include <rb_wav.h>
+
+size_t rb_ogg_read(void *ptr, size_t size, size_t nmemb, void *datasource) {
+  VALUE file = (VALUE)datasource;
+  VALUE str;
+  size_t length;
+  
+  str = rb_funcall(file, rb_intern("read"), 1, INT2NUM(size * nmemb));
+  if(str == Qnil) return 0;
+
+  length = NUM2INT(rb_funcall(str, rb_intern("length"), 0));
+
+  memcpy(ptr, StringValuePtr(str), length);
+  return length;
+}
+
+int rb_ogg_seek(void *datasource, ogg_int64_t offset, int whence) {
+  VALUE file = (VALUE)datasource;
+  if(rb_respond_to(file, rb_intern("seek")) == Qtrue) {
+    return NUM2INT(rb_funcall( file,
+                rb_intern("seek"),
+                2,
+                INT2NUM(offset),
+                INT2NUM(whence)));
+  }
+  return -1;
+}
+
+int rb_ogg_close(void *datasource) {
+  VALUE file = (VALUE)datasource;
+  rb_funcall(file, rb_intern("close"), 0);
+  return 0;
+}
+
+long rb_ogg_tell(void *datasource) {
+  VALUE file = (VALUE)datasource;
+  return NUM2LONG(rb_funcall(file, rb_intern("tell"), 0));
+}
+
+/*
+ * call-seq:
+ *    decoder.decode(input_io, output_io)
+ *
+ * Decode the input IO and write it to the output IO.
+ */
+VALUE method_ogg_decode(VALUE self, VALUE infile, VALUE outf) {
+  OggVorbis_File vf;
+  ov_callbacks callbacks;
+  int bs = 0;
+  char buf[8192];
+  int buflen = 8192;
+  unsigned int written = 0;
+  int ret;
+  ogg_int64_t length = 0;
+  int seekable = 0;
+  VALUE raw;
+  char headbuf[44];
+  VALUE bits;
+  VALUE endian;
+  VALUE sign;
+
+  raw = rb_iv_get(self, "@raw");
+  if(raw == Qnil) {
+    raw = Qfalse;
+    rb_iv_set(self, "@raw", Qfalse);
+  }
+
+  bits = rb_iv_get(self, "@bits");
+  if(bits == Qnil) {
+    bits = INT2NUM(16);
+    rb_iv_set(self, "@bits", INT2NUM(16));
+  }
+
+  endian = rb_iv_get(self, "@endian");
+  if(endian == Qnil) {
+    rb_iv_set(self, "@endian", INT2NUM(0));
+    endian = INT2NUM(0);
+  }
+
+  sign = rb_iv_get(self, "@sign");
+  if(sign == Qnil) {
+    rb_iv_set(self, "@sign", INT2NUM(1));
+    sign = INT2NUM(1);
+  }
+
+  callbacks.read_func   = rb_ogg_read;
+  callbacks.seek_func   = rb_ogg_seek;
+  callbacks.close_func  = rb_ogg_close;
+  callbacks.tell_func   = rb_ogg_tell;
+
+  if(ov_open_callbacks((void *)infile, &vf, NULL, 0, callbacks) < 0) {
+    rb_raise(rb_eRuntimeError, "Failed to open input as vorbis.\n");
+  }
+
+  if(ov_seekable(&vf)) {
+    seekable = 1;
+    length = ov_pcm_total(&vf, 0);
+  }
+
+  if(!raw) {
+    prelim_header(  self,
+                    headbuf,
+                    0x7fffffff,
+                    length,
+                    ov_info(&vf,0)->channels,
+                    ov_info(&vf,0)->rate );
+
+    rb_funcall(outf, rb_intern("write"), 1, rb_str_new(headbuf, 44));
+  }
+
+  while((ret = ov_read(&vf, buf, buflen, NUM2INT(endian), NUM2INT(bits)/8, NUM2INT(sign), &bs)) != 0) {
+    if(bs !=0) {
+      rb_raise(rb_eRuntimeError,
+          "Only one logical bitstream currently supported.\n");
+    }
+
+    if(ret) {
+      rb_funcall(outf, rb_intern("write"), 1, rb_str_new(buf, ret));
+      written += ret;
+    }
+  }
+
+  if(seekable && !raw) {
+    rewrite_header(headbuf, written);
+    rb_funcall( outf,
+                rb_intern("seek"),
+                2,
+                INT2NUM(0),
+                rb_const_get(rb_cIO, rb_intern("SEEK_SET")) );
+    rb_funcall(outf, rb_intern("write"), 1, rb_str_new(headbuf, 44));
+  }
+
+  ov_clear(&vf);
+
+  return Qnil;
+}

data/ext/rb_wav.c

@@ -0,0 +1,51 @@
+#include <ruby.h>
+#include <rb_wav.h>
+
+#define WRITE_U32(buf, x) *(buf)     = (unsigned char)((x)&0xff);\
+                          *((buf)+1) = (unsigned char)(((x)>>8)&0xff);\
+                          *((buf)+2) = (unsigned char)(((x)>>16)&0xff);\
+                          *((buf)+3) = (unsigned char)(((x)>>24)&0xff);
+
+#define WRITE_U16(buf, x) *(buf)     = (unsigned char)((x)&0xff);\
+                          *((buf)+1) = (unsigned char)(((x)>>8)&0xff);
+
+/* Some of this based on ao/src/ao_wav.c */
+void prelim_header( VALUE self,
+                    char *headbuf,
+                    unsigned int size,   /* 0x7fffffff */
+                    ogg_int64_t knownlength,
+                    int channels,
+                    int samplerate
+                    ) {
+  VALUE bits = rb_iv_get(self, "@bits");
+  int bytespersec = channels*samplerate*NUM2INT(bits)/8;
+  int align = channels*NUM2INT(bits)/8;
+  int samplesize = NUM2INT(bits);
+  
+  if(knownlength && knownlength*NUM2INT(bits)/8*channels < size)
+      size = (unsigned int)(knownlength*NUM2INT(bits)/8*channels+44) ;
+  
+  memcpy(headbuf, "RIFF", 4);
+  WRITE_U32(headbuf+4, size-8);
+  memcpy(headbuf+8, "WAVE", 4);
+  memcpy(headbuf+12, "fmt ", 4);
+  WRITE_U32(headbuf+16, 16);
+  WRITE_U16(headbuf+20, 1); /* format */
+  WRITE_U16(headbuf+22, channels);
+  WRITE_U32(headbuf+24, samplerate);
+  WRITE_U32(headbuf+28, bytespersec);
+  WRITE_U16(headbuf+32, align);
+  WRITE_U16(headbuf+34, samplesize);
+  memcpy(headbuf+36, "data", 4);
+  WRITE_U32(headbuf+40, size - 44);
+}
+
+void rewrite_header(char *headbuf, unsigned int written) 
+{
+    unsigned int length = written;
+
+    length += 44;
+
+    WRITE_U32(headbuf+4, length-8);
+    WRITE_U32(headbuf+40, length-44);
+}

data/ext/rb_wav.h

@@ -0,0 +1,11 @@
+#include <ogg/ogg.h>
+#include <vorbis/vorbisfile.h>
+
+void prelim_header( VALUE self,
+                    char *headbuf,
+                    unsigned int size,   /* 0x7fffffff */
+                    ogg_int64_t knownlength,
+                    int channels,
+                    int samplerate
+                    );
+void rewrite_header(char *headbuf, unsigned int written);

data/lib/icanhasaudio/mpeg.rb

@@ -0,0 +1,12 @@
+class Audio::MPEG::Decoder
+  attr_reader :stereo, :samplerate, :bitrate, :mode, :mode_ext, :framesize
+
+  # Number of bits, 8 or 16
+  attr_accessor :bits
+
+  def initialize
+    @bits = 16
+    yield self if block_given?
+  end
+end
+

data/lib/icanhasaudio/ogg.rb

@@ -0,0 +1,21 @@
+class Audio::OGG::Decoder
+  # Set to true for no WAV header
+  attr_accessor :raw
+
+  # Number of bits, 8 or 16
+  attr_accessor :bits
+
+  # Endianness
+  attr_accessor :endian
+
+  # Signedness
+  attr_accessor :sign
+
+  def initialize
+    @raw    = false
+    @bits   = 16
+    @endian = 0
+    @sign   = 1
+    yield self if block_given?
+  end
+end

metadata

@@ -1,21 +1,22 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
+rubygems_version: 0.9.0
 specification_version: 1
 name: icanhasaudio
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
-date: 2007-07-11 00:00:00 -07:00
-summary: icanhasaudio is a wrappers lame for decoding ur mp3s.
+  version: 0.0.2
+date: 2007-07-28 00:00:00 -07:00
+summary: icanhasaudio is a lame/vorbis wrapper for decoding ur mp3s and ur oggs.
 require_paths: 
+  - lib
   - ext
 email: aaronp@rubyforge.org
 homepage: http://seattlerb.rubyforge.org/
 rubyforge_project: seattlerb
 description: "Hai! icanhasaudio? is an interface to lame for decoding ur MP3s.  I iz in ur
-  computer. Decodin ur mp3s.  == SYNOPSYS ROFLOL  require 'icanhasaudio'  reader =
-  Audio::MPEG::Decoder.new File.open(ARGV[0], 'rb') { |input_lol|
-  File.open(ARGV[1], 'wb') { |output_lol| reader.decode(input_lol, output_lol) }
-  }"
+  computer. Decodin ur mp3s.  Whatevs!  I also decodin ur OGGz!  == SYNOPSYS
+  ROFLOL  require 'icanhasaudio'  reader = Audio::MPEG::Decoder.new
+  File.open(ARGV[0], 'rb') { |input_lol| File.open(ARGV[1], 'wb') { |output_lol|
+  reader.decode(input_lol, output_lol) } }"
 autorequire: 
 default_executable: 
 bindir: bin
@@ -47,8 +48,13 @@ files:
   - ext/get_audio.c
   - ext/get_audio.h
   - ext/icanhasaudio.c
+  - ext/rb_ogg.c
+  - ext/rb_wav.c
+  - ext/rb_wav.h
   - ext/syncword.c
   - ext/syncword.h
+  - lib/icanhasaudio/mpeg.rb
+  - lib/icanhasaudio/ogg.rb
 test_files: []
 rdoc_options: 
   - "--main"
@@ -71,5 +77,5 @@ dependencies:
         - 
           - ">="
           - !ruby/object:Gem::Version 
-            version: 1.2.1
+            version: 1.2.2
       version: