m3u8 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b0a12ed7f44279220cc4ff7875ac7489d3acdd8
-  data.tar.gz: 6d402ff9367f418ba336d43b82fd31d3b53a713d
+  metadata.gz: 3b76853323b76f301feb3e6c92d787b8b961d22a
+  data.tar.gz: 1edfa96734f62f346022af27459486337eeb8e85
 SHA512:
-  metadata.gz: 67e830b28ab20def54ceb22c1d37c4900faaf75888fcf6d64e84b5d0446a7f979c418935c20cf6ce0bba661a8bc3f28f1d4fa1dda86682096f08c0c939749a59
-  data.tar.gz: 120d949eee406b2770d9e216cf8436b1f3a79c64aaa2337fd5037d86bc027772404d18e7688ae4f7073866759bcc76185ebcd77f7ed23670a286d87d80925547
+  metadata.gz: 5f7687b04510afe4354969801d1367b2a7ac403895f42d17a8990a2eb79fbad59a1c07e2a1594976d55656a264ef81d1712ac51038eff8cd2f5b7d03451759df
+  data.tar.gz: ff17446d9b23074e4db0cf8b6aa735f7f5c76f8e406aaef17172c1ebb83e7ad25a94f9cf9e6ee8bb222f068150bcd89eaa3c1ae826d2c902e11ac756ed42795e

data/.rubocop.yml

@@ -1,5 +1,5 @@
+AllCops:
+  Exclude:
+    - 'spec/spec_helper.rb'
 Style/StringLiterals:
-  EnforcedStyle: single_quotes
-  SupportedStyles:
-    - single_quotes
-    - double_quotes
+  EnforcedStyle: single_quotes

data/CHANGELOG.md

@@ -1,4 +1,10 @@
-### 0.3.0 (11/26/2014) - DEPRECIATED add_playlist and add_segment on Playlist, manipulate the items array directly instead. Extracted writing of playlists to it's own Writer class (only use directly if you want more control over the process). Added read convience method to Playlist so Reader doesn't have to be used directly unless more control is disired. Simplified validation and other aspects during this refactoring.
+### 0.4.0 (1/20/2015) - BREAKING: Playlist.audio is now Playlist.audio_codec, audio now represents the newly supported AUDIO attribute, please update your code accordingly. Added support for all EXT-X-MEDIA attributes as well as the following EXT-X-STREAM-INF attributes: AVERAGE-BANDWIDTH, AUDIO, VIDEO, SUBTILES, and CLOSED-CAPTIONS. This means the library now supports alternate audio / camera angles as well as subtitles and closed captions. The EXT-X-PLAYLIST-TYPE attribute is now supported as Playlist.type. SegmentItems now support comments (Thanks @elsurudo). A bug was also fixed in Reader that prevented reuse of the instance.
+
+### 0.3.2 (1/16/2015) - PROGRAM-ID was removed in protocol version 6, if not provided it will now be omitted. Thanks @elsurudo
+
+### 0.3.1 (1/15/2015) - Added duration method to Playlist to get the total length of segments contained within it. Thanks @DaKaZ
+
+### 0.3.0 (11/26/2014) - DEPRECIATED add_playlist and add_segment on Playlist, manipulate the items array directly instead. Extracted writing of playlists to it's own Writer class (only use directly if you want more control over the process). Added read convience method to Playlist so Reader doesn't have to be used directly unless more control is desired. Simplified validation and other aspects during this refactoring.
 
 ### 0.2.1 (11/26/2014) - Moved codec generation / validation to PlaylistItem, allowing for the flexibility to either specify :audio, :level, :profile when creating new instances (codecs value will be automatically generated) or just set the codecs attribute directly.
 

data/README.md

@@ -33,7 +33,7 @@ Or install it yourself as:
 	playlist = M3u8::Playlist.new
     #create a new playlist item with options
     options = { program_id: 1, width: 1920, height: 1080, width: 1920, height: 1080, 
-                profile: 'high', level: 4.1, audio: 'aac-lc', bitrate: 540, 
+                profile: 'high', level: 4.1, audio_codec: 'aac-lc', bitrate: 540, 
                 playlist: 'test.url' }
     item = M3u8::PlaylistItem.new options
     playlist.items.push item
@@ -50,7 +50,7 @@ Or install it yourself as:
     playlist.items.push item
     
     #just get the codec string for custom use
-    options = { profile: 'baseline', level: 3.0, audio: 'aac-lc' }
+    options = { profile: 'baseline', level: 3.0, audio_codec: 'aac-lc' }
     codecs = M3u8::Playlist.codecs options
     # => "avc1.66.30,mp4a.40.2"
 	
@@ -69,7 +69,7 @@ Or install it yourself as:
 
     #There is a M3u8::Writer class if you want more control over the write process
     
-    #values for :audio (Codec name)
+    #values for :audio_codec (Codec name)
     #aac-lc, he-aac, mp3
     
     #values for :profile (H.264 Profile)
@@ -97,7 +97,7 @@ Or install it yourself as:
 
     #create a new playlist item with options
     options = { program_id: 1, width: 1920, height: 1080, width: 1920, height: 1080, 
-                profile: 'high', level: 4.1, audio: 'aac-lc', bitrate: 540, 
+                profile: 'high', level: 4.1, audio_codec: 'aac-lc', bitrate: 540, 
                 playlist: 'test.url' }
     item = M3u8::PlaylistItem.new options
     #add it to the top of the playlist
@@ -115,10 +115,14 @@ Or install it yourself as:
 
 ## Missing (but planned) Features 
 * Support for encryption keys and DRM.
-* Support for more obscure tags.
+* Support I-Frame and Byte-Range.
+* Validation of all attributes to match the spec completely.
+* Support for all additional attributes in the latest version of the spec.
 
 ## Contributing
 
+(Be sure to check to dev branch to make sure I'm not already working on it)
+
 1. Fork it ( https://github.com/sethdeckard/m3u8/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Run the specs, make sure they pass and that new features are covered

data/Rakefile

@@ -1,7 +1,7 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new
 
-task :default => :spec
-task :test => :spec
+task default: :spec
+task test: :spec

data/lib/m3u8.rb

@@ -3,6 +3,7 @@ require 'm3u8/version'
 require 'm3u8/playlist'
 require 'm3u8/playlist_item'
 require 'm3u8/segment_item'
+require 'm3u8/media_item'
 require 'm3u8/reader'
 require 'm3u8/writer'
 require 'm3u8/error'

data/lib/m3u8/media_item.rb

@@ -0,0 +1,74 @@
+module M3u8
+  # MediaItem represents a set of EXT-X-MEDIA attributes
+  class MediaItem
+    attr_accessor :type, :group, :language, :assoc_language, :name,
+                  :autoselect, :default, :uri, :forced
+
+    def initialize(params = {})
+      params.each do |key, value|
+        instance_variable_set("@#{key}", value)
+      end
+    end
+
+    def to_s
+      attributes = [type_format,
+                    group_format,
+                    language_format,
+                    assoc_language_format,
+                    name_format,
+                    autoselect_format,
+                    default_format,
+                    uri_format,
+                    forced_format].compact.join(',')
+      "#EXT-X-MEDIA:#{attributes}"
+    end
+
+    private
+
+    def type_format
+      "TYPE=#{type}"
+    end
+
+    def group_format
+      %(GROUP-ID="#{group}")
+    end
+
+    def language_format
+      return if language.nil?
+      %(LANGUAGE="#{language}")
+    end
+
+    def assoc_language_format
+      return if assoc_language.nil?
+      %(ASSOC-LANGUAGE="#{assoc_language}")
+    end
+
+    def name_format
+      %(NAME="#{name}")
+    end
+
+    def autoselect_format
+      return if autoselect.nil?
+      "AUTOSELECT=#{to_yes_no autoselect}"
+    end
+
+    def default_format
+      return if default.nil?
+      "DEFAULT=#{to_yes_no default}"
+    end
+
+    def uri_format
+      return if uri.nil?
+      %(URI="#{uri}")
+    end
+
+    def forced_format
+      return if forced.nil?
+      "FORCED=#{to_yes_no forced}"
+    end
+
+    def to_yes_no(boolean)
+      boolean ==  true ? 'YES' : 'NO'
+    end
+  end
+end

data/lib/m3u8/playlist.rb

@@ -1,6 +1,8 @@
 module M3u8
+  # Playlist represents an m3u8 playlist, it can be a master playlist or a set
+  # of media segments
   class Playlist
-    attr_accessor :items, :version, :cache, :target, :sequence
+    attr_accessor :items, :version, :cache, :target, :sequence, :type
 
     def initialize(options = {})
       assign_options options
@@ -60,6 +62,7 @@ module M3u8
       self.sequence = options[:sequence]
       self.cache = options[:cache]
       self.target = options[:target]
+      self.type = options[:type]
     end
 
     def playlist_size

data/lib/m3u8/playlist_item.rb

@@ -1,7 +1,9 @@
 module M3u8
+  # PlaylistItem represents a set of EXT-X-STREAM-INF attributes
   class PlaylistItem
     attr_accessor :program_id, :width, :height, :codecs, :bitrate, :playlist,
-                  :audio, :level, :profile
+                  :audio_codec, :level, :profile, :video, :audio,
+                  :average_bandwidth, :subtitles, :closed_captions
     MISSING_CODEC_MESSAGE = 'Audio or video codec info should be provided.'
 
     def initialize(params = {})
@@ -18,7 +20,6 @@ module M3u8
     def codecs
       return @codecs unless @codecs.nil?
 
-      audio_codec = audio_codec audio
       video_codec = video_codec profile, level
 
       if video_codec.nil?
@@ -38,7 +39,12 @@ module M3u8
       attributes = [program_id_format,
                     resolution_format,
                     codecs_format,
-                    bandwidth_format].compact.join(',')
+                    bandwidth_format,
+                    average_bandwidth_format,
+                    audio_format,
+                    video_format,
+                    subtitles_format,
+                    closed_captions_format].compact.join(',')
       "#EXT-X-STREAM-INF:#{attributes}\n#{playlist}"
     end
 
@@ -59,18 +65,43 @@ module M3u8
     end
 
     def codecs_format
-      "CODECS=\"#{codecs}\""
+      %(CODECS="#{codecs}")
     end
 
     def bandwidth_format
       "BANDWIDTH=#{bitrate}"
     end
 
-    def audio_codec(audio)
+    def average_bandwidth_format
+      return if average_bandwidth.nil?
+      "AVERAGE-BANDWIDTH=#{average_bandwidth}"
+    end
+
+    def audio_format
       return if audio.nil?
-      return 'mp4a.40.2' if audio.downcase == 'aac-lc'
-      return 'mp4a.40.5' if audio.downcase == 'he-aac'
-      return 'mp4a.40.34' if audio.downcase == 'mp3'
+      %(AUDIO="#{audio}")
+    end
+
+    def video_format
+      return if video.nil?
+      %(VIDEO="#{video}")
+    end
+
+    def subtitles_format
+      return if subtitles.nil?
+      %(SUBTITLES="#{subtitles}")
+    end
+
+    def closed_captions_format
+      return if closed_captions.nil?
+      %(CLOSED-CAPTIONS="#{closed_captions}")
+    end
+
+    def audio_codec
+      return if @audio_codec.nil?
+      return 'mp4a.40.2' if @audio_codec.downcase == 'aac-lc'
+      return 'mp4a.40.5' if @audio_codec.downcase == 'he-aac'
+      return 'mp4a.40.34' if @audio_codec.downcase == 'mp3'
     end
 
     def video_codec(profile, level)

data/lib/m3u8/reader.rb

@@ -2,22 +2,37 @@ module M3u8
   class Reader
     attr_accessor :playlist, :item, :open, :master
     PLAYLIST_START = '#EXTM3U'
+    PLAYLIST_TYPE_START = '#EXT-X-PLAYLIST-TYPE:'
     VERSION_START = '#EXT-X-VERSION:'
     SEQUENCE_START = '#EXT-X-MEDIA-SEQUENCE:'
     CACHE_START = '#EXT-X-ALLOW-CACHE:'
     TARGET_START = '#EXT-X-TARGETDURATION:'
     STREAM_START = '#EXT-X-STREAM-INF:'
+    MEDIA_START = '#EXT-X-MEDIA:'
     SEGMENT_START = '#EXTINF:'
+    # EXT-X-STREAM-INF:
     PROGRAM_ID = 'PROGRAM-ID'
     RESOLUTION = 'RESOLUTION'
     CODECS = 'CODECS'
     BANDWIDTH = 'BANDWIDTH'
-
-    def initialize
-      self.playlist = Playlist.new
-    end
+    AVERAGE_BANDWIDTH = 'AVERAGE-BANDWIDTH'
+    VIDEO = 'VIDEO'
+    AUDIO = 'AUDIO'
+    SUBTITLES = 'SUBTITLES'
+    CLOSED_CAPTIONS = 'CLOSED-CAPTIONS'
+    # EXT-X-MEDIA:
+    TYPE = 'TYPE'
+    GROUP_ID = 'GROUP-ID'
+    LANGUAGE = 'LANGUAGE'
+    ASSOC_LANGUAGE = 'ASSOC-LANGUAGE'
+    NAME = 'NAME'
+    AUTOSELECT = 'AUTOSELECT'
+    DEFAULT = 'DEFAULT'
+    URI = 'URI'
+    FORCED = 'FORCED'
 
     def read(input)
+      self.playlist = Playlist.new
       input.each_line do |line|
         parse_line line
       end
@@ -29,7 +44,9 @@ module M3u8
     def parse_line(line)
       return if line.start_with? PLAYLIST_START
 
-      if line.start_with? VERSION_START
+      if line.start_with? PLAYLIST_TYPE_START
+        parse_playlist_type line
+      elsif line.start_with? VERSION_START
         parse_version line
       elsif line.start_with? SEQUENCE_START
         parse_sequence line
@@ -41,11 +58,17 @@ module M3u8
         parse_stream line
       elsif line.start_with? SEGMENT_START
         parse_segment line
+      elsif line.start_with? MEDIA_START
+        parse_media line
       elsif !item.nil? && open
         parse_value(line)
       end
     end
 
+    def parse_playlist_type(line)
+      playlist.type = line.gsub(PLAYLIST_TYPE_START, '').delete!("\n")
+    end
+
     def parse_version(line)
       playlist.version = line.gsub(VERSION_START, '').to_i
     end
@@ -85,6 +108,16 @@ module M3u8
           item.codecs = value
         when BANDWIDTH
           item.bitrate = value.to_i
+        when AVERAGE_BANDWIDTH
+          item.average_bandwidth = value.to_i
+        when AUDIO
+          item.audio = value
+        when VIDEO
+          item.video = value
+        when SUBTITLES
+          item.subtitles = value
+        when CLOSED_CAPTIONS
+          item.closed_captions = value
         end
       end
     end
@@ -93,9 +126,42 @@ module M3u8
       self.master = false
       self.open = true
 
+      values = line.gsub(SEGMENT_START, '').gsub("\n", ',').split(',')
+
       self.item = M3u8::SegmentItem.new
-      item.duration = line.gsub(SEGMENT_START, '').gsub("\n", '').gsub(',', '')
-        .to_f
+      item.duration = values[0].to_f
+      item.comment = values[1] unless values[1].nil?
+    end
+
+    def parse_media(line)
+      self.open = false
+      self.item = M3u8::MediaItem.new
+      line = line.gsub MEDIA_START, ''
+      attributes = line.scan(/([A-z-]+)\s*=\s*("[^"]*"|[^,]*)/)
+      attributes.each do |pair|
+        value = pair[1].gsub("\n", '').gsub('"', '')
+        case pair[0]
+        when TYPE
+          item.type = value
+        when GROUP_ID
+          item.group = value
+        when LANGUAGE
+          item.language = value
+        when ASSOC_LANGUAGE
+          item.assoc_language = value
+        when NAME
+          item.name = value
+        when AUTOSELECT
+          item.autoselect = parse_yes_no value
+        when DEFAULT
+          item.default = parse_yes_no value
+        when URI
+          item.uri = value
+        when FORCED
+          item.forced = parse_yes_no value
+        end
+      end
+      playlist.items.push item
     end
 
     def parse_resolution(resolution)

data/lib/m3u8/segment_item.rb

@@ -1,6 +1,6 @@
 module M3u8
   class SegmentItem
-    attr_accessor :duration, :segment
+    attr_accessor :duration, :segment, :comment
 
     def initialize(params = {})
       params.each do |key, value|
@@ -9,7 +9,7 @@ module M3u8
     end
 
     def to_s
-      "#EXTINF:#{duration},\n#{segment}"
+      "#EXTINF:#{duration},#{comment}\n#{segment}"
     end
   end
 end

data/lib/m3u8/version.rb

@@ -1,3 +1,3 @@
 module M3u8
-  VERSION = '0.3.2'
+  VERSION = '0.4.0'
 end

data/lib/m3u8/writer.rb

@@ -28,6 +28,7 @@ module M3u8
     end
 
     def write_header(playlist)
+      io.puts "#EXT-X-PLAYLIST-TYPE:#{playlist.type}" unless playlist.type.nil?
       io.puts "#EXT-X-VERSION:#{playlist.version}"
       io.puts "#EXT-X-MEDIA-SEQUENCE:#{playlist.sequence}"
       io.puts "#EXT-X-ALLOW-CACHE:#{cache(playlist)}"

data/m3u8.gemspec

@@ -4,21 +4,21 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'm3u8/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "m3u8"
+  spec.name          = 'm3u8'
   spec.version       = M3u8::VERSION
-  spec.authors       = ["Seth Deckard"]
-  spec.email         = ["seth@deckard.me"]
+  spec.authors       = ['Seth Deckard']
+  spec.email         = ['seth@deckard.me']
   spec.summary       = %q{Generate and parse m3u8 playlists for HTTP Live Streaming (HLS).}
   spec.description   = %q{Generate and parse m3u8 playlists for HTTP Live Streaming (HLS).}
-  spec.homepage      = "https://github.com/sethdeckard/m3u8"
-  spec.license       = "MIT"
+  spec.homepage      = 'https://github.com/sethdeckard/m3u8'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", ">= 1.6"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", ">= 2.11"
+  spec.add_development_dependency 'bundler', '>= 1.6'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '>= 2.11'
 end

data/spec/fixtures/playlist.m3u8

@@ -1,4 +1,5 @@
 #EXTM3U
+#EXT-X-PLAYLIST-TYPE:VOD
 #EXT-X-VERSION:4
 #EXT-X-MEDIA-SEQUENCE:1
 #EXT-X-ALLOW-CACHE:NO

data/spec/fixtures/playlist_with_comments.m3u8

@@ -0,0 +1,283 @@
+#EXTM3U
+#EXT-X-PLAYLIST-TYPE:VOD
+#EXT-X-VERSION:4
+#EXT-X-MEDIA-SEQUENCE:1
+#EXT-X-ALLOW-CACHE:NO
+#EXT-X-TARGETDURATION:12
+#EXTINF:11.344644,anything
+1080-7mbps00000.ts
+#EXTINF:11.261233,anything
+1080-7mbps00001.ts
+#EXTINF:7.507489,anything
+1080-7mbps00002.ts
+#EXTINF:11.261233,anything
+1080-7mbps00003.ts
+#EXTINF:11.261233,anything
+1080-7mbps00004.ts
+#EXTINF:7.507489,anything
+1080-7mbps00005.ts
+#EXTINF:11.261233,anything
+1080-7mbps00006.ts
+#EXTINF:11.261233,anything
+1080-7mbps00007.ts
+#EXTINF:7.507478,anything
+1080-7mbps00008.ts
+#EXTINF:11.261233,anything
+1080-7mbps00009.ts
+#EXTINF:11.261233,anything
+1080-7mbps00010.ts
+#EXTINF:7.507478,anything
+1080-7mbps00011.ts
+#EXTINF:11.261233,anything
+1080-7mbps00012.ts
+#EXTINF:11.261233,anything
+1080-7mbps00013.ts
+#EXTINF:7.507489,anything
+1080-7mbps00014.ts
+#EXTINF:11.261233,anything
+1080-7mbps00015.ts
+#EXTINF:11.261233,anything
+1080-7mbps00016.ts
+#EXTINF:7.507489,anything
+1080-7mbps00017.ts
+#EXTINF:11.261233,anything
+1080-7mbps00018.ts
+#EXTINF:11.261233,anything
+1080-7mbps00019.ts
+#EXTINF:7.507478,anything
+1080-7mbps00020.ts
+#EXTINF:11.261233,anything
+1080-7mbps00021.ts
+#EXTINF:11.261233,anything
+1080-7mbps00022.ts
+#EXTINF:7.507478,anything
+1080-7mbps00023.ts
+#EXTINF:11.261233,anything
+1080-7mbps00024.ts
+#EXTINF:11.261233,anything
+1080-7mbps00025.ts
+#EXTINF:7.507489,anything
+1080-7mbps00026.ts
+#EXTINF:11.261233,anything
+1080-7mbps00027.ts
+#EXTINF:11.261233,anything
+1080-7mbps00028.ts
+#EXTINF:7.507489,anything
+1080-7mbps00029.ts
+#EXTINF:11.261233,anything
+1080-7mbps00030.ts
+#EXTINF:11.261233,anything
+1080-7mbps00031.ts
+#EXTINF:7.507478,anything
+1080-7mbps00032.ts
+#EXTINF:11.261233,anything
+1080-7mbps00033.ts
+#EXTINF:11.261233,anything
+1080-7mbps00034.ts
+#EXTINF:7.507489,anything
+1080-7mbps00035.ts
+#EXTINF:11.261233,anything
+1080-7mbps00036.ts
+#EXTINF:11.261222,anything
+1080-7mbps00037.ts
+#EXTINF:7.507489,anything
+1080-7mbps00038.ts
+#EXTINF:11.261233,anything
+1080-7mbps00039.ts
+#EXTINF:11.261233,anything
+1080-7mbps00040.ts
+#EXTINF:7.507489,anything
+1080-7mbps00041.ts
+#EXTINF:11.261233,anything
+1080-7mbps00042.ts
+#EXTINF:11.261233,anything
+1080-7mbps00043.ts
+#EXTINF:7.507478,anything
+1080-7mbps00044.ts
+#EXTINF:11.261233,anything
+1080-7mbps00045.ts
+#EXTINF:11.261233,anything
+1080-7mbps00046.ts
+#EXTINF:7.507489,anything
+1080-7mbps00047.ts
+#EXTINF:11.261233,anything
+1080-7mbps00048.ts
+#EXTINF:11.261222,anything
+1080-7mbps00049.ts
+#EXTINF:7.507489,anything
+1080-7mbps00050.ts
+#EXTINF:11.261233,anything
+1080-7mbps00051.ts
+#EXTINF:11.261233,anything
+1080-7mbps00052.ts
+#EXTINF:7.507489,anything
+1080-7mbps00053.ts
+#EXTINF:11.261233,anything
+1080-7mbps00054.ts
+#EXTINF:11.261233,anything
+1080-7mbps00055.ts
+#EXTINF:7.507478,anything
+1080-7mbps00056.ts
+#EXTINF:11.261233,anything
+1080-7mbps00057.ts
+#EXTINF:11.261233,anything
+1080-7mbps00058.ts
+#EXTINF:7.507489,anything
+1080-7mbps00059.ts
+#EXTINF:11.261233,anything
+1080-7mbps00060.ts
+#EXTINF:11.261222,anything
+1080-7mbps00061.ts
+#EXTINF:7.507489,anything
+1080-7mbps00062.ts
+#EXTINF:11.261233,anything
+1080-7mbps00063.ts
+#EXTINF:11.261233,anything
+1080-7mbps00064.ts
+#EXTINF:7.507489,anything
+1080-7mbps00065.ts
+#EXTINF:11.261233,anything
+1080-7mbps00066.ts
+#EXTINF:11.261233,anything
+1080-7mbps00067.ts
+#EXTINF:7.507478,anything
+1080-7mbps00068.ts
+#EXTINF:11.261233,anything
+1080-7mbps00069.ts
+#EXTINF:11.261233,anything
+1080-7mbps00070.ts
+#EXTINF:7.507489,anything
+1080-7mbps00071.ts
+#EXTINF:11.261233,anything
+1080-7mbps00072.ts
+#EXTINF:11.261233,anything
+1080-7mbps00073.ts
+#EXTINF:7.507489,anything
+1080-7mbps00074.ts
+#EXTINF:11.261222,anything
+1080-7mbps00075.ts
+#EXTINF:11.261233,anything
+1080-7mbps00076.ts
+#EXTINF:7.507489,anything
+1080-7mbps00077.ts
+#EXTINF:11.261233,anything
+1080-7mbps00078.ts
+#EXTINF:11.261233,anything
+1080-7mbps00079.ts
+#EXTINF:7.507478,anything
+1080-7mbps00080.ts
+#EXTINF:11.261233,anything
+1080-7mbps00081.ts
+#EXTINF:11.261233,anything
+1080-7mbps00082.ts
+#EXTINF:7.507489,anything
+1080-7mbps00083.ts
+#EXTINF:11.261233,anything
+1080-7mbps00084.ts
+#EXTINF:11.261233,anything
+1080-7mbps00085.ts
+#EXTINF:7.507489,anything
+1080-7mbps00086.ts
+#EXTINF:11.261222,anything
+1080-7mbps00087.ts
+#EXTINF:11.261233,anything
+1080-7mbps00088.ts
+#EXTINF:7.507489,anything
+1080-7mbps00089.ts
+#EXTINF:11.261233,anything
+1080-7mbps00090.ts
+#EXTINF:11.261233,anything
+1080-7mbps00091.ts
+#EXTINF:7.507478,anything
+1080-7mbps00092.ts
+#EXTINF:11.261233,anything
+1080-7mbps00093.ts
+#EXTINF:11.261233,anything
+1080-7mbps00094.ts
+#EXTINF:7.507489,anything
+1080-7mbps00095.ts
+#EXTINF:11.261233,anything
+1080-7mbps00096.ts
+#EXTINF:11.261233,anything
+1080-7mbps00097.ts
+#EXTINF:7.507489,anything
+1080-7mbps00098.ts
+#EXTINF:11.261222,anything
+1080-7mbps00099.ts
+#EXTINF:11.261233,anything
+1080-7mbps00100.ts
+#EXTINF:7.507489,anything
+1080-7mbps00101.ts
+#EXTINF:11.261233,anything
+1080-7mbps00102.ts
+#EXTINF:11.261233,anything
+1080-7mbps00103.ts
+#EXTINF:7.507478,anything
+1080-7mbps00104.ts
+#EXTINF:11.261233,anything
+1080-7mbps00105.ts
+#EXTINF:11.261233,anything
+1080-7mbps00106.ts
+#EXTINF:7.507489,anything
+1080-7mbps00107.ts
+#EXTINF:11.261233,anything
+1080-7mbps00108.ts
+#EXTINF:11.261233,anything
+1080-7mbps00109.ts
+#EXTINF:7.507489,anything
+1080-7mbps00110.ts
+#EXTINF:11.261233,anything
+1080-7mbps00111.ts
+#EXTINF:11.261233,anything
+1080-7mbps00112.ts
+#EXTINF:7.507478,anything
+1080-7mbps00113.ts
+#EXTINF:11.261233,anything
+1080-7mbps00114.ts
+#EXTINF:11.261233,anything
+1080-7mbps00115.ts
+#EXTINF:7.507478,anything
+1080-7mbps00116.ts
+#EXTINF:11.261233,anything
+1080-7mbps00117.ts
+#EXTINF:7.507478,anything
+1080-7mbps00118.ts
+#EXTINF:11.261233,anything
+1080-7mbps00119.ts
+#EXTINF:11.261233,anything
+1080-7mbps00120.ts
+#EXTINF:7.507489,anything
+1080-7mbps00121.ts
+#EXTINF:11.261233,anything
+1080-7mbps00122.ts
+#EXTINF:11.261233,anything
+1080-7mbps00123.ts
+#EXTINF:7.507489,anything
+1080-7mbps00124.ts
+#EXTINF:11.261222,anything
+1080-7mbps00125.ts
+#EXTINF:11.261233,anything
+1080-7mbps00126.ts
+#EXTINF:7.507489,anything
+1080-7mbps00127.ts
+#EXTINF:11.261233,anything
+1080-7mbps00128.ts
+#EXTINF:11.261233,anything
+1080-7mbps00129.ts
+#EXTINF:7.507478,anything
+1080-7mbps00130.ts
+#EXTINF:11.261233,anything
+1080-7mbps00131.ts
+#EXTINF:11.261233,anything
+1080-7mbps00132.ts
+#EXTINF:7.507489,anything
+1080-7mbps00133.ts
+#EXTINF:11.261233,anything
+1080-7mbps00134.ts
+#EXTINF:11.261233,anything
+1080-7mbps00135.ts
+#EXTINF:7.507489,anything
+1080-7mbps00136.ts
+#EXTINF:1.793444,anything
+1080-7mbps00137.ts
+#EXT-X-ENDLIST

data/spec/fixtures/variant_angles.m3u8

@@ -0,0 +1,14 @@
+#EXTM3U
+#EXT-X-MEDIA:TYPE=VIDEO,GROUP-ID="200kbs",NAME="Angle1",AUTOSELECT=YES,DEFAULT=YES
+#EXT-X-MEDIA:TYPE=VIDEO,GROUP-ID="200kbs",NAME="Angle2",AUTOSELECT=YES,DEFAULT=NO,URI="Angle2/200kbs/prog_index.m3u8"
+#EXT-X-MEDIA:TYPE=VIDEO,GROUP-ID="200kbs",NAME="Angle3",AUTOSELECT=YES,DEFAULT=NO,URI="Angle3/200kbs/prog_index.m3u8"
+#EXT-X-MEDIA:TYPE=VIDEO,GROUP-ID="500kbs",NAME="Angle1",AUTOSELECT=YES,DEFAULT=YES
+#EXT-X-MEDIA:TYPE=VIDEO,GROUP-ID="500kbs",NAME="Angle2",AUTOSELECT=YES,DEFAULT=NO,URI="Angle2/500kbs/prog_index.m3u8"
+#EXT-X-MEDIA:TYPE=VIDEO,GROUP-ID="500kbs",NAME="Angle3",AUTOSELECT=YES,DEFAULT=NO,URI="Angle3/500kbs/prog_index.m3u8"
+#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="aac",LANGUAGE="eng",NAME="English",AUTOSELECT=YES,DEFAULT=YES,URI="eng/prog_index.m3u8"
+#EXT-X-MEDIA:TYPE=SUBTITLES,GROUP-ID="subs",NAME="Subtiles",AUTOSELECT=NO,DEFAULT=NO,URI="titles_file"
+#EXT-X-MEDIA:TYPE=CLOSED-CAPTIONS,GROUP-ID="captions",NAME="Closed Captions",AUTOSELECT=NO,DEFAULT=NO,URI="captions_file"
+#EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=300000,CODECS="mp4a.40.2,avc1.4d401e",VIDEO="200kbs",AUDIO="aac",AVERAGE-BANDWIDTH=300001,SUBTITLES="subs",CLOSED-CAPTIONS="captions"
+Angle1/200kbs/prog_index.m3u8
+#EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=754857,CODECS="mp4a.40.2,avc1.4d401e",VIDEO="500kbs",AUDIO="aac"
+Angle1/500kbs/prog_index.m3u8

data/spec/fixtures/variant_audio.m3u8

@@ -0,0 +1,15 @@
+#EXTM3U
+#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="audio-lo",LANGUAGE="eng",ASSOC-LANGUAGE="spoken",NAME="English",AUTOSELECT=YES,DEFAULT=YES,URI="englo/prog_index.m3u8",FORCED=YES
+#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="audio-lo",LANGUAGE="fre",NAME="Français",AUTOSELECT=YES,DEFAULT=NO,URI="frelo/prog_index.m3u8"
+#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="audio-lo",LANGUAGE="sp",NAME="Espanol",AUTOSELECT=YES,DEFAULT=NO,URI="splo/prog_index.m3u8"
+#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="audio-hi",LANGUAGE="eng",NAME="English",AUTOSELECT=YES,DEFAULT=YES,URI="eng/prog_index.m3u8"
+#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="audio-hi",LANGUAGE="fre",NAME="Français",AUTOSELECT=YES,DEFAULT=NO,URI="fre/prog_index.m3u8"
+#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="audio-hi",LANGUAGE="sp",NAME="Espanol",AUTOSELECT=YES,DEFAULT=NO,URI="sp/prog_index.m3u8"
+#EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=195023,CODECS="mp4a.40.5",AUDIO="audio-lo"
+lo/prog_index.m3u8
+#EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=260000,CODECS="avc1.42e01e,mp4a.40.2",AUDIO="audio-lo"
+hi/prog_index.m3u8
+#EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=591680,CODECS="mp4a.40.2, avc1.64001e",AUDIO="audio-hi"
+lo/prog_index.m3u8
+#EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=650000,CODECS="avc1.42e01e,mp4a.40.2",AUDIO="audio-hi"
+hi/prog_index.m3u8

data/spec/media_item_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe M3u8::MediaItem do
+  it 'should provide m3u8 format representation' do
+    hash = { type: 'AUDIO', group: 'audio-lo', language: 'fre',
+             name: 'Francais', autoselect: true, default: false,
+             uri: 'frelo/prog_index.m3u8' }
+    item = M3u8::MediaItem.new(hash)
+    output = item.to_s
+    expected = '#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="audio-lo",LANGUAGE="fre",' \
+               'NAME="Francais",AUTOSELECT=YES,DEFAULT=NO,' \
+               'URI="frelo/prog_index.m3u8"'
+    expect(output).to eq expected
+
+    hash = { type: 'AUDIO', group: 'audio-lo', language: 'fre',
+             assoc_language: 'spoken', name: 'Francais', autoselect: true,
+             default: false, forced: true, uri: 'frelo/prog_index.m3u8' }
+    item = M3u8::MediaItem.new(hash)
+    output = item.to_s
+    expected = '#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="audio-lo",LANGUAGE="fre",' \
+               'ASSOC-LANGUAGE="spoken",NAME="Francais",AUTOSELECT=YES,' \
+               'DEFAULT=NO,URI="frelo/prog_index.m3u8",FORCED=YES'
+    expect(output).to eq expected
+  end
+end

data/spec/playlist_item_spec.rb

@@ -29,6 +29,16 @@ describe M3u8::PlaylistItem do
     expected = '#EXT-X-STREAM-INF:PROGRAM-ID=1,' +
                %(CODECS="avc",BANDWIDTH=540\ntest.url)
     expect(output).to eq expected
+
+    hash = { codecs: 'avc', bitrate: 540, playlist: 'test.url', audio: 'test',
+             video: 'test2', average_bandwidth: 550, subtitles: 'subs',
+             closed_captions: 'caps' }
+    item = M3u8::PlaylistItem.new(hash)
+    output = item.to_s
+    expected = %(#EXT-X-STREAM-INF:CODECS="avc",BANDWIDTH=540,) +
+               %(AVERAGE-BANDWIDTH=550,AUDIO="test",VIDEO="test2",) +
+               %(SUBTITLES="subs",CLOSED-CAPTIONS="caps"\ntest.url)
+    expect(output).to eq expected
   end
 
   it 'should generate codecs string' do
@@ -38,36 +48,36 @@ describe M3u8::PlaylistItem do
     item = M3u8::PlaylistItem.new codecs: 'test'
     expect(item.codecs).to eq 'test'
 
-    item = M3u8::PlaylistItem.new audio: 'aac-lc'
+    item = M3u8::PlaylistItem.new audio_codec: 'aac-lc'
     expect(item.codecs).to eq 'mp4a.40.2'
 
-    item = M3u8::PlaylistItem.new audio: 'AAC-LC'
+    item = M3u8::PlaylistItem.new audio_codec: 'AAC-LC'
     expect(item.codecs).to eq 'mp4a.40.2'
 
-    item = M3u8::PlaylistItem.new audio: 'he-aac'
+    item = M3u8::PlaylistItem.new audio_codec: 'he-aac'
     expect(item.codecs).to eq 'mp4a.40.5'
 
-    item = M3u8::PlaylistItem.new audio: 'HE-AAC'
+    item = M3u8::PlaylistItem.new audio_codec: 'HE-AAC'
     expect(item.codecs).to eq 'mp4a.40.5'
 
-    item = M3u8::PlaylistItem.new audio: 'he-acc1'
+    item = M3u8::PlaylistItem.new audio_codec: 'he-acc1'
     expect(item.codecs).to be_nil
 
-    item = M3u8::PlaylistItem.new audio: 'mp3'
+    item = M3u8::PlaylistItem.new audio_codec: 'mp3'
     expect(item.codecs).to eq 'mp4a.40.34'
 
-    item = M3u8::PlaylistItem.new audio: 'MP3'
+    item = M3u8::PlaylistItem.new audio_codec: 'MP3'
     expect(item.codecs).to eq 'mp4a.40.34'
 
     options = { profile: 'baseline', level: 3.0 }
     item = M3u8::PlaylistItem.new options
     expect(item.codecs).to eq 'avc1.66.30'
 
-    options = { profile: 'baseline', level: 3.0, audio: 'aac-lc' }
+    options = { profile: 'baseline', level: 3.0, audio_codec: 'aac-lc' }
     item = M3u8::PlaylistItem.new options
     expect(item.codecs).to eq 'avc1.66.30,mp4a.40.2'
 
-    options = { profile: 'baseline', level: 3.0, audio: 'mp3' }
+    options = { profile: 'baseline', level: 3.0, audio_codec: 'mp3' }
     item = M3u8::PlaylistItem.new options
     expect(item.codecs).to eq 'avc1.66.30,mp4a.40.34'
 
@@ -75,7 +85,7 @@ describe M3u8::PlaylistItem do
     item = M3u8::PlaylistItem.new options
     expect(item.codecs).to eq 'avc1.42001f'
 
-    options = { profile: 'baseline', level: 3.1, audio: 'he-aac' }
+    options = { profile: 'baseline', level: 3.1, audio_codec: 'he-aac' }
     item = M3u8::PlaylistItem.new options
     expect(item.codecs).to eq 'avc1.42001f,mp4a.40.5'
 
@@ -83,7 +93,7 @@ describe M3u8::PlaylistItem do
     item = M3u8::PlaylistItem.new options
     expect(item.codecs).to eq 'avc1.77.30'
 
-    options = { profile: 'main', level: 3.0, audio: 'aac-lc' }
+    options = { profile: 'main', level: 3.0, audio_codec: 'aac-lc' }
     item = M3u8::PlaylistItem.new options
     expect(item.codecs).to eq 'avc1.77.30,mp4a.40.2'
 

data/spec/playlist_spec.rb

@@ -2,14 +2,14 @@ require 'spec_helper'
 
 describe M3u8::Playlist do
   it 'should generate codecs string' do
-    options = { profile: 'baseline', level: 3.0, audio: 'aac-lc' }
+    options = { profile: 'baseline', level: 3.0, audio_codec: 'aac-lc' }
     codecs = M3u8::Playlist.codecs options
     expect(codecs).to eq 'avc1.66.30,mp4a.40.2'
   end
 
   it 'should render master playlist' do
     options = { playlist: 'playlist_url', bitrate: 6400,
-                audio: 'mp3' }
+                audio_codec: 'mp3' }
     item = M3u8::PlaylistItem.new options
     playlist = M3u8::Playlist.new
     playlist.items.push item
@@ -20,7 +20,7 @@ describe M3u8::Playlist do
     expect(playlist.to_s).to eq output
 
     options = { program_id: '1', playlist: 'playlist_url', bitrate: 6400,
-                audio: 'mp3' }
+                audio_codec: 'mp3' }
     item = M3u8::PlaylistItem.new options
     playlist = M3u8::Playlist.new
     playlist.items.push item
@@ -32,7 +32,7 @@ describe M3u8::Playlist do
 
     options = { program_id: '2', playlist: 'playlist_url', bitrate: 50_000,
                 width: 1920, height: 1080, profile: 'high', level: 4.1,
-                audio: 'aac-lc' }
+                audio_codec: 'aac-lc' }
     item = M3u8::PlaylistItem.new options
     playlist = M3u8::Playlist.new
     playlist.items.push item
@@ -46,12 +46,12 @@ describe M3u8::Playlist do
 
     playlist = M3u8::Playlist.new
     options = { program_id: '1', playlist: 'playlist_url', bitrate: 6400,
-                audio: 'mp3' }
+                audio_codec: 'mp3' }
     item = M3u8::PlaylistItem.new options
     playlist.items.push item
     options = { program_id: '2', playlist: 'playlist_url', bitrate: 50_000,
                 width: 1920, height: 1080, profile: 'high', level: 4.1,
-                audio: 'aac-lc' }
+                audio_codec: 'aac-lc' }
     item = M3u8::PlaylistItem.new options
     playlist.items.push item
 
@@ -95,13 +95,15 @@ describe M3u8::Playlist do
       "#EXT-X-ENDLIST\n"
     expect(playlist.to_s).to eq output
 
-    options = { version: 1, cache: false, target: 12, sequence: 1 }
+    options = { version: 1, cache: false, target: 12, sequence: 1,
+                type: 'VOD' }
     playlist = M3u8::Playlist.new options
     options = { duration: 11.344644, segment: '1080-7mbps00000.ts' }
     item =  M3u8::SegmentItem.new options
     playlist.items.push item
 
     output = "#EXTM3U\n" \
+      "#EXT-X-PLAYLIST-TYPE:VOD\n" \
       "#EXT-X-VERSION:1\n" \
       "#EXT-X-MEDIA-SEQUENCE:1\n" \
       "#EXT-X-ALLOW-CACHE:NO\n" \
@@ -117,7 +119,7 @@ describe M3u8::Playlist do
     test_io = StringIO.new
     playlist = M3u8::Playlist.new
     options = { program_id: '1', playlist: 'playlist_url', bitrate: 6400,
-                audio: 'mp3' }
+                audio_codec: 'mp3' }
     item = M3u8::PlaylistItem.new options
     playlist.items.push item
     playlist.write test_io
@@ -142,7 +144,7 @@ describe M3u8::Playlist do
     playlist = M3u8::Playlist.new
     expect(playlist.master?).to be false
     options = { program_id: '1', playlist: 'playlist_url', bitrate: 6400,
-                audio: 'mp3' }
+                audio_codec: 'mp3' }
     item = M3u8::PlaylistItem.new options
     playlist.items.push item
 
@@ -191,12 +193,14 @@ describe M3u8::Playlist do
   end
 
   it 'should expose options as attributes' do
-    options = { version: 1, cache: false, target: 12, sequence: 1 }
+    options = { version: 1, cache: false, target: 12, sequence: 1,
+                type: 'VOD' }
     playlist = M3u8::Playlist.new options
     expect(playlist.version).to be 1
     expect(playlist.cache).to be false
     expect(playlist.target).to be 12
     expect(playlist.sequence).to be 1
+    expect(playlist.type).to eq('VOD')
   end
 
   it 'should allow reading of playlists' do

