evideo 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0790e2e3d70d9a24e7dd68fd3de6910b2f76acbb08340b381bc1384bc41ea1a7'
-  data.tar.gz: f2fdd13f9fd3766c4139fc19a17eb494c0d82b3362231a47bfa087506351d7d6
+  metadata.gz: ebefc113933dc1cc99fab42d3aecd5b907231b2bcf70d9364572305e303a5554
+  data.tar.gz: e68bd951fd8912ceea23ec54a4a3774f2234ae505e6b065e9c20b3bd9ed18fcd
 SHA512:
-  metadata.gz: a6600bc14a3b436d3de37b4a393f1c8e23e64381add067c80d0033fc7d511b08362ac5b94d06b140c5f3047602b520fed5df0332bf05e4025a3b34e01c0c10a9
-  data.tar.gz: 25353d139bcf0b2c14b84716b52d7fa64442f91c53a51640963828e1a68ce9d1dd8ff8549c0cb17e6d22224d745fab9a2aba86143e5861373116a6521648e665
+  metadata.gz: e8690ca607ae90682154d61498c1236aa4f1433527c07be0dd4b0a73c7b7a3f2c04f3e5804e033ead09b49ccb9aa39469466a284c65a897e2e4bbcff4bddfd10
+  data.tar.gz: f03bea64673a278436199ba8c623a57d84448103e277cfeda18e9532485bb70e44441f9015149d2b8cea5536e8066660efd07715f202a2552caa6ea8df40b50a

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    evideo (0.2.0)
-      thor (~> 0.1)
+    evideo (0.2.1)
+      thor
 
 GEM
   remote: https://rubygems.org/
   specs:
     rake (13.0.1)
-    thor (0.20.3)
+    thor (1.0.1)
 
 PLATFORMS
   ruby
@@ -19,4 +19,4 @@ DEPENDENCIES
   rake
 
 BUNDLED WITH
-   1.17.2
+   2.1.2

data/evideo.gemspec

@@ -34,5 +34,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
 
-  spec.add_dependency 'thor', '~> 0.1'
+  spec.add_dependency 'thor'
 end

data/lib/evideo.rb

@@ -13,16 +13,13 @@ module Evideo
     class_option :d, banner: 'DIR', type: :array,
                      default: ["/home/#{ID}/lust", "/media/#{ID}/hrv2"],
                      desc: 'Onde procurar videos'
-    class_option :i, banner: 'IN', default: 'ftv',
-                     desc: 'Pasta origem'
-    class_option :o, banner: 'OUT', default: 'out',
-                     desc: 'Pasta destino'
+    class_option :i, banner: 'IN',  default: 'ftv', desc: 'Pasta origem'
+    class_option :o, banner: 'OUT', default: 'out', desc: 'Pasta destino'
     desc 'conv', 'converte videos'
-    option :t, type: :boolean, default: false,
-               desc: 'Processa somente segundos para teste'
+    option :t, type: :boolean, default: false, desc: 'Processa somente segundos para teste'
     # Processa videos
     def conv
-      Dir.glob("#{fin}/*.???").sort.each do |f|
+      Dir.glob("#{fin}/c*.???").sort.each do |f|
         HRVideo.new(f).processa(options, fout)
       end
     end
@@ -30,7 +27,7 @@ module Evideo
     desc 'test', 'testa videos'
     # Analisa videos
     def test
-      Dir.glob("#{fin}/*.???").sort.each do |f|
+      Dir.glob("#{fin}/c*.???").sort.each do |f|
         HRVideo.new(f).testa(options, fout)
       end
     end

data/lib/evideo/hrvideo.rb

@@ -13,6 +13,8 @@ module Evideo
     attr_reader :duration
     # @return [String] bitrate do ficheiro video
     attr_reader :bitrate
+    # @return [String] frequencia audio do ficheiro video
+    attr_reader :audio
 
     # Duration: 01:01:08.50, start: 0.000000, bitrate: 2228 kb/s
     R1 = /duration:\s+(\d\d:\d\d:\d\d).*bitrate:\s+(\d+)\s+kb/i.freeze
@@ -21,6 +23,9 @@ module Evideo
     R2 = /stream.*video:.*x\s*(\d+).*\s+(\d+\.*\d*)\s+fps/i.freeze
     # display_aspect_ratio=16:9
     R3 = /display_aspect_ratio\s*=\s*(\d+:\d+)$/i.freeze
+    # Stream #0:1(eng): Audio: aac (LC), 48000 Hz, stereo, fltp (default)
+    # Stream #0:1(und): Audio: aac (LC) (mp4a / 0x6134706D), 48000 Hz, stereo, fltp, 127 kb/s (default)
+    R4 = /stream.*audio:.*\s+(\d+)\s+hz/i.freeze
 
     def initialize(fvideo)
       @video = fvideo
@@ -28,7 +33,7 @@ module Evideo
       @base = File.basename(fvideo, @ext).downcase
       @duration = '00:00:00'
       @bitrate = 0
-      @probe = `#{probe}` if File.exist?(fvideo)
+      @probe = `#{cmd_probe}` if File.exist?(fvideo)
       return unless @probe
 
       tr1 = @probe.scan(R1).flatten
@@ -52,6 +57,20 @@ module Evideo
       @ratio = @probe.scan(R3).flatten[0]
     end
 
+    # Parametrizar audio
+    def r4
+      return unless @probe
+
+      @audio = @probe.scan(R4).flatten[0].to_i
+    end
+
+    # @return [String] audio
+    def audio
+      r4 unless @audio
+
+      @audio
+    end
+
     # @return [String] height
     def height
       r2 unless @height

data/lib/evideo/hrvprocessa.rb

@@ -17,9 +17,9 @@ module Evideo
     # @param [String] aot pasta destino dos videos absoluta
     # @return [true, false] sim ou nao video esta ok
     def ofok?(aot)
-      return false unless (bitrate < 3000 && ext == '.mp4') ||
-                          Time.parse(duration) < Time.parse('00:01:00')
+      return false unless (bitrate < 3000 && ext == '.mp4') || Time.parse(duration) < Time.parse('00:01:00')
       return false unless ratio == '16:9' && height > 480
+      return false unless audio == 0
 
       puts "mv \"#{video} #{aot}/#{base}.mp4\" # #{show}"
       true
@@ -31,8 +31,7 @@ module Evideo
     # @return [true, false] sim ou nao video esta ok
     def vfok?(file)
       return false unless File.exist?(file.video) &&
-                          file.bitrate < 3000 &&
-                          Time.parse(file.duration) > Time.parse(duration) - 60
+                          file.bitrate < 3000  && Time.parse(file.duration) > Time.parse(duration) - 60
 
       puts "rm \"#{video}\" # #{file.video} #{file.show}"
       true
@@ -50,14 +49,6 @@ module Evideo
       end
     end
 
-    # @return [String] opcoes gerais comando conversao
-    def geral
-      '-loglevel quiet -hide_banner' +
-        # para ignorar segundos no inicio
-        # ' -ss 15' \
-        ''
-    end
-
     # @return [String] aspect ratio comando conversao
     def aspect
       if ratio == '0:1' then height < 720 ? '' : ' -aspect 16:9'
@@ -74,15 +65,16 @@ module Evideo
     end
 
     # @return [String] comando analise
-    def probe
+    def cmd_probe
       "ffprobe -hide_banner -show_streams \"#{video}\" 2>&1|grep -v title"
     end
 
     # Comando para processar videos
     #
-    # @param [String] tempo do video processato
+    # @param [String] tempo do video processado
     # @return [String] comando conversao
-    def mpeg(tempo)
+    def cmd_mpeg(tempo)
+      puts "processar #{base}.mp4 -r #{[fps, 25].min} -b:v #{[bitrate, 2000].min}k" + dimension + aspect + tempo
       "ffmpeg #{geral} -i \"#{video}\" -y -an " +
         # framerate & bitrate
         "-r #{[fps, 25].min} -b:v #{[bitrate, 2000].min}k" +
@@ -93,6 +85,14 @@ module Evideo
         tempo
     end
 
+    # @return [String] opcoes gerais comando conversao
+    def geral
+      '-loglevel quiet -hide_banner' +
+        # para ignorar segundos no inicio
+        # ' -ss 15' \
+        ''
+    end
+
     # Processa videos
     #
     # @param [Hash] opcoes parametrizacao
@@ -104,7 +104,7 @@ module Evideo
     def processa(opcoes, aot)
       return if ofok?(aot) || vdok?(opcoes[:d], opcoes[:o])
 
-      system mpeg(opcoes[:t] ? ' -t 20' : '') + " #{aot}/#{base}.mp4"
+      system cmd_mpeg(opcoes[:t] ? ' -t 20' : '') + " #{aot}/#{base}.mp4"
       vfok?(HRVideo.new("#{aot}/#{base}.mp4"))
     end
 

data/lib/evideo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Evideo
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evideo
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Hernâni Rodrigues Vaz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-04 00:00:00.000000000 Z
+date: 2020-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,16 +42,16 @@ dependencies:
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0'
 description: Processa ficheiros video. Pode alterar bitrate, framerate, height, aspect
   ratio e elimina metadata.
 email:
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Processa ficheiros video.