m3u8 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 423d91cc5175fd049a43ce26efff10b0ca1ad16f
-  data.tar.gz: 65b634315e86db26cdfdc6f19f89b245714bbb6e
+  metadata.gz: e96c846721a2a84feb5682879e7e3bfcb3f3e0dd
+  data.tar.gz: 438952587f84fa55401e22ba4c2f5c089de14af9
 SHA512:
-  metadata.gz: 48e8dd6e5122c35707fbbf8da5a2d2e2633c5083b4da1b7e993c5301f72d1a53a696129f744a26e2f44e6d965e890465084ee5b383ea6d2596510b63e8b49f18
-  data.tar.gz: a06803324c593c55cbe3943b28194262949bbc353e9562bb200487e0a96bd36b2b119078dfb5f5be7e31e961cd24610830f94c1e10ea20b2bbad492c4e7a6941
+  metadata.gz: 62a05705eefa8c3929c9db56f65be2f2137f90c1e3fecd8e228a840c7285a9a5f20b7c2a59055ba462e55329d54214bee41497c5d0aef3b965cd6deef784d3f4
+  data.tar.gz: 3a34c9d4e231f2d37030b4a8357accc486d1cb88d67b238abe1183f1f1e87e8e7d2a0d8b45bd0bfb51ff682c664c78c7c34a43f166f4c77d2a85695763479289

data/CHANGELOG.md

@@ -1,4 +1,6 @@
-#### 0.6.3 (2/17/2016) - Merged pulled request #7 from [jviney](https://github.com/jviney), fixing bug with require order.
+#### 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.
 
 #### 0.6.2 (2/16/2016) - Added support for EXT-X-SESSION-KEY tags. Merged pulled request #6 from [jviney](https://github.com/jviney), fixing bug with codec string value.
 

data/lib/m3u8.rb

@@ -1,3 +1,4 @@
+require 'bigdecimal'
 require 'stringio'
 Dir[File.dirname(__FILE__) + '/m3u8/*.rb'].sort.each { |file| require file }
 

data/lib/m3u8/playlist_item.rb

@@ -5,7 +5,8 @@ module M3u8
     extend M3u8
     attr_accessor :program_id, :width, :height, :codecs, :bandwidth,
                   :audio_codec, :level, :profile, :video, :audio, :uri,
-                  :average_bandwidth, :subtitles, :closed_captions, :iframe
+                  :average_bandwidth, :subtitles, :closed_captions, :iframe,
+                  :frame_rate
     MISSING_CODEC_MESSAGE = 'Audio or video codec info should be provided.'
 
     def initialize(params = {})
@@ -19,12 +20,14 @@ module M3u8
       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'] }
@@ -73,6 +76,13 @@ module M3u8
       { width: width, height: height }
     end
 
+    def self.parse_frame_rate(frame_rate)
+      return if frame_rate.nil?
+
+      value = BigDecimal(frame_rate)
+      value if value > 0
+    end
+
     def validate
       fail MissingCodecError, MISSING_CODEC_MESSAGE if codecs.nil?
     end
@@ -89,6 +99,7 @@ module M3u8
        codecs_format,
        bandwidth_format,
        average_bandwidth_format,
+       frame_rate_format,
        audio_format,
        video_format,
        subtitles_format,
@@ -105,6 +116,11 @@ module M3u8
       "RESOLUTION=#{resolution}"
     end
 
+    def frame_rate_format
+      return if frame_rate.nil?
+      "FRAME-RATE=#{format('%.3f', frame_rate)}"
+    end
+
     def codecs_format
       %(CODECS="#{codecs}")
     end
@@ -135,7 +151,12 @@ module M3u8
 
     def closed_captions_format
       return if closed_captions.nil?
-      %(CLOSED-CAPTIONS="#{closed_captions}")
+
+      if closed_captions == 'NONE'
+        %(CLOSED-CAPTIONS=NONE)
+      else
+        %(CLOSED-CAPTIONS="#{closed_captions}")
+      end
     end
 
     def audio_codec

data/lib/m3u8/version.rb

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

data/spec/lib/m3u8/playlist_item_spec.rb

@@ -17,7 +17,7 @@ describe M3u8::PlaylistItem do
 
   it 'should parse m3u8 text into instance' do
     format = %(#EXT-X-STREAM-INF:CODECS="avc",BANDWIDTH=540,) +
-             %(PROGRAM-ID=1,RESOLUTION=1920x1080,) +
+             %(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)
@@ -27,6 +27,7 @@ describe M3u8::PlaylistItem do
     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'
@@ -52,11 +53,11 @@ describe M3u8::PlaylistItem do
 
   it 'should provide m3u8 format representation' do
     hash = { program_id: 1, width: 1920, height: 1080, codecs: 'avc',
-             bandwidth: 540, uri: 'test.url' }
+             bandwidth: 540, uri: 'test.url', closed_captions: 'NONE' }
     item = M3u8::PlaylistItem.new(hash)
     output = item.to_s
     expected = '#EXT-X-STREAM-INF:PROGRAM-ID=1,RESOLUTION=1920x1080,' +
-               %(CODECS="avc",BANDWIDTH=540\ntest.url)
+               %(CODECS="avc",BANDWIDTH=540,CLOSED-CAPTIONS=NONE\ntest.url)
     expect(output).to eq expected
 
     hash = { program_id: 1, codecs: 'avc', bandwidth: 540,
@@ -68,13 +69,14 @@ describe M3u8::PlaylistItem do
     expect(output).to eq expected
 
     hash = { codecs: 'avc', bandwidth: 540, uri: 'test.url', audio: 'test',
-             video: 'test2', average_bandwidth: 550, subtitles: 'subs',
-             closed_captions: 'caps' }
+             video: 'test2', average_bandwidth: 500, subtitles: 'subs',
+             frame_rate: 30, 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)
+               %(AVERAGE-BANDWIDTH=500,FRAME-RATE=30.000,) +
+               %(AUDIO="test",VIDEO="test2",SUBTITLES="subs",) +
+               %(CLOSED-CAPTIONS="caps"\ntest.url)
     expect(output).to eq expected
   end
 

metadata

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