icanhasaudio 0.1.1 → 0.1.2

data/test/test_mpeg_encoder.rb

@@ -1,8 +1,6 @@
-require 'test/unit'
-require 'icanhasaudio'
-require 'tempfile'
+require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
 
-class MPEGEncoderTest < Test::Unit::TestCase
+class MPEGEncoderTest < ICANHASAUDIO::TestCase
   include Audio::MPEG
 
   WAV_FILE = File.dirname(__FILE__) + "/assets/testcase.wav"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: icanhasaudio
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Aaron Patterson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-04 00:00:00 -07:00
+date: 2008-09-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,7 +27,7 @@ email: aaronp@rubyforge.org
 executables: []
 
 extensions: 
-- ext/extconf.rb
+- ext/icanhasaudio/extconf.rb
 extra_rdoc_files: 
 - History.txt
 - LICENSE.txt
@@ -42,27 +42,39 @@ files:
 - examples/decoder.rb
 - examples/encoder.rb
 - examples/kexp.rb
-- ext/decoder.c
-- ext/decoder.h
-- ext/extconf.rb
-- ext/get_audio.c
-- ext/get_audio.h
-- ext/icanhasaudio.c
-- ext/icanhasaudio.h
-- ext/mpeg_encoder.c
-- ext/mpeg_encoder.h
-- ext/rb_ogg.c
-- ext/rb_wav.c
-- ext/rb_wav.h
-- ext/syncword.c
-- ext/syncword.h
+- ext/icanhasaudio/audio_mpeg_decoder.c
+- ext/icanhasaudio/audio_mpeg_decoder.h
+- ext/icanhasaudio/audio_mpeg_decoder_mp3data.c
+- ext/icanhasaudio/audio_mpeg_decoder_mp3data.h
+- ext/icanhasaudio/audio_mpeg_encoder.c
+- ext/icanhasaudio/audio_mpeg_encoder.h
+- ext/icanhasaudio/audio_ogg_decoder.c
+- ext/icanhasaudio/audio_ogg_decoder.h
+- ext/icanhasaudio/extconf.rb
+- ext/icanhasaudio/get_audio.c
+- ext/icanhasaudio/get_audio.h
+- ext/icanhasaudio/native.c
+- ext/icanhasaudio/native.h
+- ext/icanhasaudio/rb_wav.c
+- ext/icanhasaudio/rb_wav.h
+- lib/icanhasaudio.rb
 - lib/icanhasaudio/mpeg.rb
+- lib/icanhasaudio/mpeg/decoder.rb
 - lib/icanhasaudio/mpeg/encoder.rb
 - lib/icanhasaudio/ogg.rb
+- lib/icanhasaudio/ogg/decoder.rb
+- lib/icanhasaudio/version.rb
+- lib/icanhasaudio/wav.rb
+- lib/icanhasaudio/wav/file.rb
+- test/assets/icha.mp3
 - test/assets/testcase.wav
+- test/helper.rb
+- test/mpeg/test_decoder.rb
 - test/test_mpeg_encoder.rb
 has_rdoc: true
-homepage: http://seattlerb.rubyforge.org/
+homepage: |
+  http://icanhasaudio.com/
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -90,4 +102,5 @@ signing_key:
 specification_version: 2
 summary: icanhasaudio is a lame/vorbis wrapper for decoding ur mp3s and ur oggs.
 test_files: 
+- test/mpeg/test_decoder.rb
 - test/test_mpeg_encoder.rb

data/ext/decoder.c

@@ -1,95 +0,0 @@
-#include <ruby.h>
-#include <lame/lame.h>
-#include <assert.h>
-#include <decoder.h>
-#include <get_audio.h>
-#include <rb_wav.h>
-
-int
-lame_decoder(VALUE self, VALUE infile, VALUE outf, mp3data_struct * mp3data)
-{
-  lame_global_flags * gfp;
-  short int Buffer[2][1152];
-  int     iread;
-  double  wavsize;
-  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;
-
-  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;
-
-  assert(tmp_num_channels >= 1 && tmp_num_channels <= 2);
-
-  do {
-    char BitBuffer16[1152 * 4];
-    int bit_16_i = 0;
-    int total = 0;
-    iread = get_audio16(self, infile, Buffer, mp3data);
-    mp3data->framenum += iread / mp3data->framesize;
-    wavsize += iread;
-
-    memset(&BitBuffer16, 0, 1152 * 4);
-
-    skip -= (i = skip < iread ? skip : iread); /* 'i' samples are to skip in this frame */
-
-    for (; i < iread; i++) {
-      /* Write the 0 channel */
-      BitBuffer16[bit_16_i] = Buffer[0][i] & 0xFF;
-      BitBuffer16[bit_16_i + 1] = ((Buffer[0][i] >> 8) & 0xFF);
-
-      if (tmp_num_channels == 2) {
-        BitBuffer16[bit_16_i + 2] = Buffer[1][i] & 0xFF;
-        BitBuffer16[bit_16_i + 3] = ((Buffer[1][i] >> 8) & 0xFF);
-        bit_16_i += 4;
-      } else {
-        bit_16_i += 2;
-      }
-    }
-    rb_funcall(outf, rb_intern("write"), 1, rb_str_new(BitBuffer16, bit_16_i));
-  } while (iread);
-
-  i = (16 / 8) * tmp_num_channels;
-  assert(i > 0);
-  if (wavsize <= 0) {
-      wavsize = 0;
-  }
-  else if (wavsize > 0xFFFFFFD0 / i) {
-      wavsize = 0xFFFFFFD0;
-  }
-  else {
-      wavsize *= i;
-  }
-
-  if(!raw && rb_funcall(self, rb_intern("attempt_rewind"), 1, outf)) {
-    rewrite_header(headbuf, (int)wavsize);
-    rb_funcall(outf, rb_intern("write"), 1, rb_str_new(headbuf, 44));
-  }
-  return 0;
-}
-

