m3u8 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 266fa2220bfc0c9acdc04144747da7d7a01d9b5f
-  data.tar.gz: ed5b06cd8baccf5eec7a4fd592a4715a367fa791
+  metadata.gz: ddb2f4d0d192d3240638f292df9af726bb34cc0a
+  data.tar.gz: b83b3ef504e0103d8dfa1295ee8b27b5860824b1
 SHA512:
-  metadata.gz: 9942efab7468eaa317280e6b465251d972700e43ce3b7b0ca281c4fe3084ad3743acbe24074a324fdaa4f9421be0da732a3128e00311b468caf257814337ba1e
-  data.tar.gz: d02d9f3c6853f68557ff89d5a6a7d3d4f3a2c77a5d1ea535fa3e5c89911ec0c724e8646dfaa2da6f951a8672494fb32cfc1b9dd0502da95d29ed0a82e94e3d94
+  metadata.gz: f07895da5aa3a400e2020c3ac0d14e421ac99869d35573985f1589809267e1ddb2d1b25a2174eb88057ba8497f0651f12f453c8b1c765453ef0ff68e99d0689c
+  data.tar.gz: 053c1be2adfa5bb2593fc1ee603c21af04f0ba71e8f0fa232a379ea4d27ad8789b9ff753b5e94c1a0e5c41ee9adc65eef043ad42ed1d58ce558ad3a24cfd5437

data/.rubocop.yml

@@ -2,5 +2,8 @@ AllCops:
   Exclude:
     - 'spec/spec_helper.rb'
     - 'm3u8.gemspec'
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*'
 Style/StringLiterals:
   EnforcedStyle: single_quotes

data/CHANGELOG.md

@@ -1,8 +1,11 @@
+**0.8.1**
+Merged pull request #23 from [ryanische](https:/github.com/ryanische) which fixes issue of CODEC attribute validation not matching the HLS I-D.
+
 **0.8.0 (4/13/2017)**
 
-* Added several improvements for writing playlists: Allow playlist to be initalized as master, expose `write_header`/`write_footer` on `Writer` class. 
-* Added support for the `#EXT-X-DISCONTINUITY-SEQUENCE` tag. Added missing attributes to `MediaItem`: `INSTREAM-ID`, `CHARACTERISTICS`, `CHANNELS`, Added missing `HDCP-LEVEL` attribute to `PlaylistItem`. 
-* Fixed issue [#20](https://github.com/sethdeckard/m3u8/issues/20). 
+* Added several improvements for writing playlists: Allow playlist to be initalized as master, expose `write_header`/`write_footer` on `Writer` class.
+* Added support for the `#EXT-X-DISCONTINUITY-SEQUENCE` tag. Added missing attributes to `MediaItem`: `INSTREAM-ID`, `CHARACTERISTICS`, `CHANNELS`, Added missing `HDCP-LEVEL` attribute to `PlaylistItem`.
+* Fixed issue [#20](https://github.com/sethdeckard/m3u8/issues/20).
 * Merged pull request #21 from [rmberg](https://github.com/rmberg), adding support for live playlists to `Writer`.
 
 ***

data/lib/m3u8/error.rb

@@ -3,9 +3,6 @@ module M3u8
   class InvalidPlaylistError < StandardError
   end
 
-  class MissingCodecError < StandardError
-  end
-
   class PlaylistTypeError < StandardError
   end
 end

data/lib/m3u8/playlist_item.rb

@@ -8,7 +8,6 @@ module M3u8
                   :audio_codec, :level, :profile, :video, :audio, :uri,
                   :average_bandwidth, :subtitles, :closed_captions, :iframe,
                   :frame_rate, :name, :hdcp_level
-    MISSING_CODEC_MESSAGE = 'Audio or video codec info should be provided.'
 
     def initialize(params = {})
       self.iframe = false
@@ -37,16 +36,23 @@ module M3u8
     def codecs
       return @codecs unless @codecs.nil?
 
-      video_code = video_codec(profile, level)
-      return audio_codec_code if video_code.nil?
-      return video_code if audio_codec_code.nil?
+      video_codec_string = video_codec(profile, level)
 
-      "#{video_code},#{audio_codec_code}"
+      # profile and/or level were specified but not recognized,
+      # do not specify any codecs
+      return nil if !(profile.nil? && level.nil?) && video_codec_string.nil?
+
+      audio_codec_string = audio_codec_code
+
+      # audio codec was specified but not recognized,
+      # do not specify any codecs
+      return nil if !@audio_codec.nil? && audio_codec_string.nil?
+
+      codec_strings = [video_codec_string, audio_codec_string].compact
+      codec_strings.empty? ? nil : codec_strings.join(',')
     end
 
     def to_s
-      validate
-
       m3u8_format
     end
 
@@ -88,10 +94,6 @@ module M3u8
       value if value > 0
     end
 
-    def validate
-      raise MissingCodecError, MISSING_CODEC_MESSAGE if codecs.nil?
-    end
-
     def m3u8_format
       return %(#EXT-X-I-FRAME-STREAM-INF:#{attributes},URI="#{uri}") if iframe
 
@@ -134,6 +136,7 @@ module M3u8
     end
 
     def codecs_format
+      return if codecs.nil?
       %(CODECS="#{codecs}")
     end
 

data/lib/m3u8/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 # M3u8 provides parsing, generation, and validation of m3u8 playlists
 module M3u8
-  VERSION = '0.8.0'
+  VERSION = '0.8.1'
 end

data/spec/lib/m3u8/playlist_item_spec.rb

@@ -75,11 +75,83 @@ describe M3u8::PlaylistItem do
 
   describe '#to_s' do
     context 'when codecs is missing' do
-      it 'raises error' do
+      it 'does not specify CODECS' do
         params = { bandwidth: 540, uri: 'test.url' }
         item = M3u8::PlaylistItem.new params
-        message = 'Audio or video codec info should be provided.'
-        expect { item.to_s }.to raise_error(M3u8::MissingCodecError, message)
+        expect(item.to_s).not_to include('CODECS')
+      end
+    end
+
+    context 'when level is not recognized' do
+      it 'does not specify CODECS' do
+        params = { bandwidth: 540, uri: 'test.url', level: 9001 }
+        item = M3u8::PlaylistItem.new params
+        expect(item.to_s).not_to include('CODECS')
+      end
+    end
+
+    context 'when profile is not recognized' do
+      it 'does not specify CODECS' do
+        params = { bandwidth: 540, uri: 'test.url', profile: 'best' }
+        item = M3u8::PlaylistItem.new params
+        expect(item.to_s).not_to include('CODECS')
+      end
+    end
+
+    context 'when profile and level are not recognized' do
+      it 'does not specify CODECS' do
+        params = { bandwidth: 540, uri: 'test.url', profile: 'best',
+                   level: 9001 }
+        item = M3u8::PlaylistItem.new params
+        expect(item.to_s).not_to include('CODECS')
+      end
+
+      context 'when audio codec is recognized' do
+        it 'does not specify CODECS' do
+          params = { bandwidth: 540, uri: 'test.url', profile: 'best',
+                     level: 9001, audio_codec: 'aac-lc' }
+          item = M3u8::PlaylistItem.new params
+          expect(item.to_s).not_to include('CODECS')
+        end
+      end
+    end
+
+    context 'when profile and level are not set' do
+      context 'when audio codec is recognized' do
+        it 'specifies CODECS with audio codec' do
+          params = { bandwidth: 540, uri: 'test.url', audio_codec: 'aac-lc' }
+          item = M3u8::PlaylistItem.new params
+          expect(item.to_s).to include('CODECS="mp4a.40.2"')
+        end
+      end
+    end
+
+    context 'when profile and level are recognized' do
+      context 'when audio codec is not recognized' do
+        it 'does not specify CODECS' do
+          params = { bandwidth: 540, uri: 'test.url', profile: 'high',
+                     level: 4.1, audio_codec: 'fuzzy' }
+          item = M3u8::PlaylistItem.new params
+          expect(item.to_s).not_to include('CODECS')
+        end
+      end
+
+      context 'when audio codec is not set' do
+        it 'specifies CODECS with video codec' do
+          params = { bandwidth: 540, uri: 'test.url', profile: 'high',
+                     level: 4.1 }
+          item = M3u8::PlaylistItem.new params
+          expect(item.to_s).to include('CODECS="avc1.640029"')
+        end
+      end
+
+      context 'when audio codec is recognized' do
+        it 'specifies CODECS with video codec and audio_codec' do
+          params = { bandwidth: 540, uri: 'test.url', profile: 'high',
+                     level: 4.1, audio_codec: 'aac-lc' }
+          item = M3u8::PlaylistItem.new params
+          expect(item.to_s).to include('CODECS="avc1.640029,mp4a.40.2"')
+        end
       end
     end
 
@@ -101,8 +173,8 @@ describe M3u8::PlaylistItem do
                     subtitles: 'subs', frame_rate: 30, closed_captions: 'caps',
                     name: 'SD', hdcp_level: 'TYPE-0', program_id: '1' }
         item = described_class.new(options)
-        expected = %(#EXT-X-STREAM-INF:PROGRAM-ID=1,CODECS="avc",BANDWIDTH=540,) +
-                   %(AVERAGE-BANDWIDTH=500,FRAME-RATE=30.000,) +
+        expected = %(#EXT-X-STREAM-INF:PROGRAM-ID=1,CODECS="avc",) +
+                   'BANDWIDTH=540,AVERAGE-BANDWIDTH=500,FRAME-RATE=30.000,' \
                    'HDCP-LEVEL=TYPE-0,' +
                    %(AUDIO="test",VIDEO="test2",SUBTITLES="subs",) +
                    %(CLOSED-CAPTIONS="caps",NAME="SD"\ntest.url)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: m3u8
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Seth Deckard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-13 00:00:00.000000000 Z
+date: 2017-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler