m3u8 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e96c846721a2a84feb5682879e7e3bfcb3f3e0dd
-  data.tar.gz: 438952587f84fa55401e22ba4c2f5c089de14af9
+  metadata.gz: 9771b4d74b91d96ee4c6eca99cce96fb16705233
+  data.tar.gz: 39dca18b7625bcceedb21f1dab3aa8363a773a17
 SHA512:
-  metadata.gz: 62a05705eefa8c3929c9db56f65be2f2137f90c1e3fecd8e228a840c7285a9a5f20b7c2a59055ba462e55329d54214bee41497c5d0aef3b965cd6deef784d3f4
-  data.tar.gz: 3a34c9d4e231f2d37030b4a8357accc486d1cb88d67b238abe1183f1f1e87e8e7d2a0d8b45bd0bfb51ff682c664c78c7c34a43f166f4c77d2a85695763479289
+  metadata.gz: 79a97144562036dccad8cd96e4c753890a6616920707a617e50b84e2d6ec5c7f1648be6bfa1d34508446bda93f5b510ba0d98680caebdc325f233e917b6a2c3f
+  data.tar.gz: 81d6de6a6162f2820da6d2d0e652ae0b1917177214203530ccc5004eb56382b5e69249781a79add1dfa8949599a4b9e1dafaacb181ed90a59411be458c97d228

data/CHANGELOG.md

@@ -1,4 +1,6 @@
-#### 0.6.4 (2/21/2016) - Merged pull requests #8, #9, and #10 from [jviney](https://github.com/jviney). Adds FRAME-RATE attribute to PlayListItem, fixes NONE option for CLOSED-CAPTIONS attribute. 
+#### 0.6.5 (3/18/2016) - Merged pull requests #11 from [jviney](https://github.com/jviney). Adds codec string for main profile level 4.1.
+
+#### 0.6.4 (2/21/2016) - Merged pull requests #8, #9, and #10 from [jviney](https://github.com/jviney). Adds FRAME-RATE attribute to PlayListItem, fixes NONE option for CLOSED-CAPTIONS attribute.
 
 #### 0.6.3 (2/17/2016) - Merged pull request #7 from [jviney](https://github.com/jviney), fixing bug with require order.
 

data/lib/m3u8/playlist_item.rb

@@ -2,7 +2,7 @@ module M3u8
   # PlaylistItem represents a set of EXT-X-STREAM-INF or
   # EXT-X-I-FRAME-STREAM-INF attributes
   class PlaylistItem
-    extend M3u8
+    include M3u8
     attr_accessor :program_id, :width, :height, :codecs, :bandwidth,
                   :audio_codec, :level, :profile, :video, :audio, :uri,
                   :average_bandwidth, :subtitles, :closed_captions, :iframe,
@@ -17,21 +17,15 @@ module M3u8
     end
 
     def self.parse(text)
-      attributes = parse_attributes text
-      resolution = parse_resolution attributes['RESOLUTION']
-      average = parse_average_bandwidth attributes['AVERAGE-BANDWIDTH']
-      frame_rate = parse_frame_rate attributes['FRAME-RATE']
-      options = { program_id: attributes['PROGRAM-ID'],
-                  codecs: attributes['CODECS'],
-                  width: resolution[:width],
-                  height: resolution[:height],
-                  bandwidth: attributes['BANDWIDTH'].to_i,
-                  average_bandwidth: average,
-                  frame_rate: frame_rate,
-                  video: attributes['VIDEO'], audio: attributes['AUDIO'],
-                  uri: attributes['URI'], subtitles: attributes['SUBTITLES'],
-                  closed_captions: attributes['CLOSED-CAPTIONS'] }
-      PlaylistItem.new options
+      item = PlaylistItem.new
+      item.parse(text)
+      item
+    end
+
+    def parse(text)
+      attributes = parse_attributes(text)
+      options = options_from_attributes(attributes)
+      initialize(options)
     end
 
     def resolution
@@ -63,11 +57,26 @@ module M3u8
 
     private
 
-    def self.parse_average_bandwidth(value)
+    def options_from_attributes(attributes)
+      resolution = parse_resolution(attributes['RESOLUTION'])
+      { program_id: attributes['PROGRAM-ID'],
+        codecs: attributes['CODECS'],
+        width: resolution[:width],
+        height: resolution[:height],
+        bandwidth: attributes['BANDWIDTH'].to_i,
+        average_bandwidth:
+          parse_average_bandwidth(attributes['AVERAGE-BANDWIDTH']),
+        frame_rate: parse_frame_rate(attributes['FRAME-RATE']),
+        video: attributes['VIDEO'], audio: attributes['AUDIO'],
+        uri: attributes['URI'], subtitles: attributes['SUBTITLES'],
+        closed_captions: attributes['CLOSED-CAPTIONS'] }
+    end
+
+    def parse_average_bandwidth(value)
       value.to_i unless value.nil?
     end
 
-    def self.parse_resolution(resolution)
+    def parse_resolution(resolution)
       return { width: nil, height: nil } if resolution.nil?
 
       values = resolution.split('x')
@@ -76,7 +85,7 @@ module M3u8
       { width: width, height: height }
     end
 
-    def self.parse_frame_rate(frame_rate)
+    def parse_frame_rate(frame_rate)
       return if frame_rate.nil?
 
       value = BigDecimal(frame_rate)
@@ -184,6 +193,7 @@ module M3u8
       return 'avc1.77.30' if level == 3.0
       return 'avc1.4d001f' if level == 3.1
       return 'avc1.4d0028' if level == 4.0
