video_converter 0.6.6 → 0.6.7

data/lib/video_converter/input.rb

@@ -79,12 +79,18 @@ module VideoConverter
     end
 
     def output_groups(outputs)
-      groups = []
-      outputs.select { |output| output.type == 'playlist' }.each do |playlist|
+      # qualities with the same group param are one group
+      groups = Hash.new([])
+      outputs.each { |output| groups[output.group] += [output] if output.group.present? }
+      groups = groups.values 
+
+      # qualities of one playlist are one group
+      (outputs - groups.flatten).select { |output| output.type == 'playlist' }.each do |playlist|
         paths = playlist.streams.map { |stream| stream[:path] }
         groups << outputs.select { |output| paths.include?(output.filename) }.unshift(playlist)
       end
-      # qualities without playlist are separate groups
+      
+      # other outputs are separate groups
       (outputs - groups.flatten).each { |output| groups << [output] }
       groups
     end

data/lib/video_converter/output.rb

@@ -9,7 +9,7 @@ module VideoConverter
     self.log = 'converter.log'
     self.keyframe_interval_in_seconds = 4
 
-    attr_accessor :work_dir, :filename, :log, :type, :chunks_dir, :ffmpeg_output, :path, :streams, :width, :height, :one_pass, :rotate, :faststart, :thumbnails, :uid, :options
+    attr_accessor :chunks_dir, :faststart, :ffmpeg_output, :filename, :group, :height, :log, :one_pass, :options, :path, :rotate, :streams, :thumbnails, :type, :uid, :width, :work_dir
 
     def initialize params = {}
       self.work_dir = File.join(self.class.work_dir, params[:uid])
@@ -26,7 +26,7 @@ module VideoConverter
         self.ffmpeg_output = File.join(work_dir, filename)
       end
       raise ArgumentError.new('Invalid type') unless %w(default segmented playlist).include?(type)
-      [:path, :streams, :width, :height, :one_pass, :rotate, :faststart, :thumbnails].each { |attr| self.send("#{attr}=", params[attr]) }
+      [:path, :streams, :width, :height, :one_pass, :rotate, :faststart, :thumbnails, :group].each { |attr| self.send("#{attr}=", params[attr]) }
       [:video_bitrate, :audio_bitrate].each { |bitrate| params[bitrate] = "#{params[bitrate]}k" if params[bitrate].is_a?(Numeric) }
 
       # options will be substituted to convertation commands

data/lib/video_converter/version.rb

@@ -1,3 +1,3 @@
 module VideoConverter
-  VERSION = "0.6.6"
+  VERSION = "0.6.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: video_converter
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-16 00:00:00.000000000 Z
+date: 2014-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: video_screenshoter
@@ -140,7 +140,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3100160635854991743
+      hash: -687398470917858121
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -149,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3100160635854991743
+      hash: -687398470917858121
 requirements:
 - ffmpeg, version 1.2 or greated configured with libx264 and libfaac
 - live_segmenter to convert to hls