data/ext/decoder.h

@@ -1,3 +0,0 @@
-int
-lame_decoder(VALUE self, VALUE infile, VALUE outf, mp3data_struct * mp3data);
-

data/ext/icanhasaudio.c

@@ -1,183 +0,0 @@
-/*
- * Most of this code was take from the lame front end.  So thank you to the
- * lame team!  The good parts are theirs, the bad parts are mine.
- *
- * The rest of it is (c) 2007 Aaron Patterson <aaronp@tenderlovemaking.com>
- *
- * Released under the GPL
- */
-#include "icanhasaudio.h"
-#include "syncword.h"
-#include "decoder.h"
-#include "mpeg_encoder.h"
-#include "get_audio.h"
-
-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
- *
- * Returns a new MPEG Decoder object.
- */
-static VALUE
-reader_allocate(VALUE klass) {
-  int i = 0;
-  lame_global_flags * gfp = lame_init();
-  lame_set_decode_only(gfp, 1);
-  i = lame_init_params(gfp);
-
-  if(i < 0) {
-    rb_raise(rb_eRuntimeError, "Fatal error during initialization.\n");
-  }
-  lame_decode_init();
-  return Data_Wrap_Struct(klass, reader_mark, reader_free, gfp);
-}
-
-/*
- * call-seq:
- *    Audio::MPEG::Decoder.lame_version
- *
- * Returns the version of lame you are using.
- */
-static VALUE method_lame_version(VALUE klass) {
-  const char * version = get_lame_version();
-  return rb_str_new(version, strlen(version));
-}
-
-static int lame_decode_initfile(VALUE file, mp3data_struct * mp3data) {
-  unsigned char * buf;
-  VALUE str;
-  int len = 4;
-  int enc_delay;
-  int enc_padding;
-  int ret;
-  short int pcm_l[1152], pcm_r[1152];
-
-  str = rb_funcall(file, rb_intern("read"), 1, INT2NUM(len));
-  buf = StringValuePtr(str);
-  if(buf[0] == 'I' && buf[1] == 'D' && buf[2] == '3') {
-    len = 6;
-    str = rb_funcall(file, rb_intern("read"), 1, INT2NUM(len));
-    buf = StringValuePtr(str);
-
-    buf[2] &= 127; buf[3] &= 127; buf[4] &= 127; buf[5] &= 127;
-    len = (((((buf[2] << 7) + buf[3]) << 7) + buf[4]) << 7) + buf[5];
-
-    rb_funcall( file,
-                rb_intern("read"),
-                1,
-                INT2NUM(len));
-
-    len = 4;
-    str = rb_funcall(file, rb_intern("read"), 1, INT2NUM(len));
-    buf = StringValuePtr(str);
-
-    /* Check for Album ID */
-    if(0 == rb_str_cmp(str, rb_str_new2("AiD\1"))) {
-      /* FIXME */
-      rb_raise(rb_eRuntimeError, "Found Album ID.\n");
-    }
-
-    while (!is_syncword_mp123(buf)) {
-      int i;
-      for(i = 0; i < len - 1; i++) {
-        buf[i] = buf[i + 1];
-      }
-      buf[len - 1] = NUM2INT(rb_funcall(file, rb_intern("getc"), 0));
-    }
-
-    if ((buf[2] & 0xF0) == 0) {
-      printf("Input file is freeformat\n");
-    }
-
-    ret = lame_decode1_headersB(buf, len, pcm_l, pcm_r, mp3data, &enc_delay, &enc_padding);
-    if(ret == -1)
-      rb_raise(rb_eRuntimeError, "Decode headers failed.\n");
-
-    while(!mp3data->header_parsed) {
-      str = rb_funcall(file, rb_intern("read"), 1, INT2NUM(100));
-      buf = StringValuePtr(str);
-      ret = lame_decode1_headersB(buf, 100, pcm_l, pcm_r, mp3data,&enc_delay,&enc_padding);
-      if(ret == -1)
-        rb_raise(rb_eRuntimeError, "Decode headers failed.\n");
-    }
-
-    if(mp3data->totalframes > 0) {
-    } else {
-      mp3data->nsamp = MAX_U_32_NUM;
-    }
-  }
-  return 0;
-}
-
-/*
- * call-seq:
- *    decoder.decode(input_io, output_io)
- *
- * Decode the input IO and write it to the output IO.
- */
-static VALUE method_lame_decode(VALUE self, VALUE file, VALUE outf) {
-  mp3data_struct mp3data;
-  lame_global_flags * gfp;
-
-  memset(&mp3data, 0, sizeof(mp3data_struct));
-  lame_decode_initfile(file, &mp3data);
-
-  Data_Get_Struct (self, lame_global_flags, gfp);
-
-  rb_iv_set(self, "@stereo", INT2NUM(mp3data.stereo));
-  rb_iv_set(self, "@samplerate", INT2NUM(mp3data.samplerate));
-  rb_iv_set(self, "@bitrate", INT2NUM(mp3data.bitrate));
-  rb_iv_set(self, "@mode", INT2NUM(mp3data.mode));
-  rb_iv_set(self, "@mode_ext", INT2NUM(mp3data.mode_ext));
-  rb_iv_set(self, "@framesize", INT2NUM(mp3data.framesize));
-
-  lame_decoder(self, file, outf, &mp3data);
-
-  return Qnil;
-}
-
-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);
-
-  rb_mOgg = rb_define_module_under(rb_mAudio, "OGG");
-  rb_cOggDecoder = rb_define_class_under(rb_mOgg, "Decoder", rb_cObject);
-
-  /* VERSION = '0.1.1' */
-  rb_define_const(rb_cDecoder, "VERSION", rb_str_new2("0.1.1"));
-  rb_define_singleton_method(
-      rb_cDecoder,
-      "lame_version",
-      method_lame_version,
-      0
-  );
-
-  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);
-
-  init_MpegEncoder(rb_mMpeg);
-  rb_require("icanhasaudio/mpeg");
-  rb_require("icanhasaudio/ogg");
-}
-

data/ext/icanhasaudio.h

@@ -1,8 +0,0 @@
-#ifndef ICANHASAUDIO_H
-#define ICANHASAUDIO_H
-
-#include <ruby.h>
-#include <lame/lame.h>
-#include <dlfcn.h>
-
-#endif

data/ext/mpeg_encoder.h

@@ -1,10 +0,0 @@
-#ifndef MPEG_ENCODER_H
-#define MPEG_ENCODER_H
-
-#include "icanhasaudio.h"
-#include "get_audio.h"
-
-#define LAME_MAXMP3BUFFER 16384
-void init_MpegEncoder(VALUE mMpeg);
-
-#endif

data/ext/syncword.c

@@ -1,45 +0,0 @@
-/*
- * Taken from lame, get_audio.c
- */
-
-int is_syncword_mp123(const void *const headerptr)
-{
-    const unsigned char *const p = headerptr;
-    static const char abl2[16] =
-        { 0, 7, 7, 7, 0, 7, 0, 0, 0, 0, 0, 8, 8, 8, 8, 8 };
-
-    if ((p[0] & 0xFF) != 0xFF)
-        return 0;       /* first 8 bits must be '1' */
-    if ((p[1] & 0xE0) != 0xE0)
-        return 0;       /* next 3 bits are also */
-    if ((p[1] & 0x18) == 0x08)
-        return 0;       /* no MPEG-1, -2 or -2.5 */        
-    if ((p[1] & 0x06) == 0x00)
-        return 0;       /* no Layer I, II and III */
-#ifndef USE_LAYER_1
-    if ((p[1] & 0x06) == 0x03*2)
-	return 0; /* layer1 is not supported */
-#endif
-#ifndef USE_LAYER_2
-    if ((p[1] & 0x06) == 0x02*2)
-	return 0; /* layer1 is not supported */
-#endif
-    /*
-    if (!(((p[1] & 0x06) == 0x03*2 && input_format == sf_mp1)
-	  || ((p[1] & 0x06) == 0x02*2 && input_format == sf_mp2)
-	  || ((p[1] & 0x06) == 0x01*2 && input_format == sf_mp3)))
-    */
-	  if(!(p[1] & 0x06) == 0x01*2)
-	return 0; /* imcompatible layer with input file format */
-    if ((p[2] & 0xF0) == 0xF0)
-        return 0;       /* bad bitrate */
-    if ((p[2] & 0x0C) == 0x0C)
-        return 0;       /* no sample frequency with (32,44.1,48)/(1,2,4)     */
-    if ((p[1] & 0x18) == 0x18 && (p[1] & 0x06) == 0x04
-	&& abl2[p[2] >> 4] & (1 << (p[3] >> 6)))
-	return 0;
-    if ((p[3] & 3) == 2)
-	return 0;       /* reserved enphasis mode */
-    return 1;
-}
-