data/spec/reader_spec.rb

@@ -20,7 +20,7 @@ describe M3u8::Reader do
     expect(playlist.items.size).to eq 6
 
     item = playlist.items.last
-    expect(item.resolution).to be nil
+    expect(item.resolution).to be_nil
   end
 
   it 'should parse segment playlist' do
@@ -28,15 +28,96 @@ describe M3u8::Reader do
     reader = M3u8::Reader.new
     playlist = reader.read file
     expect(playlist.master?).to be false
+    expect(playlist.version).to eq 4
+    expect(playlist.sequence).to eq 1
+    expect(playlist.cache).to be false
+    expect(playlist.target).to eq 12
+    expect(playlist.type).to eq 'VOD'
+
+    item = playlist.items[0]
+    expect(item).to be_a(M3u8::SegmentItem)
+    expect(item.duration).to eq 11.344644
+    expect(item.comment).to be_nil
+
+    expect(playlist.items.size).to eq 138
+  end
+
+  it 'should parse segment playlist with comments' do
+    file = File.open 'spec/fixtures/playlist_with_comments.m3u8'
+    reader = M3u8::Reader.new
+    playlist = reader.read file
+    expect(playlist.master?).to be false
     expect(playlist.version).to be 4
     expect(playlist.sequence).to be 1
     expect(playlist.cache).to be false
     expect(playlist.target).to be 12
