wahwah 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e3b8992dca29fbbe7a537a7d2ad23ca0fe33e9596dfbabb5131e615461d22b1
-  data.tar.gz: 58809228e4e9b7f2e40c48136f68cdd2f29939b8628e6690efd75e95cf7c0e88
+  metadata.gz: 9db3f9953fd6a1641859fa4d27912ed6fdd1eec6b5a137498e1d7fa669903ea4
+  data.tar.gz: 23f36dddc181188c98d77a546960273ed6dd4c1f2dc548d0214cc3f2feeac060
 SHA512:
-  metadata.gz: 501f86ff6b621bfb302b7503e05ef45a472c8faa8c128fc8cb15cf92cb35deca4e828d416bfb0e3bc750f63fb2b299cccabee9d9718729372225edb3e4618f9f
-  data.tar.gz: f1d7c0a92c982180f7041883137b6909c11a761d2da17564aaa4a758297d56db197ae1a1698d3028b8397864ab0673c1f7300acb4bcd6fcfda3d82a6dce1832e
+  metadata.gz: 31171f19be0c4777e0fdcaa03c8d02449856847eb205e5867f0d76f0c8e44b221e98c3808834623e4bd943c4f94b8728fef17c0ebc91f3371a5fb2ce636cb5a4
+  data.tar.gz: 810d6c29379773f93e61d905be863fbda4eb1b0fa0127b10e52d9357bf1faa267df71f0bebf09d8652733e73c057eecc5e2fd5aea3da2500ac496aa3cb9a774e

data/lib/wahwah/asf/object.rb

@@ -14,7 +14,7 @@ module WahWah
       prepend LazyRead
 
       HEADER_SIZE = 24
-      HEADER_FORMAT = 'a16Q<'
+      HEADER_FORMAT = "a16Q<"
 
       attr_reader :guid
 
@@ -22,7 +22,7 @@ module WahWah
         guid_bytes, @size = @file_io.read(HEADER_SIZE)&.unpack(HEADER_FORMAT)
         return unless valid?
 
-        @size = @size - HEADER_SIZE
+        @size -= HEADER_SIZE
         @guid = Helper.byte_string_to_guid(guid_bytes)
       end
 

data/lib/wahwah/asf_tag.rb

@@ -3,218 +3,219 @@
 module WahWah
   class AsfTag < Tag
     HEADER_OBJECT_CONTENT_SIZE = 6
-    HEADER_OBJECT_GUID = '75B22630-668E-11CF-A6D9-00AA0062CE6C'
-    FILE_PROPERTIES_OBJECT_GUID = '8CABDCA1-A947-11CF-8EE4-00C00C205365'
-    EXTENDED_CONTENT_DESCRIPTION_OBJECT_GUID = 'D2D0A440-E307-11D2-97F0-00A0C95EA850'
-    STREAM_PROPERTIES_OBJECT_GUID = 'B7DC0791-A9B7-11CF-8EE6-00C00C205365'
-    AUDIO_MEDIA_OBJECT_GUID = 'F8699E40-5B4D-11CF-A8FD-00805F5C442B'
-    CONTENT_DESCRIPTION_OBJECT_GUID = '75B22633-668E-11CF-A6D9-00AA0062CE6C'
+    HEADER_OBJECT_GUID = "75B22630-668E-11CF-A6D9-00AA0062CE6C"
+    FILE_PROPERTIES_OBJECT_GUID = "8CABDCA1-A947-11CF-8EE4-00C00C205365"
+    EXTENDED_CONTENT_DESCRIPTION_OBJECT_GUID = "D2D0A440-E307-11D2-97F0-00A0C95EA850"
+    STREAM_PROPERTIES_OBJECT_GUID = "B7DC0791-A9B7-11CF-8EE6-00C00C205365"
+    AUDIO_MEDIA_OBJECT_GUID = "F8699E40-5B4D-11CF-A8FD-00805F5C442B"
+    CONTENT_DESCRIPTION_OBJECT_GUID = "75B22633-668E-11CF-A6D9-00AA0062CE6C"
 
     EXTENDED_CONTENT_DESCRIPTOR_NAME_MAPPING = {
-      'WM/AlbumArtist' => :albumartist,
-      'WM/AlbumTitle' => :album,
-      'WM/Composer' => :composer,
-      'WM/Genre' => :genre,
-      'WM/PartOfSet' => :disc,
-      'WM/TrackNumber' => :track,
-      'WM/Year' => :year
+      "WM/AlbumArtist" => :albumartist,
+      "WM/AlbumTitle" => :album,
+      "WM/Composer" => :composer,
+      "WM/Genre" => :genre,
+      "WM/PartOfSet" => :disc,
+      "WM/TrackNumber" => :track,
+      "WM/Year" => :year
     }
 
     private
