electric_eye 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c334d34da5e715dafc4bf25b413633745f7ddc81
-  data.tar.gz: 2e36a9cfcf7292a8bebfba866321f9a4f5ef3508
+  metadata.gz: f72d71f5a1cd65e4bae2305fcabf63392841fd22
+  data.tar.gz: a852c13f82021c6d23a27601c0b96aea86fe2222
 SHA512:
-  metadata.gz: 1ae7373bcd7de070a94709af9d6475b36cabedced738efe18b5b42cf8b84ad28db982099e595dd9df370122dd595067cb65e3e6f73ea9f75f3e1f7c8fa20abbb
-  data.tar.gz: 7336de5be6c21b4d9e2ac5302571322c80fe9daad713ea2623f7dd3f828f2bd8f30e48e8b8e68a180b36a7011da411f95791452011e6f061434c0b44fa1f29b5
+  metadata.gz: d2daa1ae5506a584fb9acb3fe76d49bb0e7e41b34c01138786c728d8492bc861f36f2056d11740a6b6a6757553d3ae5bded356d7a7a3f936614d41a818f1049c
+  data.tar.gz: 36aa25d254ca887428e8bf715b2148841e7c6037fe5b86ad062c926a47ac885e6823200518a2b8a781c140d0e6935d76aef522b98ce421e776f6397953be0566

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    electric_eye (0.1.1)
+    electric_eye (0.1.3)
       construct
       filewatcher
       methadone (~> 1.9.0)
@@ -80,4 +80,4 @@ DEPENDENCIES
   timecop
 
 BUNDLED WITH
-   1.11.2
+   1.12.5

data/README.org

@@ -34,7 +34,6 @@ And then execute:
 Or install it yourself as:
 
 : $ gem install electric_eye
-
 ** Configuration
 
 Enter your cameras into the JSON config file like so
@@ -67,6 +66,17 @@ Files will be numbered up to your wrap figure. The wrap figure determines when t
 
 The default is going to be 10 minute blocks, this can be overridden with the duration variable above in minutes.
 
+** Configure ffmpeg location
+
+Add the following to your ~/.bashrc file pointing it to your ffmpeg location
+: export FFMPEG_BIN="/opt/ffmpeg3/bin/ffmpeg"
+
+To compile ffmpeg 3 into there do the following
+: ./configure --prefix=/opt/ffmpeg3
+: make -j4
+: sudo make install
+
+
 ** Rebooting cameras
 
 Some people reboot their cameras everynight. This does not work well with electric eye at the moment. As a work around you have to stop and start electric eye in your crontab.

data/lib/electric_eye/record.rb

@@ -7,6 +7,13 @@ module ElectricEye
   class Record
 
     include Methadone::CLILogging
+
+    def ffmpeg_bin
+      # Allow overriding the location of the ffmpeg bin if you require.
+      # We use special features of ffmpeg 3.0 so you might want to compile this in a separate directory
+      # for instance /opt/ffmpeg_3.0 would be a nice location.
+      ENV['FFMPEG_BIN'] || 'ffmpeg'
+    end
     
     def store_pids(pids = [])
       File.open(PID_FILE, "w") { |file| file.write pids.join(" ") }
@@ -31,7 +38,7 @@ module ElectricEye
         loglevel = "-loglevel panic" if logger.level >= 1
 
         # ffmpeg 3.0.1 used
-        cmd="ffmpeg -i #{camera[:url]} #{loglevel} -c copy -f segment -segment_list #{listfile} -segment_time #{@configEye.config.duration} -segment_wrap #{@configEye.config.wrap} -y -reconnect 1 -reconnect_at_eof 1 -reconnect_streamed 1 -reconnect_delay_max 300 #{path}%03d.mjpeg"
+        cmd="#{ffmpeg_bin} -i #{camera[:url]} #{loglevel} -c copy -f segment -segment_list #{listfile} -segment_time #{@configEye.config.duration} -segment_wrap #{@configEye.config.wrap} -y -reconnect 1 -reconnect_at_eof 1 -reconnect_streamed 1 -reconnect_delay_max 300 #{path}%03d.mjpeg"
 
         # Run command and add to our pids to make it easy for electric_eye to clean up.
         info "Starting to record #{camera[:name]}"
@@ -62,7 +69,7 @@ module ElectricEye
 
           # Run motion detection on the file, make sure that we output to a different file.
           loglevel = "-loglevel panic" if logger.level >= 1
-          cmd="ffmpeg -i #{dir}/#{file} #{loglevel} -y -vf \"select=gt(scene\\,0.003),setpts=N/(25*TB)\" #{dir}/#{date_filename(camera)}.mpeg"
+          cmd="#{ffmpeg_bin} -i #{dir}/#{file} #{loglevel} -y -vf \"select=gt(scene\\,0.003),setpts=N/(25*TB)\" #{dir}/#{date_filename(camera)}.mpeg"
 
           # Run command and add to our pids to make it easy for electric_eye to clean up.
           Process.spawn(cmd)

data/lib/electric_eye/version.rb

@@ -1,3 +1,3 @@
 module ElectricEye
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: electric_eye
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Michael Pope
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-24 00:00:00.000000000 Z
+date: 2016-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: construct
@@ -283,4 +283,3 @@ test_files:
 - spec/motion_spec.rb
 - spec/record_spec.rb
 - spec/spec_helper.rb
-has_rdoc: