wco_models 3.1.0.230 → 3.1.0.232
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/models/wco/newsvideo.rb +5 -5
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: efa78335eaac72125ee1a025d5644d35905d331a3b6afa86ea609c83232c4959
|
|
4
|
+
data.tar.gz: 8eecff6178c8cb0507f13139a2c2a4f11e4c247cedb078d7ef2f93d72f9464b8
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 050d115842d5fbcf1b6a3d1be7b3fd7a854fe5bbcd5eba66f0dc0ebc7c09dcc00388f21d5f3ef55045b53cca489d67bbb1fa3866e8691ef5a2632d3f80044c31
|
|
7
|
+
data.tar.gz: f0f2185c32354a0528302dfacb951fa8ab74c848499d5efa1e625be1b25ed213a925a67b4648b94557fc05223a21fb59d30c505c24c80e06a2e97be562a277b4
|
data/app/models/wco/newsvideo.rb
CHANGED
|
@@ -67,8 +67,8 @@ class Wco::Newsvideo
|
|
|
67
67
|
## get base files locally
|
|
68
68
|
cmd = "cd #{Rails.root.join('tmp', @newsvideo.id)} ; "
|
|
69
69
|
@newsvideo.newspartials.each_with_index do |part, idx|
|
|
70
|
-
cmd = "#{cmd} wget -O newspartial_#{idx}.webm #{part.video.video.url} ; "
|
|
71
|
-
cmd = "#{cmd} wget -O newspartial_#{idx}.wav #{part.audio.url} ; "
|
|
70
|
+
cmd = "#{cmd} wget -nc -O newspartial_#{idx}.webm #{part.video.video.url} ; "
|
|
71
|
+
cmd = "#{cmd} wget -nc -O newspartial_#{idx}.wav #{part.audio.url} ; "
|
|
72
72
|
end
|
|
73
73
|
puts! cmd, 'cmd'
|
|
74
74
|
out = `#{cmd}`
|
|
@@ -77,7 +77,7 @@ class Wco::Newsvideo
|
|
|
77
77
|
## get overlays
|
|
78
78
|
cmd = "cd #{Rails.root.join('tmp', @newsvideo.id)} ; "
|
|
79
79
|
@newsvideo.newsoverlays.each_with_index do |overlay, idx|
|
|
80
|
-
cmd = "#{cmd} wget -O overlay_#{idx}.mp4 #{overlay.video.video.url} ; "
|
|
80
|
+
cmd = "#{cmd} wget -nc -O overlay_#{idx}.mp4 #{overlay.video.video.url} ; "
|
|
81
81
|
end
|
|
82
82
|
puts! cmd, 'cmd'
|
|
83
83
|
out = `#{cmd}`
|
|
@@ -121,10 +121,10 @@ AOL
|
|
|
121
121
|
nn.each_with_index do |ms, idx|
|
|
122
122
|
ffmpeg_cmd.push " -i overlay_#{idx}.mp4 \\ "
|
|
123
123
|
end
|
|
124
|
-
ffmpeg_cmd.push "-filter_complex
|
|
124
|
+
ffmpeg_cmd.push "-filter_complex \\ \""
|
|
125
125
|
#
|
|
126
126
|
nn.each_with_index do |ms, idx|
|
|
127
|
-
ffmpeg_cmd.push "
|
|
127
|
+
ffmpeg_cmd.push "[#{idx+1}:v]setpts=PTS-STARTPTS+#{ms.to_f/1000}/TB[v#{idx+1}]; \\"
|
|
128
128
|
end
|
|
129
129
|
#
|
|
130
130
|
curr_s = "0:v"
|