icanhasaudio 0.1.0 → 0.1.1

data/History.txt

@@ -1,17 +1,22 @@
-== 0.1.0
+=== 0.1.1
+
+* 1 Bugfix
+  * Only rewinding output files if its possible.
+
+=== 0.1.0
 
 * 1 major enhancement
   * Added MPEG Encoder
 
-== 0.0.3
+=== 0.0.3
 * 1 minor enhancement
   * Fixed extconf to be a little more smart.
 
-== 0.0.2
+=== 0.0.2
 * 1 major enhancement
   * I can has ogg decoder!
 
-== 0.0.1 / 2007-07-10
+=== 0.0.1 / 2007-07-10
 
 * 1 major enhancement
   * I can has birfday!

data/Rakefile

@@ -4,14 +4,13 @@ $LOAD_PATH.unshift File.join(File.dirname(__FILE__), "lib")
 
 kind = Config::CONFIG["DLEXT"]
 
-Hoe.new('icanhasaudio', '0.1.0') do |p|
+Hoe.new('icanhasaudio', '0.1.1') do |p|
   p.rubyforge_name  = 'seattlerb'
   p.author          = 'Aaron Patterson'
   p.email           = 'aaronp@rubyforge.org'
   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")
   p.spec_extras     = { :extensions => ['ext/extconf.rb'] }
   p.clean_globs     = ["ext/Makefile", "ext/*.{o,so,bundle,log}"]
 end

data/examples/kexp.rb

@@ -17,7 +17,7 @@ decoder = Thread.new(rd, wr) { |read, write|
 
 sleep 2
 
-raop = Net::RAOP::Client.new('192.168.1.173')
+raop = Net::RAOP::Client.new('10.0.1.1')
 raop.connect
 raop.play rd
 raop.disconnect

data/ext/decoder.c

@@ -86,13 +86,7 @@ lame_decoder(VALUE self, VALUE infile, VALUE outf, mp3data_struct * mp3data)
       wavsize *= i;
   }
 
-  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")) );
-
+  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));
   }

data/ext/icanhasaudio.c