+    expect(playlist.type).to eq 'VOD'
 
     item = playlist.items[0]
     expect(item).to be_a(M3u8::SegmentItem)
     expect(item.duration).to eq 11.344644
+    expect(item.comment).to eq 'anything'
 
     expect(playlist.items.size).to eq 138
   end
+
+  it 'should parse variant playlist with audio options and groups' do
+    file = File.open 'spec/fixtures/variant_audio.m3u8'
+    reader = M3u8::Reader.new
+    playlist = reader.read file
+
+    expect(playlist.master?).to be true
+    expect(playlist.items.size).to eq 10
+
+    item = playlist.items[0]
+    expect(item).to be_a M3u8::MediaItem
+    expect(item.type).to eq 'AUDIO'
+    expect(item.group).to eq 'audio-lo'
+    expect(item.language).to eq 'eng'
+    expect(item.assoc_language).to eq 'spoken'
+    expect(item.name).to eq 'English'
+    expect(item.autoselect).to be true
+    expect(item.default).to be true
+    expect(item.uri).to eq 'englo/prog_index.m3u8'
+    expect(item.forced).to be true
+  end
+
+  it 'should parse variant playlist with camera angles' do
+    file = File.open 'spec/fixtures/variant_angles.m3u8'
+    reader = M3u8::Reader.new
+    playlist = reader.read file
+
+    expect(playlist.master?).to be true
+    expect(playlist.items.size).to eq 11
+
+    item = playlist.items[1]
+    expect(item).to be_a M3u8::MediaItem
+    expect(item.type).to eq 'VIDEO'
+    expect(item.group).to eq '200kbs'
+    expect(item.language).to be_nil
+    expect(item.name).to eq 'Angle2'
+    expect(item.autoselect).to be true
+    expect(item.default).to be false
+    expect(item.uri).to eq 'Angle2/200kbs/prog_index.m3u8'
+
+    item = playlist.items[9]
+    expect(item.average_bandwidth).to eq 300_001
+    expect(item.audio).to eq 'aac'
+    expect(item.video).to eq '200kbs'
+    expect(item.closed_captions).to eq 'captions'
+    expect(item.subtitles).to eq 'subs'
+  end
+
+  it 'should process multiple reads as separate playlists' do
+    file = File.open 'spec/fixtures/master.m3u8'
+    reader = M3u8::Reader.new
+    playlist = reader.read file
+
+    expect(playlist.items.size).to eq 6
+
+    file = File.open 'spec/fixtures/master.m3u8'
+    playlist = reader.read file
+
+    expect(playlist.items.size).to eq 6
+  end
 end

data/spec/segment_item_spec.rb

@@ -6,6 +6,13 @@ describe M3u8::SegmentItem do
     item = M3u8::SegmentItem.new(hash)
     expect(item.duration).to eq 10.991
     expect(item.segment).to eq 'test.ts'
+    expect(item.comment).to be_nil
+
+    hash = { duration: 10.991, segment: 'test.ts', comment: 'anything' }
+    item = M3u8::SegmentItem.new(hash)
+    expect(item.duration).to eq 10.991
+    expect(item.segment).to eq 'test.ts'
+    expect(item.comment).to eq 'anything'
   end
 
   it 'should provide m3u8 format representation' do
@@ -14,5 +21,11 @@ describe M3u8::SegmentItem do
     output = item.to_s
     expected = "#EXTINF:10.991,\ntest.ts"
     expect(output).to eq expected
+
+    hash = { duration: 10.991, segment: 'test.ts', comment: 'anything' }
+    item = M3u8::SegmentItem.new(hash)
+    output = item.to_s
+    expected = "#EXTINF:10.991,anything\ntest.ts"
+    expect(output).to eq expected
   end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 require 'm3u8/playlist'
 require 'm3u8/playlist_item'
 require 'm3u8/segment_item'
+require 'm3u8/media_item'
 require 'm3u8/reader'
 require 'm3u8/writer'
 require 'm3u8/error'

