icanhasaudio 0.1.1 → 0.1.2

data/ext/icanhasaudio/audio_mpeg_encoder.h

@@ -0,0 +1,8 @@
+#ifndef MPEG_ENCODER_H
+#define MPEG_ENCODER_H
+
+#include <native.h>
+
+void init_audio_mpeg_encoder();
+
+#endif

data/ext/{rb_ogg.c → icanhasaudio/audio_ogg_decoder.c}

@@ -1,9 +1,10 @@
-#include <ruby.h>
-#include <ogg/ogg.h>
-#include <vorbis/vorbisfile.h>
-#include <rb_wav.h>
+#include <native.h>
 
-size_t rb_ogg_read(void *ptr, size_t size, size_t nmemb, void *datasource) {
+static size_t rb_ogg_read(  void *ptr,
+                            size_t size,
+                            size_t nmemb,
+                            void *datasource)
+{
   VALUE file = (VALUE)datasource;
   VALUE str;
   size_t length;
@@ -29,24 +30,24 @@ int rb_ogg_seek(void *datasource, ogg_int64_t offset, int whence) {
   return -1;
 }
 
-int rb_ogg_close(void *datasource) {
+static 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) {
+static 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)
+ *    native_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) {
+VALUE native_decode(VALUE self, VALUE infile, VALUE outf) {
   OggVorbis_File vf;
   ov_callbacks callbacks;
   int bs = 0;
@@ -137,3 +138,11 @@ VALUE method_ogg_decode(VALUE self, VALUE infile, VALUE outf) {
 
   return Qnil;
 }
+void init_audio_ogg_decoder()
+{
+  VALUE rb_mAudio = rb_define_module("Audio");
+  VALUE rb_mOgg   = rb_define_module_under(rb_mAudio, "OGG");
+  VALUE klass     = rb_define_class_under(rb_mOgg, "Decoder", rb_cObject);
+
+  rb_define_private_method(klass, "native_decode", native_decode, 2);
+}

data/ext/icanhasaudio/audio_ogg_decoder.h

@@ -0,0 +1,8 @@
+#ifndef AUDIO_OGG_DECODER
+#define AUDIO_OGG_DECODER
+
+#include <native.h>
+
+void init_audio_ogg_decoder();
+
+#endif

data/ext/{extconf.rb → icanhasaudio/extconf.rb}

@@ -50,5 +50,5 @@ end
   end
 end
 
-dir_config('icanhasaudio')
-create_makefile('icanhasaudio')
+dir_config('icanhasaudio/native')
+create_makefile('icanhasaudio/native')

data/ext/{get_audio.c → icanhasaudio/get_audio.c}

@@ -1,9 +1,4 @@
-#include <ruby.h>
-#include <assert.h>
-#include <lame/lame.h>
-#include "get_audio.h"
-
-#define MAX_U_32_NUM 0xFFFFFFFF
+#include <native.h>
 
 static int
 get_audio_common(VALUE self, VALUE musicin,

data/ext/{get_audio.h → icanhasaudio/get_audio.h}

@@ -1,6 +1,8 @@
 #ifndef GET_AUDIO_H
 #define GET_AUDIO_H
 
+#include <native.h>
+
 #define MAX_U_32_NUM 0xFFFFFFFF
 int
 get_audio16(VALUE self, VALUE musicin, short buffer[2][1152],

data/ext/icanhasaudio/native.c

@@ -0,0 +1,9 @@
+#include <native.h>
+
+void Init_native()
+{
+  init_audio_mpeg_decoder();
+  init_audio_mpeg_decoder_mp3data();
+  init_audio_mpeg_encoder();
+  init_audio_ogg_decoder();
+}

data/ext/icanhasaudio/native.h

@@ -0,0 +1,21 @@
+#ifndef ICANHASAUDIO_H
+#define ICANHASAUDIO_H
+
+#include <ruby.h>
+#include <rubyio.h>
+#include <lame/lame.h>
+#include <dlfcn.h>
+#include <assert.h>
+#include <ogg/ogg.h>
+#include <vorbis/vorbisfile.h>
+
+#include <get_audio.h>
+#include <rb_wav.h>
+#include <audio_mpeg_decoder.h>
+#include <audio_mpeg_decoder_mp3data.h>
+#include <audio_mpeg_encoder.h>
+#include <audio_ogg_decoder.h>
+
+void Init_native();
+
+#endif

data/ext/{rb_wav.c → icanhasaudio/rb_wav.c}

@@ -1,5 +1,4 @@
-#include <ruby.h>
-#include <rb_wav.h>
+#include <native.h>
 
 #define WRITE_U32(buf, x) *(buf)     = (unsigned char)((x)&0xff);\
                           *((buf)+1) = (unsigned char)(((x)>>8)&0xff);\

data/ext/{rb_wav.h → icanhasaudio/rb_wav.h}

@@ -1,5 +1,4 @@
-#include <ogg/ogg.h>
-#include <vorbis/vorbisfile.h>
+#include <native.h>
 
 void prelim_header( VALUE self,
                     char *headbuf,

data/lib/icanhasaudio.rb

@@ -0,0 +1,4 @@
+require 'icanhasaudio/wav'
+require 'icanhasaudio/mpeg'
+require 'icanhasaudio/ogg'
+require 'icanhasaudio/native'

data/lib/icanhasaudio/mpeg.rb

@@ -1,25 +1,2 @@
 require 'icanhasaudio/mpeg/encoder'
-
-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
-    @raw = nil
-    yield self if block_given?
-  end
-
-  private
-  def attempt_rewind(outf)
-    begin
-      outf.seek(0, IO::SEEK_SET)
-      true
-    rescue
-      false
-    end
-  end
-end
-
+require 'icanhasaudio/mpeg/decoder'

data/lib/icanhasaudio/mpeg/decoder.rb

@@ -0,0 +1,95 @@
+module Audio
+  module MPEG
+    class Decoder
+      # Number of bits, 8 or 16
+      attr_accessor :bits
+      attr_reader :mp3data
+
+      def initialize
+        @bits       = 16
+        @raw        = false
+        @mp3data    = MP3Data.new
+        yield self if block_given?
+      end
+
+      def decode input, output
+        buf = skip_id3_header(input)
+
+        decode_headers_for(buf)
+        while !mp3data.header_parsed?
+          decode_headers_for(input.read(100))
+        end
+        mp3data.nsamp = MP3Data::MAX_U_32_NUM unless mp3data.total_frames > 0
+        wav = WAV::File.new(output)
+        wav.write_header(0x7FFFFFFF, 0, num_channels, in_samplerate) if !@raw
+        native_decode(input, wav)
+        if !@raw && attempt_rewind(wav)
+          wav.write_header(@wavsize + 44, 0, num_channels, in_samplerate)
+        end
+      end
+
+      private
+      ID3 = [73, 68, 51, 3].pack('C*')
+      AID = [65, 105, 68, 1].pack('C*')
+
+      def skip_id3_header input
+        header = input.read(4)
+        if header == ID3
+          puts "asdfadsf"
+          id3_len = input.read(6).unpack('C*')[2..-1].map { |chr|
+            chr & 127
+          }.inject(0) { |total,chr|
+            (total + chr) << 7
+          } >> 7
+          input.read(id3_len) # skip the ID3 tag
+          header = input.read(4)
+        end
+        raise "Found AiD header" if header == AID
+
+        while !syncword_mp123?(header)
+          header = header.slice(1..-1) + input.getc
+        end
+        header
+      end
+
+      def syncword_mp123? header
+        alb2 = [0, 7, 7, 7, 0, 7, 0, 0, 0, 0, 0, 8, 8, 8, 8, 8]
+        p_h = header.unpack('C*')
+        return false if p_h[0] & 0xFF != 0xFF # first 8 bits must be '1'
+        return false if p_h[1] & 0xE0 != 0xE0 # next 3 bits are also
+        return false if p_h[1] & 0x18 == 0x08 # no MPEG-1, -2, or -2.5
+        return false if p_h[1] & 0x06 == 0x00 # no Layer I, II and III
+        return false if p_h[1] & 0x06 == 0x03 * 2 # layer1 not supported
+        return false if p_h[1] & 0x06 == 0x02 * 2 # layer1 not supported
+        return false unless p_h[1] & 0x06 == 0x01 * 2 # incompatible layer
+        return false if p_h[2] & 0xF0 == 0xF0 # bad bitrate
+        return false if p_h[2] & 0x0C == 0x0C # no sample frequency
+
+        if( (p_h[1] & 0x18 == 0x18) && (p_h[1] & 0x06 == 0x04) )
+          if(abl2[p_h[2] >> 4] & (1 << (p_h[3] >> 6)) != 0)
+            return false
+          end
+        end
+        return false if p_h[3] & 3 == 2
+        true
+      end
+
+      def attempt_rewind outf
+        begin
+          outf.seek(0, IO::SEEK_SET)
+          true
+        rescue
+          false
+        end
+      end
+
+      def determine_samples_for infile
+        length = File.stat(infile.path).size
+        total_seconds = length * 8.0 / (1000.0 * mp3data.bitrate)
+        self.num_samples = (total_seconds * in_samplerate).to_i
+      end
+    end
+  end
+end
+
+

data/lib/icanhasaudio/ogg.rb

@@ -1,21 +1 @@
-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
+require 'icanhasaudio/ogg/decoder'

data/lib/icanhasaudio/ogg/decoder.rb

@@ -0,0 +1,31 @@
+module Audio
+  module OGG
+    class 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
+
+      ####
+      # Decode +input+ and write to +output+
+      def decode input, output
+        native_decode(input, output)
+      end
+    end
+  end
+end

data/lib/icanhasaudio/version.rb

@@ -0,0 +1,8 @@
+module Audio
+  module MPEG
+    class Decoder
+      VERSION = '0.1.2'
+    end
+  end
+end
+

data/lib/icanhasaudio/wav.rb

@@ -0,0 +1 @@
+require 'icanhasaudio/wav/file'

data/lib/icanhasaudio/wav/file.rb

@@ -0,0 +1,62 @@
+module Audio
+  module WAV
+    class File
+      attr_accessor :bits
+      def initialize io_or_path, mode = 'wb'
+        @io = io_or_path.is_a?(IO) ? io_or_path : File.open(io_or_path, mode)
+        @bits = 16
+        if block_given?
+          yield self
+          close
+        end
+      end
+
+      def write_header size, known_length, channels, samplerate
+        if known_length != 0 && known_length * bits / 8 * channels < size
+          size = known_length * bits / 8 * channels + 44
+        end
+
+        bytespersec = channels * samplerate * bits / 8
+        align = channels * bits / 8
+
+        header = [
+          'RIFF',
+          u32(size - 8),
+          'WAVE',
+          'fmt ',
+          u32(16),
+          u16(1),
+          u16(channels),
+          u32(samplerate),
+          u32(bytespersec),
+          u16(align),
+          u16(bits),
+          'data',
+          u32(size - 44),
+        ].join
+        @io.write header
+      end
+
+      def write *args
+        @io.write(*args)
+      end
+
+      def close *args
+        @io.close(*args)
+      end
+
+      def seek *args
+        @io.seek(*args)
+      end
+
+      private
+      def u32 num
+        [0, 8, 16, 24].map { |x| (num >> x) & 0xFF }.pack('C4')
+      end
+
+      def u16 num
+        [0, 8].map { |x| (num >> x) & 0xFF }.pack('C2')
+      end
+    end
+  end
+end

data/test/helper.rb

@@ -0,0 +1,15 @@
+require 'md5'
+require 'test/unit'
+require 'icanhasaudio'
+require 'tempfile'
+
+%w(../lib ../ext).each do |path|
+  $LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), path)))
+end
+
+module ICANHASAUDIO
+  class TestCase < Test::Unit::TestCase
+    MP3_FILE = File.dirname(__FILE__) + "/assets/icha.mp3"
+    undef :default_test
+  end
+end

data/test/mpeg/test_decoder.rb

@@ -0,0 +1,20 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'helper'))
+
+module Audio
+  module MPEG
+    class TestDecoder < ICANHASAUDIO::TestCase
+      def setup
+        @decoder = MPEG::Decoder.new
+      end
+
+      def test_decode
+        out = "#{Dir::tmpdir}/out.wav"
+        File.open(out, 'wb+') { |outfile|
+          @decoder.decode(File.open(MP3_FILE, 'rb'), outfile)
+        }
+        digest = Digest::MD5.hexdigest(File.read(out))
+        #assert_equal '9a55bcdda77ec7c20f32031632927403', digest
+      end
+    end
+  end
+end