@@ -163,8 +163,8 @@ void Init_icanhasaudio() {
   rb_mOgg = rb_define_module_under(rb_mAudio, "OGG");
   rb_cOggDecoder = rb_define_class_under(rb_mOgg, "Decoder", rb_cObject);
 
-  /* VERSION = '0.1.0' */
-  rb_define_const(rb_cDecoder, "VERSION", rb_str_new2("0.1.0"));
+  /* VERSION = '0.1.1' */
+  rb_define_const(rb_cDecoder, "VERSION", rb_str_new2("0.1.1"));
   rb_define_singleton_method(
       rb_cDecoder,
       "lame_version",

data/ext/mpeg_encoder.c

@@ -296,6 +296,12 @@ static VALUE MpegEncoder_set_genre(VALUE self, VALUE genre) {
 
 /* Private methods. */
 
+/*
+ * call-seq:
+ *    encoder.write_vbr_tag
+ *
+ * Write the vbr tag
+ */
 static VALUE MpegEncoder_write_vbr_tag(VALUE self) {
   lame_global_flags * gfp;
 
@@ -305,6 +311,12 @@ static VALUE MpegEncoder_write_vbr_tag(VALUE self) {
   return Qfalse;
 }
 
+/*
+ * call-seq:
+ *    encoder.print_internals
+ *
+ * Print the lame internals.  For debugging
+ */
 static VALUE MpegEncoder_print_internals(VALUE self) {
   lame_global_flags * gfp;
 
@@ -313,6 +325,12 @@ static VALUE MpegEncoder_print_internals(VALUE self) {
   return Qnil;
 }
 
+/*
+ * call-seq:
+ *    encoder.mpeg_quality
+ *
+ * Get the mpeg quality
+ */
 static VALUE MpegEncoder_get_mpeg_quality(VALUE self) {
   lame_global_flags * gfp;
 
@@ -320,6 +338,12 @@ static VALUE MpegEncoder_get_mpeg_quality(VALUE self) {
   return INT2NUM(lame_get_quality(gfp));
 }
 
+/*
+ * call-seq:
+ *    encoder.compression_ratio
+ *
+ * Get the mpeg compression ratio
+ */
 static VALUE MpegEncoder_get_compression_ratio(VALUE self) {
   lame_global_flags * gfp;
 
@@ -327,6 +351,12 @@ static VALUE MpegEncoder_get_compression_ratio(VALUE self) {
   return rb_float_new(lame_get_compression_ratio(gfp));
 }
 
+/*
+ * call-seq:
+ *    encoder.mpeg_verison
+ *
+ * Get the mpeg version
+ */
 static VALUE MpegEncoder_get_mpeg_version(VALUE self) {
   lame_global_flags * gfp;
 
@@ -334,6 +364,12 @@ static VALUE MpegEncoder_get_mpeg_version(VALUE self) {
   return INT2NUM(lame_get_version(gfp));
 }
 
+/*
+ * call-seq:
+ *    encoder.mpeg_mode
+ *
+ * Get the mpeg mode
+ */
 static VALUE MpegEncoder_get_mpeg_mode(VALUE self) {
   lame_global_flags * gfp;
 
@@ -341,6 +377,12 @@ static VALUE MpegEncoder_get_mpeg_mode(VALUE self) {
   return INT2NUM(lame_get_mode(gfp));
 }
 
+/*
+ * call-seq:
+ *    encoder.force_ms
+ *
+ * Get the force ms flag
+ */
 static VALUE MpegEncoder_get_force_ms(VALUE self) {
   lame_global_flags * gfp;
 
@@ -348,6 +390,12 @@ static VALUE MpegEncoder_get_force_ms(VALUE self) {
   return INT2NUM(lame_get_force_ms(gfp));
 }
 
+/*
+ * call-seq:
+ *    encoder.out_samplerate
+ *
+ * Get the out samplerate
+ */
 static VALUE MpegEncoder_get_out_samplerate(VALUE self) {
   lame_global_flags * gfp;
 
@@ -355,6 +403,12 @@ static VALUE MpegEncoder_get_out_samplerate(VALUE self) {
   return INT2NUM(lame_get_out_samplerate(gfp));
 }
 
+/*
+ * call-seq:
+ *    encoder.in_samplerate=
+ *
+ * Set the input samplerate
+ */
 static VALUE MpegEncoder_set_in_samplerate(VALUE self, VALUE samplerate) {
   lame_global_flags * gfp;
 
@@ -363,6 +417,12 @@ static VALUE MpegEncoder_set_in_samplerate(VALUE self, VALUE samplerate) {
   return samplerate;
 }
 
+/*
+ * call-seq:
+ *    encoder.num_samples=
+ *
+ * Set the number of samples
+ */
 static VALUE MpegEncoder_set_num_samples(VALUE self, VALUE num_samples) {
   lame_global_flags * gfp;
 
@@ -371,6 +431,12 @@ static VALUE MpegEncoder_set_num_samples(VALUE self, VALUE num_samples) {
   return num_samples;
 }
 
+/*
+ * call-seq:
+ *    encoder.num_samples
+ *
+ * Get the number of samples
+ */
 static VALUE MpegEncoder_get_num_samples(VALUE self) {
   lame_global_flags * gfp;
 
@@ -378,6 +444,12 @@ static VALUE MpegEncoder_get_num_samples(VALUE self) {
   return ULONG2NUM(lame_get_num_samples(gfp));
 }
 
+/*
+ * call-seq:
+ *    encoder.num_channels=
+ *
+ * Set the number of channels
+ */
 static VALUE MpegEncoder_set_num_channels(VALUE self, VALUE num_channels) {
   lame_global_flags * gfp;
 
@@ -386,6 +458,12 @@ static VALUE MpegEncoder_set_num_channels(VALUE self, VALUE num_channels) {
   return num_channels;
 }
 
+/*
+ * call-seq:
+ *    encoder.num_channels
+ *
+ * Get the number of channels
+ */
 static VALUE MpegEncoder_get_num_channels(VALUE self) {
   lame_global_flags * gfp;
 
@@ -393,6 +471,12 @@ static VALUE MpegEncoder_get_num_channels(VALUE self) {
   return INT2NUM(lame_get_num_channels(gfp));
 }
 
+/*
+ * call-seq:
+ *    encoder.framesize
+ *
+ * Get the framesize
+ */
 static VALUE MpegEncoder_get_framesize(VALUE self) {
   lame_global_flags * gfp;
 
@@ -400,6 +484,12 @@ static VALUE MpegEncoder_get_framesize(VALUE self) {
   return INT2NUM(lame_get_framesize(gfp));
 }
 
+/*
+ * call-seq:
+ *    encoder.encoder_buffer(left, right)
+ *
+ * Get the encoder buffer
+ */
 static VALUE MpegEncoder_encoder_buffer(VALUE self, VALUE left, VALUE right) {
   unsigned char mp3buffer[LAME_MAXMP3BUFFER];
   int * buffer_left;
@@ -434,6 +524,12 @@ static VALUE MpegEncoder_encoder_buffer(VALUE self, VALUE left, VALUE right) {
   return rb_str_new(mp3buffer, imp3);
 }
 
+/*
+ * call-seq:
+ *    encoder.flush
+ *
+ * Flush the encoder
+ */
 static VALUE MpegEncoder_flush(VALUE self) {
   unsigned char mp3buffer[LAME_MAXMP3BUFFER];
   int imp3;
@@ -450,6 +546,12 @@ static VALUE MpegEncoder_flush(VALUE self) {
   return rb_str_new(mp3buffer, imp3);
 }
 
+/*
+ * call-seq:
+ *    encoder.write_vbr_tags(outfile)
+ *
+ * Write the VBR tags to +outfile+
+ */
 static VALUE MpegEncoder_write_vbr_tags(VALUE self, VALUE outfile) {
   OpenFile *fp;
   lame_global_flags * gfp;
@@ -461,6 +563,12 @@ static VALUE MpegEncoder_write_vbr_tags(VALUE self, VALUE outfile) {
   return Qnil;
 }
 
+/*
+ * call-seq:
+ *    encoder.init_params
+ *
+ * Initialize lame parameters.
+ */
 static VALUE MpegEncoder_init_params(VALUE self) {
   lame_global_flags * gfp;
 

data/lib/icanhasaudio/mpeg.rb

@@ -8,7 +8,18 @@ class Audio::MPEG::Decoder
 
   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
 

data/lib/icanhasaudio/mpeg/encoder.rb

@@ -92,149 +92,164 @@ module Audio
 
       def parse_header(file)
         header = file.read(4).unpack('N').first
-        case header
-        when WAV_ID_RIFF # Wave file
-          parse_wave_header(file)
-        when IFF_ID_FORM # AIFF file
-          parse_aiff_header(file)
-        else
-          $stderr.puts "Assuming RAW PCM"
-          file.rewind
+        info =  case header
+                when WAV_ID_RIFF # Wave file
+                  info = self.class.parse_wave_header(file)
+                when IFF_ID_FORM # AIFF file
+                  info = self.class.parse_aiff_header(file)
+                else
+                  $stderr.puts "Assuming RAW PCM"
+                  file.rewind
+                  nil
+                end
+        if info
+          self.num_channels   = info[:num_channels]
+          self.in_samplerate  = info[:in_samplerate]
+          self.num_samples    = info[:num_samples]
+          self.pcmbitwidth    = info[:bit_width]
         end
       end
 
-      def parse_aiff_header(file)
-        chunk_size  = file.read(4).unpack('N').first
-        type_id     = file.read(4).unpack('N').first
-
-        raise unless [IFF_ID_AIFF, IFF_ID_AIFC].any? { |x| type_id == x }
-
-        sub_size = 0
-        sample_type = nil
-        sample_size = nil
-        num_channels = nil
-        block_size = nil
-        sample_rate = nil
-        is_aiff = false
-        while chunk_size > 0
-          type = file.read(4).unpack('N').first
-          chunk_size -= 4
-
-          case type
-          when IFF_ID_COMM
-            sub_size = file.read(4).unpack('N').first
+      public
+      class << self
+        def parse_aiff_header(file)
+          chunk_size  = file.read(4).unpack('N').first
+          type_id     = file.read(4).unpack('N').first
+
+          raise unless [IFF_ID_AIFF, IFF_ID_AIFC].any? { |x| type_id == x }
+
+          sub_size = 0
+          sample_type = nil
+          sample_size = nil
+          num_channels = nil
+          block_size = nil
+          sample_rate = nil
+          is_aiff = false
+          while chunk_size > 0
+            type = file.read(4).unpack('N').first
             chunk_size -= 4
 
-            num_channels = file.read(2).unpack('n').first
-            sub_size -= 2
-            num_sample_frames = file.read(4).unpack('N').first
-            sub_size -= 4
-            sample_size = file.read(2).unpack('n').first
-            sub_size -= 2
-            sample_rate = unpack_ieee(file.read(10))
-            sub_size -= 10
-
-            if type_id == IFF_ID_AIFC
-              data_type = file.read(4).unpack('N').first
-              sub_size -=4
-
-              raise unless [  IFF_ID_2CLE,
-                              IFF_ID_2CBE,
-                              IFF_ID_NONE,
-              ].any? { |x| data_type == x }
-
-              #if sample_size == 16
-              # swap bytes....
+            case type
+            when IFF_ID_COMM
+              sub_size = file.read(4).unpack('N').first
+              chunk_size -= 4
+
+              num_channels = file.read(2).unpack('n').first
+              sub_size -= 2
+              num_sample_frames = file.read(4).unpack('N').first
+              sub_size -= 4
+              sample_size = file.read(2).unpack('n').first
+              sub_size -= 2
+              sample_rate = unpack_ieee(file.read(10))
+              sub_size -= 10
+
+              if type_id == IFF_ID_AIFC
+                data_type = file.read(4).unpack('N').first
+                sub_size -=4
+
+                raise unless [  IFF_ID_2CLE,
+                                IFF_ID_2CBE,
+                                IFF_ID_NONE,
+                ].any? { |x| data_type == x }
+
+                #if sample_size == 16
+                # swap bytes....
+              end
+
+              file.read(sub_size)
+            when IFF_ID_SSND
+              sub_size = file.read(4).unpack('N').first
+              chunk_size -= sub_size
+
+              block_offset = file.read(4).unpack('N').first
+              sub_size -= 4
+              block_size = file.read(4).unpack('N').first
+              sub_size -= 4
+
+              sample_type = IFF_ID_SSND
+              file.read(block_offset)
+              is_aiff = true
+              break
+            else
+              sub_size = file.read(4).unpack('N').first
+              chunk_size -= sub_size
+              file.read(sub_size)
             end
-
-            file.read(sub_size)
-          when IFF_ID_SSND
-            sub_size = file.read(4).unpack('N').first
-            chunk_size -= sub_size
-
-            block_offset = file.read(4).unpack('N').first
-            sub_size -= 4
-            block_size = file.read(4).unpack('N').first
-            sub_size -= 4
-
-            sample_type = IFF_ID_SSND
-            file.read(block_offset)
-            is_aiff = true
-            break
-          else
-            sub_size = file.read(4).unpack('N').first
-            chunk_size -= sub_size
-            file.read(sub_size)
           end
-        end
 
-        # Validate the header
-        if is_aiff
-          raise "Sound data is not PCM" unless sample_type == IFF_ID_SSND
-          raise "Sound data is not 16 bits" unless sample_size == 16
-          unless num_channels == 1 || num_channels == 2
-            raise "Sound data is not mono or stereo" 
+          # Validate the header
+          if is_aiff
+            raise "Sound data is not PCM" unless sample_type == IFF_ID_SSND
+            raise "Sound data is not 16 bits" unless sample_size == 16
+            unless num_channels == 1 || num_channels == 2
+              raise "Sound data is not mono or stereo" 
+            end
+            raise "Block size is not 0 bytes" unless block_size == 0
           end
-          raise "Block size is not 0 bytes" unless block_size == 0
-        end
 
-        @pcmbitwidth = sample_size
-        self.num_channels = num_channels
-        self.in_samplerate = sample_rate.to_i
-        self.num_samples = num_sample_frames
-      end
+          {
+            :num_channels   => num_channels,
+            :in_samplerate  => simple_rate.to_i,
+            :num_samples    => num_sample_frames,
+            :bit_width      => sample_size,
+          }
+        end
 
-      def unpack_ieee(data)
-        (expon, hi_mant, lo_mant) = data.unpack('nNN')
-        expon -= 16383
-        hi_mant * (2 ** (expon -= 31)) + lo_mant * (2 ** (expon -= 32))
-      end
+        def unpack_ieee(data)
+          (expon, hi_mant, lo_mant) = data.unpack('nNN')
+          expon -= 16383
+          hi_mant * (2 ** (expon -= 31)) + lo_mant * (2 ** (expon -= 32))
+        end
 
-      def parse_wave_header(file)
-        format_tag        = nil
-        channels          = nil
-        samples_per_sec   = nil
-        avg_bytes_per_sec = nil
-        block_align       = nil
-        bits_per_sample   = nil
-        is_wav            = false
-        data_length       = 0
-
-        file_length = file.read(4).unpack('N').first
-        raise "Corrupt wave" if file.read(4).unpack('N').first != WAV_ID_WAVE
-        20.times {
-          type = file.read(4).unpack('N').first
-          case type
-          when WAV_ID_FMT
-            sub_size = file.read(4).unpack('V').first
-            raise "Corrupt wave" if sub_size < 16
-
-            ( format_tag,
-              channels, 
-              samples_per_sec,
-              avg_bytes_per_sec,
-              block_align, bits_per_sample) = *(file.read(16).unpack('vvVVvv'))
-            sub_size -= 16
-
-            file.read(sub_size) if sub_size > 0
-          when WAV_ID_DATA
-            sub_size = file.read(4).unpack('V').first
-            data_length = sub_size
-            is_wav = true
-            break;
-          else
-            sub_size = file.read(4).unpack('V').first
-            file.read(sub_size)
-          end
-        }
-        raise "Unsupported format" unless format_tag == 1
-        raise unless is_wav
-
-        self.num_channels = channels
-        self.in_samplerate = samples_per_sec
-        self.num_samples = data_length / (channels * ((bits_per_sample+7)/8))
-        @pcmbitwidth = bits_per_sample
-        is_wav
+        def parse_wave_header(file)
+          format_tag        = nil
+          channels          = nil
+          samples_per_sec   = nil
+          avg_bytes_per_sec = nil
+          block_align       = nil
+          bits_per_sample   = nil
+          is_wav            = false
+          data_length       = 0
+
+          file_length = file.read(4).unpack('N').first
+          raise "Corrupt wave" if file.read(4).unpack('N').first != WAV_ID_WAVE
+          20.times {
+            type = file.read(4).unpack('N').first
+            case type
+            when WAV_ID_FMT
+              sub_size = file.read(4).unpack('V').first
+              raise "Corrupt wave" if sub_size < 16
+
+              ( format_tag,
+                channels, 
+                samples_per_sec,
+                avg_bytes_per_sec,
+                block_align, bits_per_sample) = *(file.read(16).unpack('vvVVvv'))
+              sub_size -= 16
+
+              file.read(sub_size) if sub_size > 0
+            when WAV_ID_DATA
+              sub_size = file.read(4).unpack('V').first
+              data_length = sub_size
+              is_wav = true
+              break;
+            else
+              sub_size = file.read(4).unpack('V').first
+              file.read(sub_size)
+            end
+          }
+          raise "Unsupported format" unless format_tag == 1
+          raise unless is_wav
+
+          {
+            :num_channels   => channels,
+            :in_samplerate  => samples_per_sec,
+            :bytes_in_seconds => data_length,
+            :milliseconds   => (data_length/2)/(samples_per_sec/1000)/2,
+            :num_samples    => data_length / (channels*((bits_per_sample+7)/8)),
+            :bit_width      => bits_per_sample,
+          }
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: icanhasaudio
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Aaron Patterson
@@ -9,17 +9,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-15 00:00:00 -08:00
+date: 2008-08-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hoe
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.0
+        version: 1.7.0
     version: 
 description: Hai! icanhasaudio? is an interface to lame for decoding ur MP3s.  I iz in ur computer. Decodin ur mp3s.  Whatevs!  I also decodin ur OGGz!  I kin also encodin' ur WAV and AIFF to mp3z!  == 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) } }
 email: aaronp@rubyforge.org
@@ -84,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: seattlerb
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: icanhasaudio is a lame/vorbis wrapper for decoding ur mp3s and ur oggs.