+      return 'avc1.4d0029' if level == 4.1
     end
 
     def high_codec_string(level)

data/lib/m3u8/version.rb

@@ -1,4 +1,4 @@
 # M3u8 provides parsing, generation, and validation of m3u8 playlists
 module M3u8
-  VERSION = '0.6.4'
+  VERSION = '0.6.5'
 end

data/spec/lib/m3u8/playlist_item_spec.rb

@@ -15,40 +15,45 @@ describe M3u8::PlaylistItem do
     expect(item.iframe).to be false
   end
 
-  it 'should parse m3u8 text into instance' do
-    format = %(#EXT-X-STREAM-INF:CODECS="avc",BANDWIDTH=540,) +
-             %(PROGRAM-ID=1,RESOLUTION=1920x1080,FRAME-RATE=23.976,) +
-             %(AVERAGE-BANDWIDTH=550,AUDIO="test",VIDEO="test2",) +
-             %(SUBTITLES="subs",CLOSED-CAPTIONS="caps",URI="test.url")
-    item = M3u8::PlaylistItem.parse(format)
-    expect(item.program_id).to eq '1'
-    expect(item.codecs).to eq 'avc'
-    expect(item.bandwidth).to eq 540
-    expect(item.average_bandwidth).to eq 550
-    expect(item.width).to eq 1920
-    expect(item.height).to eq 1080
-    expect(item.frame_rate).to eq BigDecimal('23.976')
-    expect(item.audio).to eq 'test'
-    expect(item.video).to eq 'test2'
-    expect(item.subtitles).to eq 'subs'
-    expect(item.closed_captions).to eq 'caps'
-    expect(item.uri).to eq 'test.url'
-
-    format = %(#EXT-X-STREAM-INF:CODECS="avc",BANDWIDTH=540,) +
-             %(PROGRAM-ID=1,AUDIO="test",VIDEO="test2",) +
-             %(SUBTITLES="subs",CLOSED-CAPTIONS="caps",URI="test.url")
-    item = M3u8::PlaylistItem.parse(format)
-    expect(item.program_id).to eq '1'
-    expect(item.codecs).to eq 'avc'
-    expect(item.bandwidth).to eq 540
-    expect(item.average_bandwidth).to be_nil
-    expect(item.width).to be_nil
-    expect(item.height).to be_nil
-    expect(item.audio).to eq 'test'
-    expect(item.video).to eq 'test2'
-    expect(item.subtitles).to eq 'subs'
-    expect(item.closed_captions).to eq 'caps'
-    expect(item.uri).to eq 'test.url'
+  describe 'parse' do
+    it 'should parse m3u8 text into instance' do
+      input = %(#EXT-X-STREAM-INF:CODECS="avc",BANDWIDTH=540,) +
+              %(PROGRAM-ID=1,RESOLUTION=1920x1080,FRAME-RATE=23.976,) +
+              %(AVERAGE-BANDWIDTH=550,AUDIO="test",VIDEO="test2",) +
+              %(SUBTITLES="subs",CLOSED-CAPTIONS="caps",URI="test.url")
+      item = M3u8::PlaylistItem.parse(input)
+      expect(item.program_id).to eq '1'
+      expect(item.codecs).to eq 'avc'
+      expect(item.bandwidth).to eq 540
+      expect(item.average_bandwidth).to eq 550
+      expect(item.width).to eq 1920
+      expect(item.height).to eq 1080
+      expect(item.frame_rate).to eq BigDecimal('23.976')
+      expect(item.audio).to eq 'test'
+      expect(item.video).to eq 'test2'
+      expect(item.subtitles).to eq 'subs'
+      expect(item.closed_captions).to eq 'caps'
+      expect(item.uri).to eq 'test.url'
+    end
+
+    it 'should parse m3u8 into current instance' do
+      input = %(#EXT-X-STREAM-INF:CODECS="avc",BANDWIDTH=540,) +
+              %(PROGRAM-ID=1,AUDIO="test",VIDEO="test2",) +
+              %(SUBTITLES="subs",CLOSED-CAPTIONS="caps",URI="test.url")
+      item = M3u8::PlaylistItem.new
+      item.parse(input)
+      expect(item.program_id).to eq '1'
+      expect(item.codecs).to eq 'avc'
+      expect(item.bandwidth).to eq 540
+      expect(item.average_bandwidth).to be_nil
+      expect(item.width).to be_nil
+      expect(item.height).to be_nil
+      expect(item.audio).to eq 'test'
+      expect(item.video).to eq 'test2'
+      expect(item.subtitles).to eq 'subs'
+      expect(item.closed_captions).to eq 'caps'
+      expect(item.uri).to eq 'test.url'
+    end
   end
 
   it 'should provide m3u8 format representation' do
@@ -154,6 +159,10 @@ describe M3u8::PlaylistItem do
     item = M3u8::PlaylistItem.new options
     expect(item.codecs).to eq 'avc1.4d0028'
 
+    options = { profile: 'main', level: 4.1 }
+    item = M3u8::PlaylistItem.new options
+    expect(item.codecs).to eq 'avc1.4d0029'
+
     options = { profile: 'high', level: 3.1 }
     item = M3u8::PlaylistItem.new options
     expect(item.codecs).to eq 'avc1.64001f'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: m3u8
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Seth Deckard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-21 00:00:00.000000000 Z
+date: 2016-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler