video_converter 0.7.4 → 0.7.5

Sign up to get free protection for your applications and to get access to all the features.
@@ -6,7 +6,7 @@ module VideoConverter
6
6
  attr_accessor :bin, :command
7
7
  end
8
8
  self.bin = '/usr/local/bin/mp4frag'
9
- self.command = '%{bin} %{inputs} --manifest %{manifest} --index 1>>%{log} 2>&1 || exit 1'
9
+ self.command = 'bash -c "pushd %{work_dir}; %{bin} %{inputs} --manifest %{manifest} --index 1>>%{log} 2>&1 || exit 1; popd"'
10
10
 
11
11
  def self.run(outputs)
12
12
  success = true
@@ -25,11 +25,12 @@ module VideoConverter
25
25
 
26
26
  def self.prepare_params(outputs)
27
27
  {
28
+ :work_dir => outputs.select { |output| output.type != 'playlist' }.first.work_dir,
28
29
  :bin => bin,
29
- :inputs => outputs.select { |output| output.type != 'playlist' }.map { |input| "--src #{input.ffmpeg_output}" }.join(' '),
30
+ :inputs => outputs.select { |output| output.type != 'playlist' }.map { |input| "--src #{File.basename(input.ffmpeg_output)}" }.join(' '),
30
31
  :manifest => outputs.detect { |output| output.type == 'playlist' }.ffmpeg_output,
31
32
  :log => outputs.first.log
32
33
  }
33
34
  end
34
35
  end
35
- end
36
+ end
@@ -1,3 +1,3 @@
1
1
  module VideoConverter
2
- VERSION = "0.7.4"
2
+ VERSION = "0.7.5"
3
3
  end
data/test/test_helper.rb CHANGED
@@ -5,4 +5,4 @@ require 'shoulda-context'
5
5
  require 'video_converter'
6
6
 
7
7
  VideoConverter::Command.verbose = true
8
- VideoConverter::Output.work_dir = 'tmp'
8
+ VideoConverter::Output.work_dir = File.expand_path('../tmp', File.dirname(__FILE__))
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: video_converter
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.4
4
+ version: 0.7.5
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2014-08-26 00:00:00.000000000 Z
12
+ date: 2014-09-02 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: video_screenshoter
@@ -141,7 +141,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
141
141
  version: '0'
142
142
  segments:
143
143
  - 0
144
- hash: 3801804683299045437
144
+ hash: -2820722095430321320
145
145
  required_rubygems_version: !ruby/object:Gem::Requirement
146
146
  none: false
147
147
  requirements:
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
150
150
  version: '0'
151
151
  segments:
152
152
  - 0
153
- hash: 3801804683299045437
153
+ hash: -2820722095430321320
154
154
  requirements:
155
155
  - ffmpeg, version 1.2 or greated configured with libx264 and libfaac
156
156
  - live_segmenter to convert to hls