data/spec/writer_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe M3u8::Writer do
   it 'should render master playlist' do
     options = { playlist: 'playlist_url', bitrate: 6400,
-                audio: 'mp3' }
+                audio_codec: 'mp3' }
     item = M3u8::PlaylistItem.new options
     playlist = M3u8::Playlist.new
     playlist.items.push item
@@ -18,7 +18,7 @@ describe M3u8::Writer do
     expect(io.string).to eq output
 
     options = { program_id: '1', playlist: 'playlist_url', bitrate: 6400,
-                audio: 'mp3' }
+                audio_codec: 'mp3' }
     item = M3u8::PlaylistItem.new options
     playlist = M3u8::Playlist.new
     playlist.items.push item
@@ -34,7 +34,7 @@ describe M3u8::Writer do
 
     options = { program_id: '2', playlist: 'playlist_url', bitrate: 50_000,
                 width: 1920, height: 1080, profile: 'high', level: 4.1,
-                audio: 'aac-lc' }
+                audio_codec: 'aac-lc' }
     item = M3u8::PlaylistItem.new options
     playlist = M3u8::Playlist.new
     playlist.items.push item
@@ -51,12 +51,12 @@ describe M3u8::Writer do
 
     playlist = M3u8::Playlist.new
     options = { program_id: '1', playlist: 'playlist_url', bitrate: 6400,
-                audio: 'mp3' }
+                audio_codec: 'mp3' }
     item = M3u8::PlaylistItem.new options
     playlist.items.push item
     options = { program_id: '2', playlist: 'playlist_url', bitrate: 50_000,
                 width: 1920, height: 1080, profile: 'high', level: 4.1,
-                audio: 'aac-lc' }
+                audio_codec: 'aac-lc' }
     item = M3u8::PlaylistItem.new options
     playlist.items.push item
 
@@ -110,13 +110,15 @@ describe M3u8::Writer do
     writer.write playlist
     expect(io.string).to eq output
 
-    options = { version: 1, cache: false, target: 12, sequence: 1 }
+    options = { version: 1, cache: false, target: 12, sequence: 1,
+                type: 'EVENT' }
     playlist = M3u8::Playlist.new options
     options = { duration: 11.344644, segment: '1080-7mbps00000.ts' }
     item =  M3u8::SegmentItem.new options
     playlist.items.push item
 
     output = "#EXTM3U\n" \
+      "#EXT-X-PLAYLIST-TYPE:EVENT\n" \
       "#EXT-X-VERSION:1\n" \
       "#EXT-X-MEDIA-SEQUENCE:1\n" \
       "#EXT-X-ALLOW-CACHE:NO\n" \

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: m3u8
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Seth Deckard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-16 00:00:00.000000000 Z
+date: 2015-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,6 +71,7 @@ files:
 - Rakefile
 - lib/m3u8.rb
 - lib/m3u8/error.rb
+- lib/m3u8/media_item.rb
 - lib/m3u8/playlist.rb
 - lib/m3u8/playlist_item.rb
 - lib/m3u8/reader.rb
@@ -80,6 +81,10 @@ files:
 - m3u8.gemspec
 - spec/fixtures/master.m3u8
 - spec/fixtures/playlist.m3u8
+- spec/fixtures/playlist_with_comments.m3u8
+- spec/fixtures/variant_angles.m3u8
+- spec/fixtures/variant_audio.m3u8
+- spec/media_item_spec.rb
 - spec/playlist_item_spec.rb
 - spec/playlist_spec.rb
 - spec/reader_spec.rb
@@ -113,6 +118,10 @@ summary: Generate and parse m3u8 playlists for HTTP Live Streaming (HLS).
 test_files:
 - spec/fixtures/master.m3u8
 - spec/fixtures/playlist.m3u8
+- spec/fixtures/playlist_with_comments.m3u8
+- spec/fixtures/variant_angles.m3u8
+- spec/fixtures/variant_audio.m3u8
+- spec/media_item_spec.rb
 - spec/playlist_item_spec.rb
 - spec/playlist_spec.rb
 - spec/reader_spec.rb