-      # ASF files are logically composed of three types of top-level objects:
-      # the Header Object, the Data Object, and the Index Object(s).
-      # The Header Object is mandatory and must be placed at the beginning of every ASF file.
-      # Of the three top-level ASF objects, the Header Object is the only one that contains other ASF objects.
-      # All Unicode strings in ASF uses UTF-16, little endian, and the Byte-Order Marker (BOM) character is not present.
-      def parse
-        header_object = Asf::Object.new(@file_io)
-        return unless header_object.valid?
 
-        total_header_object_size = header_object.size + Asf::Object::HEADER_SIZE
+    # ASF files are logically composed of three types of top-level objects:
+    # the Header Object, the Data Object, and the Index Object(s).
+    # The Header Object is mandatory and must be placed at the beginning of every ASF file.
+    # Of the three top-level ASF objects, the Header Object is the only one that contains other ASF objects.
+    # All Unicode strings in ASF uses UTF-16, little endian, and the Byte-Order Marker (BOM) character is not present.
+    def parse
+      header_object = Asf::Object.new(@file_io)
+      return unless header_object.valid?
 
-        return unless header_object.guid == HEADER_OBJECT_GUID
+      total_header_object_size = header_object.size + Asf::Object::HEADER_SIZE
 
-        # Header Object contains 6 bytes useless data, so skip it.
-        @file_io.seek(HEADER_OBJECT_CONTENT_SIZE, IO::SEEK_CUR)
+      return unless header_object.guid == HEADER_OBJECT_GUID
 
-        until total_header_object_size <= @file_io.pos
-          sub_object = Asf::Object.new(@file_io)
-          parse_sub_object(sub_object)
-        end
-      end
+      # Header Object contains 6 bytes useless data, so skip it.
+      @file_io.seek(HEADER_OBJECT_CONTENT_SIZE, IO::SEEK_CUR)
 
-      def parse_sub_object(sub_object)
-        case sub_object.guid
-        when FILE_PROPERTIES_OBJECT_GUID
-          parse_file_properties_object(sub_object)
-        when EXTENDED_CONTENT_DESCRIPTION_OBJECT_GUID
-          parse_extended_content_description_object(sub_object)
-        when STREAM_PROPERTIES_OBJECT_GUID
-          parse_stream_properties_object(sub_object)
-        when CONTENT_DESCRIPTION_OBJECT_GUID
-          parse_content_description_object(sub_object)
-        else
-          sub_object.skip
-        end
+      until total_header_object_size <= @file_io.pos
+        sub_object = Asf::Object.new(@file_io)
+        parse_sub_object(sub_object)
       end
-
-      # File Properties Object structure:
-      #
-      # Field name                Field type  Size (bits)
-      #
-      # Object ID                 GUID        128
-      # Object Size               QWORD       64
-      # File ID                   GUID        128
-      # File Size                 QWORD       64
-      # Creation Date             QWORD       64
-      # Data Packets Count        QWORD       64
-      # Play Duration             QWORD       64
-      # Send Duration             QWORD       64
-      # Preroll                   QWORD       64
-      # Flags                     DWORD       32
-      #   Broadcast Flag                      1 (LSB)
-      #   Seekable Flag                       1
-      #   Reserved                            30
-      # Minimum Data Packet Size  DWORD       32
-      # Maximum Data Packet Size  DWORD       32
-      # Maximum Bitrate DWORD                 32
-      #
-      # Play Duration Specifies the time needed to play the file in 100-nanosecond units.
-      # The value of this field is invalid if the Broadcast Flag bit in the Flags field is set to 1.
-      #
-      # Preroll Specifies the amount of time to buffer data before starting to play the file, in millisecond units.
-      # If this value is nonzero, the Play Duration field and all of the payload Presentation Time fields have been offset by this amount.
-      def parse_file_properties_object(object)
-        play_duration, preroll, flags = object.data.unpack('x40Q<x8Q<b32')
-        @duration = (play_duration / 10000000.0 - preroll / 1000.0).round if flags[0] == '0'
+    end
+
+    def parse_sub_object(sub_object)
+      case sub_object.guid
+      when FILE_PROPERTIES_OBJECT_GUID
+        parse_file_properties_object(sub_object)
+      when EXTENDED_CONTENT_DESCRIPTION_OBJECT_GUID
+        parse_extended_content_description_object(sub_object)
+      when STREAM_PROPERTIES_OBJECT_GUID
+        parse_stream_properties_object(sub_object)
+      when CONTENT_DESCRIPTION_OBJECT_GUID
+        parse_content_description_object(sub_object)
+      else
+        sub_object.skip
       end
-
-      # Extended Content Description Object structure:
-      #
-      # Field name                 Field type  Size (bits)
-      #
-      # Object ID                  GUID       128
-      # Object Size                QWORD      64
-      # Content Descriptors Count  WORD       16
-      # Content Descriptors        See text   varies
-      #
-      #
-      # The structure of each Content Descriptor:
-      #
-      # Field Name                  Field Type  Size (bits)
-      #
-      # Descriptor Name Length      WORD        16
-      # Descriptor Name             WCHAR       varies
-      # Descriptor Value Data Type  WORD        16
-      # Descriptor Value Length     WORD        16
-      # Descriptor Value            See text    varies
-      #
-      #
-      # Specifies the type of data stored in the Descriptor Value field.
-      # The types are defined in the following table.
-      #
-      # Value Type  Descriptor value  length
-      #
-      # 0x0000      Unicode string    varies
-      # 0x0001      BYTE array        varies
-      # 0x0002      BOOL              32
-      # 0x0003      DWORD             32
-      # 0x0004      QWORD             64
-      # 0x0005      WORD              16
-      def parse_extended_content_description_object(object)
-        object_data = StringIO.new(object.data)
-        descriptors_count = object_data.read(2).unpack('v').first
-
-        descriptors_count.times do
-          name_length = object_data.read(2).unpack('v').first
-          name = Helper.encode_to_utf8(object_data.read(name_length), source_encoding: 'UTF-16LE')
-          value_type, value_length = object_data.read(4).unpack('vv')
-          value = object_data.read(value_length)
-
-          attr_value = case value_type
-                       when 0
-                         Helper.encode_to_utf8(value, source_encoding: 'UTF-16LE')
-                       when 1
-                         value
-                       when 2, 3
-                         value.unpack('V').first
-                       when 4
-                         value.unpack('Q<').first
-                       when 5
-                         value.unpack('v').first
-          end
-
-          attr_name = EXTENDED_CONTENT_DESCRIPTOR_NAME_MAPPING[name]
-          instance_variable_set("@#{attr_name}", attr_value) unless attr_name.nil?
+    end
+
+    # File Properties Object structure:
+    #
+    # Field name                Field type  Size (bits)
+    #
+    # Object ID                 GUID        128
+    # Object Size               QWORD       64
+    # File ID                   GUID        128
+    # File Size                 QWORD       64
+    # Creation Date             QWORD       64
+    # Data Packets Count        QWORD       64
+    # Play Duration             QWORD       64
+    # Send Duration             QWORD       64
+    # Preroll                   QWORD       64
+    # Flags                     DWORD       32
+    #   Broadcast Flag                      1 (LSB)
+    #   Seekable Flag                       1
+    #   Reserved                            30
+    # Minimum Data Packet Size  DWORD       32
+    # Maximum Data Packet Size  DWORD       32
+    # Maximum Bitrate DWORD                 32
+    #
+    # Play Duration Specifies the time needed to play the file in 100-nanosecond units.
+    # The value of this field is invalid if the Broadcast Flag bit in the Flags field is set to 1.
+    #
+    # Preroll Specifies the amount of time to buffer data before starting to play the file, in millisecond units.
+    # If this value is nonzero, the Play Duration field and all of the payload Presentation Time fields have been offset by this amount.
+    def parse_file_properties_object(object)
+      play_duration, preroll, flags = object.data.unpack("x40Q<x8Q<b32")
+      @duration = play_duration / 10000000.0 - preroll / 1000.0 if flags[0] == "0"
+    end
+
+    # Extended Content Description Object structure:
+    #
+    # Field name                 Field type  Size (bits)
+    #
+    # Object ID                  GUID       128
+    # Object Size                QWORD      64
+    # Content Descriptors Count  WORD       16
+    # Content Descriptors        See text   varies
+    #
+    #
+    # The structure of each Content Descriptor:
+    #
+    # Field Name                  Field Type  Size (bits)
+    #
+    # Descriptor Name Length      WORD        16
+    # Descriptor Name             WCHAR       varies
+    # Descriptor Value Data Type  WORD        16
+    # Descriptor Value Length     WORD        16
+    # Descriptor Value            See text    varies
+    #
+    #
+    # Specifies the type of data stored in the Descriptor Value field.
+    # The types are defined in the following table.
+    #
+    # Value Type  Descriptor value  length
+    #
+    # 0x0000      Unicode string    varies
+    # 0x0001      BYTE array        varies
+    # 0x0002      BOOL              32
+    # 0x0003      DWORD             32
+    # 0x0004      QWORD             64
+    # 0x0005      WORD              16
+    def parse_extended_content_description_object(object)
+      object_data = StringIO.new(object.data)
+      descriptors_count = object_data.read(2).unpack1("v")
+
+      descriptors_count.times do
+        name_length = object_data.read(2).unpack1("v")
+        name = Helper.encode_to_utf8(object_data.read(name_length), source_encoding: "UTF-16LE")
+        value_type, value_length = object_data.read(4).unpack("vv")
+        value = object_data.read(value_length)
+
+        attr_value = case value_type
+                     when 0
+                       Helper.encode_to_utf8(value, source_encoding: "UTF-16LE")
+                     when 1
+                       value
+                     when 2, 3
+                       value.unpack1("V")
+                     when 4
+                       value.unpack1("Q<")
+                     when 5
+                       value.unpack1("v")
         end
-      end
-
-      # Stream Properties Object structure:
-      #
-      # Field Name                    Field Type  Size (bits)
-      # Object ID                     GUID        128
-      # Object Size                   QWORD       64
-      # Stream Type                   GUID        128
-      # Error Correction Type         GUID        128
-      # Time Offset                   QWORD       64
-      # Type-Specific Data Length     DWORD       32
-      # Error Correction Data Length  DWORD       32
-      # Flags                         WORD        16
-      #   Stream Number                           7 (LSB)
-      #   Reserved                                8
-      #   Encrypted Content Flag                  1
-      # Reserved                      DWORD       32
-      # Type-Specific Data            BYTE        varies
-      # Error Correction Data         BYTE        varies
-      #
-      # Stream Type specifies the type of the stream (for example, audio, video, and so on).
-      # Any streams with unrecognized Stream Type values should be ignored.
-      #
-      # Audio media type Object structure:
-      #
-      # Field name                          Field type  Size (bits)
-      #
-      # Codec ID / Format Tag               WORD        16
-      # Number of Channels                  WORD        16
-      # Samples Per Second                  DWORD       32
-      # Average Number of Bytes Per Second  DWORD       32
-      # Block Alignment                     WORD        16
-      # Bits Per Sample                     WORD        16
-      def parse_stream_properties_object(object)
-        object_data = StringIO.new(object.data)
-        stream_type, type_specific_data_length = object_data.read(54).unpack('a16x24V')
-        stream_type_guid = Helper.byte_string_to_guid(stream_type)
-
-        return unless stream_type_guid == AUDIO_MEDIA_OBJECT_GUID
-
-        @sample_rate, bytes_per_second, @bit_depth = object_data.read(type_specific_data_length).unpack('x4VVx2v')
-        @bitrate = (bytes_per_second * 8.0 / 1000).round
-      end
 
-      # Content Description Object structure:
-      #
-      # Field name          Field type  Size (bits)
-      #
-      # Object ID           GUID        128
-      # Object Size         QWORD       64
-      # Title Length        WORD        16
-      # Author Length       WORD        16
-      # Copyright Length    WORD        16
-      # Description Length  WORD        16
-      # Rating Length       WORD        16
-      # Title               WCHAR       Varies
-      # Author              WCHAR       Varies
-      # Copyright           WCHAR       Varies
-      # Description         WCHAR       Varies
-      # Rating              WCHAR       Varies
-      def parse_content_description_object(object)
-        object_data = StringIO.new(object.data)
-        title_length, author_length, copyright_length, description_length, _ = object_data.read(10).unpack('v' * 5)
-
-        @title = Helper.encode_to_utf8(object_data.read(title_length), source_encoding: 'UTF-16LE')
-        @artist = Helper.encode_to_utf8(object_data.read(author_length), source_encoding: 'UTF-16LE')
-        object_data.seek(copyright_length, IO::SEEK_CUR)
-        @comments.push(Helper.encode_to_utf8(object_data.read(description_length), source_encoding: 'UTF-16LE'))
+        attr_name = EXTENDED_CONTENT_DESCRIPTOR_NAME_MAPPING[name]
+        instance_variable_set("@#{attr_name}", attr_value) unless attr_name.nil?
       end
+    end
+
+    # Stream Properties Object structure:
+    #
+    # Field Name                    Field Type  Size (bits)
+    # Object ID                     GUID        128
+    # Object Size                   QWORD       64
+    # Stream Type                   GUID        128
+    # Error Correction Type         GUID        128
+    # Time Offset                   QWORD       64
+    # Type-Specific Data Length     DWORD       32
+    # Error Correction Data Length  DWORD       32
+    # Flags                         WORD        16
+    #   Stream Number                           7 (LSB)
+    #   Reserved                                8
+    #   Encrypted Content Flag                  1
+    # Reserved                      DWORD       32
+    # Type-Specific Data            BYTE        varies
+    # Error Correction Data         BYTE        varies
+    #
+    # Stream Type specifies the type of the stream (for example, audio, video, and so on).
+    # Any streams with unrecognized Stream Type values should be ignored.
+    #
+    # Audio media type Object structure:
+    #
+    # Field name                          Field type  Size (bits)
+    #
+    # Codec ID / Format Tag               WORD        16
+    # Number of Channels                  WORD        16
+    # Samples Per Second                  DWORD       32
+    # Average Number of Bytes Per Second  DWORD       32
+    # Block Alignment                     WORD        16
+    # Bits Per Sample                     WORD        16
+    def parse_stream_properties_object(object)
+      object_data = StringIO.new(object.data)
+      stream_type, type_specific_data_length = object_data.read(54).unpack("a16x24V")
+      stream_type_guid = Helper.byte_string_to_guid(stream_type)
+
+      return unless stream_type_guid == AUDIO_MEDIA_OBJECT_GUID
+
+      @sample_rate, bytes_per_second, @bit_depth = object_data.read(type_specific_data_length).unpack("x4VVx2v")
+      @bitrate = (bytes_per_second * 8.0 / 1000).round
+    end
+
+    # Content Description Object structure:
+    #
+    # Field name          Field type  Size (bits)
+    #
+    # Object ID           GUID        128
+    # Object Size         QWORD       64
+    # Title Length        WORD        16
+    # Author Length       WORD        16
+    # Copyright Length    WORD        16
+    # Description Length  WORD        16
+    # Rating Length       WORD        16
+    # Title               WCHAR       Varies
+    # Author              WCHAR       Varies
+    # Copyright           WCHAR       Varies
+    # Description         WCHAR       Varies
+    # Rating              WCHAR       Varies
+    def parse_content_description_object(object)
+      object_data = StringIO.new(object.data)
+      title_length, author_length, copyright_length, description_length, _ = object_data.read(10).unpack("v" * 5)
+
+      @title = Helper.encode_to_utf8(object_data.read(title_length), source_encoding: "UTF-16LE")
+      @artist = Helper.encode_to_utf8(object_data.read(author_length), source_encoding: "UTF-16LE")
+      object_data.seek(copyright_length, IO::SEEK_CUR)
+      @comments.push(Helper.encode_to_utf8(object_data.read(description_length), source_encoding: "UTF-16LE"))
+    end
   end
 end

data/lib/wahwah/errors.rb

@@ -2,5 +2,6 @@
 
 module WahWah
   class WahWahArgumentError < ArgumentError; end
-  class WahWahNotImplementedError < NotImplementedError; end
+
+  class WahWahNotImplementedError < RuntimeError; end
 end

data/lib/wahwah/flac/block.rb

@@ -6,8 +6,8 @@ module WahWah
       prepend LazyRead
 
       HEADER_SIZE = 4
-      HEADER_FORMAT = 'B*'
-      BLOCK_TYPE_INDEX = %w(STREAMINFO PADDING APPLICATION SEEKTABLE VORBIS_COMMENT CUESHEET PICTURE)
+      HEADER_FORMAT = "B*"
+      BLOCK_TYPE_INDEX = %w[STREAMINFO PADDING APPLICATION SEEKTABLE VORBIS_COMMENT CUESHEET PICTURE]
 
       attr_reader :type
 
@@ -32,11 +32,11 @@ module WahWah
         #
         # 24           Length (in bytes) of metadata to follow
         #              (does not include the size of the METADATA_BLOCK_HEADER)
-        header_bits = @file_io.read(HEADER_SIZE).unpack(HEADER_FORMAT).first
+        header_bits = @file_io.read(HEADER_SIZE).unpack1(HEADER_FORMAT)
 
         @last_flag = header_bits[0]
         @type = BLOCK_TYPE_INDEX[header_bits[1..7].to_i(2)]
-        @size = header_bits[8..-1].to_i(2)
+        @size = header_bits[8..].to_i(2)
       end
 
       def valid?

data/lib/wahwah/flac/streaminfo_block.rb

@@ -37,14 +37,14 @@ module WahWah
       def parse_streaminfo_block(block_data)
         return unless block_data.size == STREAMINFO_BLOCK_SIZE
 
-        info_bits = block_data.unpack('x10B64').first
+        info_bits = block_data.unpack1("x10B64")
 
         @sample_rate = info_bits[0..19].to_i(2)
         @bit_depth = info_bits[23..27].to_i(2) + 1
-        total_samples = info_bits[28..-1].to_i(2)
+        total_samples = info_bits[28..].to_i(2)
 
-        @duration = (total_samples.to_f / @sample_rate).round if @sample_rate > 0
-        @bitrate =  @sample_rate * @bit_depth / 1000
+        @duration = total_samples.to_f / @sample_rate if @sample_rate > 0
+        @bitrate = @sample_rate * @bit_depth / 1000
       end
     end
   end

data/lib/wahwah/flac_tag.rb

@@ -5,80 +5,82 @@ module WahWah
     include Ogg::VorbisComment
     include Flac::StreaminfoBlock
 
-    TAG_ID = 'fLaC'
+    TAG_ID = "fLaC"
 
     private
-      # FLAC structure:
-      #
-      # The four byte string "fLaC"
-      # The STREAMINFO metadata block
-      # Zero or more other metadata blocks
-      # One or more audio frames
-      def parse
-        # Flac file maybe contain ID3 header on the start, so skip it if exists
-        id3_header = ID3::V2Header.new(@file_io)
-        id3_header.valid? ? @file_io.seek(id3_header.size) : @file_io.rewind
 
-        return if @file_io.read(4) != TAG_ID
+    # FLAC structure:
+    #
+    # The four byte string "fLaC"
+    # The STREAMINFO metadata block
+    # Zero or more other metadata blocks
+    # One or more audio frames
+    def parse
+      # Flac file maybe contain ID3 header on the start, so skip it if exists
+      id3_header = ID3::V2Header.new(@file_io)
+      id3_header.valid? ? @file_io.seek(id3_header.size) : @file_io.rewind
 
-        loop do
-          block = Flac::Block.new(@file_io)
-          parse_block(block)
+      return if @file_io.read(4) != TAG_ID
 
-          break if block.is_last? || @file_io.eof?
-        end
+      loop do
+        block = Flac::Block.new(@file_io)
+        parse_block(block)
+
+        break if block.is_last? || @file_io.eof?
       end
+    end
 
-      def parse_block(block)
-        return unless block.valid?
+    def parse_block(block)
+      return unless block.valid?
 
-        case block.type
-        when 'STREAMINFO'
-          parse_streaminfo_block(block.data)
-        when 'VORBIS_COMMENT'
-          parse_vorbis_comment(block.data)
-        when 'PICTURE'
-          @images_data.push(block); block.skip
-        else
-          block.skip
-        end
+      case block.type
+      when "STREAMINFO"
+        parse_streaminfo_block(block.data)
+      when "VORBIS_COMMENT"
+        parse_vorbis_comment(block.data)
+      when "PICTURE"
+        @images_data.push(block)
+        block.skip
+      else
+        block.skip
       end
+    end
 
-      # PICTURE block data structure:
-      #
-      # Length(bit)  Meaning
-      #
-      # 32           The picture type according to the ID3v2 APIC frame:
-      #
-      # 32           The length of the MIME type string in bytes.
-      #
-      # n*8          The MIME type string.
-      #
-      # 32           The length of the description string in bytes.
-      #
-      # n*8          The description of the picture, in UTF-8.
-      #
-      # 32           The width of the picture in pixels.
-      #
-      # 32           The height of the picture in pixels.
-      #
-      # 32           The color depth of the picture in bits-per-pixel.
-      #
-      # 32           For indexed-color pictures (e.g. GIF), the number of colors used, or 0 for non-indexed pictures.
-      #
-      # 32           The length of the picture data in bytes.
-      #
-      # n*8          The binary picture data.
-      def parse_image_data(picture_block)
-        block_content = StringIO.new(picture_block.data)
+    # PICTURE block data structure:
+    #
+    # Length(bit)  Meaning
+    #
+    # 32           The picture type according to the ID3v2 APIC frame:
+    #
+    # 32           The length of the MIME type string in bytes.
+    #
+    # n*8          The MIME type string.
+    #
+    # 32           The length of the description string in bytes.
+    #
+    # n*8          The description of the picture, in UTF-8.
+    #
+    # 32           The width of the picture in pixels.
+    #
+    # 32           The height of the picture in pixels.
+    #
+    # 32           The color depth of the picture in bits-per-pixel.
+    #
+    # 32           For indexed-color pictures (e.g. GIF), the number of colors used, or 0 for non-indexed pictures.
+    #
+    # 32           The length of the picture data in bytes.
+    #
+    # n*8          The binary picture data.
+    def parse_image_data(picture_block)
+      block_content = StringIO.new(picture_block.data)
 
-        type_index, mime_type_length = block_content.read(8).unpack('NN')
-        mime_type = Helper.encode_to_utf8(block_content.read(mime_type_length))
-        description_length = block_content.read(4).unpack('N').first
-        data_length = block_content.read(description_length + 20).unpack("#{'x' * (description_length + 16)}N").first
-        data = block_content.read(data_length)
+      type_index, mime_type_length = block_content.read(8).unpack("NN")
+      mime_type = Helper.encode_to_utf8(block_content.read(mime_type_length))
+      description_length = block_content.read(4).unpack1("N")
+      data_length = block_content.read(description_length + 20).unpack1("#{"x" * (description_length + 16)}N")
+      data = block_content.read(data_length)
 
-        { data: data, mime_type: mime_type, type: ID3::ImageFrameBody::TYPES[type_index] }
-      end
+      {data: data, mime_type: mime_type, type: ID3::ImageFrameBody::TYPES[type_index]}
+    end
   end
 end