vidibus-recording 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    vidibus-recording (0.0.2)
+    vidibus-recording (0.0.3)
+      activesupport (~> 3.0.0)
       delayed_job_mongoid
       mongoid (~> 2.0.0.beta.20)
       vidibus-uuid
@@ -58,6 +59,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activesupport (~> 3.0.0)
   bundler (>= 1.0.0)
   delayed_job_mongoid
   mongoid (~> 2.0.0.beta.20)

data/lib/vidibus/recording/backend/rtmpdump.rb

@@ -5,6 +5,14 @@ module Vidibus::Recording::Backend
 
     attr_accessor :stream, :file, :live, :metadata
 
+    # Sets up a new dumper.
+    #
+    # Required attributes:
+    #   :stream, :file
+    #
+    # Optional:
+    #   :live
+    #
     def initialize(attributes)
       self.stream = attributes[:stream] or raise ConfigurationError.new("No input stream given")
       self.file = attributes[:file] or raise ConfigurationError.new("No output file defined")
@@ -12,15 +20,13 @@ module Vidibus::Recording::Backend
     end
 
     # Command for starting the recording.
-    # Required options:
-    #   :stream, :file
-    # Optional:
-    #   :live
-    #
-    def command(options = {})
-      c = %(rtmpdump -r "#{stream}" -o #{file})
-      c << " --live" if live
-      c
+    def command
+      args = [].tap do |a|
+        a << "-r #{stream}"
+        a << "-o #{file}"
+        a << "--live" if live
+      end
+      %(rtmpdump #{args.join(" ")} 2>&1)
     end
 
     # Extract metadata from stdout or stderr.
@@ -56,9 +62,10 @@ module Vidibus::Recording::Backend
     #   audiocodecid          .mp3
     #   audiodatarate         48.00
     #
-    def extract_metadata(std)
-      if metadata = std.match(/Metadata\:\n\s+(.+)\Z/m)
-        tuples = $1.scan(/([^\n\ \d]+)\ +([^\ ][^\n]+)\n/mi)
+    def extract_metadata(string)
+      prefix = /(?:INFO\:\ *)/ if string.match(/INFO\:/) # INFO: gets prepended since v2.3
+      if metadata = string.match(/#{prefix}Metadata\:\n(.+)\Z/m)
+        tuples = $1.scan(/#{prefix}([^\n\ \d]+)\ +([^\ \n][^\n]+)\n/)
         self.metadata = Hash[tuples]
       end
     end

data/lib/vidibus/recording/job.rb

@@ -2,16 +2,17 @@ module Vidibus::Recording
   class Job
     class ProcessError < StandardError; end
 
-    attr_accessor :recording, :pid
+    attr_accessor :recording, :pid, :metadata
 
     def initialize(recording)
       self.recording = recording
       self.pid = recording.pid
+      self.metadata = nil
     end
 
     def start
       self.pid = fork do
-        start_thread
+        record!
       end
       Process.detach(pid)
       pid
@@ -44,21 +45,21 @@ module Vidibus::Recording
 
     protected
 
-    def start_thread
-      timeout = 5
-      metadata = nil
-
-      Open3::popen3(recording.backend.command) do |stdin, stdout, stderr, waiter|
+    def record!
+      Open3::popen3(recording.backend.command) do |stdin, stdout, stderr, process|
+        maxloops = 5
         loop do
-          size = stderr.stat.blocks * stderr.stat.blksize
-          if size > 0
-            std = stderr.readpartial(size) rescue ""
-            log(std)
-            metadata = extract_metadata(std) unless metadata
+          begin
+            string = stdout.read_nonblock(1024)
+            log(string)
+            extract_metadata(string) unless metadata
+          rescue Errno::EAGAIN
+          rescue EOFError
           end
+
           unless metadata
-            timeout -= 1
-            if timeout == 0
+            maxloops -= 1
+            if maxloops == 0
               recording.fail("No Metadata has been received. This stream does not work.")
               return
             end
@@ -66,7 +67,7 @@ module Vidibus::Recording
           sleep 2
         end
       end
-      waiter.join
+      process.join
     end
 
     def log(msg)
@@ -75,8 +76,8 @@ module Vidibus::Recording
       end
     end
 
-    def extract_metadata(std)
-      metadata = recording.backend.extract_metadata(std)
+    def extract_metadata(string)
+      self.metadata = recording.backend.extract_metadata(string)
       if metadata
         File.open(recording.yml_file, "w") do |f|
           f.write(metadata.to_yaml)

data/lib/vidibus/recording/mongoid.rb

@@ -149,7 +149,6 @@ module Vidibus::Recording
 
     def process_log_file
       if str = read_file(log_file)
-        str.gsub!(/\A[^\n]+\n/, "") # remove first line
         unless str == ""
           self.log = str.gsub(/\r\n?/, "\n")
         end

data/lib/vidibus/recording/version.rb

@@ -1,5 +1,5 @@
 module Vidibus
   module Recording
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/spec/log/v22.log

@@ -0,0 +1,29 @@
+RTMPDump v2.2
+(c) 2010 Andrej Stepanchuk, Howard Chu, The Flvstreamer Team; license: GPL
+Connecting ...
+ERROR: rtmp server sent error
+Starting Live Stream
+Metadata:
+  author
+  copyright
+  description
+  keywords
+  rating
+  title
+  presetname            Custom
+  creationdate          Mon Jan 17 15:22:50 2011
+  videodevice           Osprey-210 Video Device 1
+  framerate             25.00
+  width                 680.00
+  height                394.00
+  videocodecid          avc1
+  videodatarate         650.00
+  avclevel              31.00
+  avcprofile            66.00
+  videokeyframe_frequency5.00
+  audiodevice           Osprey-210 Audio Device 1
+  audiosamplerate       22050.00
+  audiochannels         1.00
+  audioinputvolume      75.00
+  audiocodecid          .mp3
+  audiodatarate         48.00

data/spec/log/v23.log

@@ -0,0 +1,30 @@
+RTMPDump v2.3
+(c) 2010 Andrej Stepanchuk, Howard Chu, The Flvstreamer Team; license: GPL
+Connecting ...
+INFO: Connected...
+ERROR: rtmp server sent error
+Starting Live Stream
+INFO: Metadata:
+INFO:   author                
+INFO:   copyright             
+INFO:   description           
+INFO:   keywords              
+INFO:   rating                
+INFO:   title                 
+INFO:   presetname            Custom
+INFO:   creationdate          Mon Jan 17 15:22:50 2011
+INFO:   videodevice           Osprey-210 Video Device 1
+INFO:   framerate             25.00
+INFO:   width                 680.00
+INFO:   height                394.00
+INFO:   videocodecid          avc1
+INFO:   videodatarate         650.00
+INFO:   avclevel              31.00
+INFO:   avcprofile            66.00
+INFO:   videokeyframe_frequency5.00
+INFO:   audiodevice           Osprey-210 Audio Device 1
+INFO:   audiosamplerate       22050.00
+INFO:   audiochannels         1.00
+INFO:   audioinputvolume      75.00
+INFO:   audiocodecid          .mp3
+INFO:   audiodatarate         48.00

data/spec/vidibus/recording/backend/rtmpdump_spec.rb

@@ -4,42 +4,33 @@ require "recording/backend/rtmpdump"
 describe "Vidibus::Recording::Backend::Rtmpdump" do
 
   let(:this) {Vidibus::Recording::Backend::Rtmpdump.new(:stream => "rtmp://test", :file => "test.rec")}
-  let(:log) do
-%(RTMPDump v2.2
-(c) 2010 Andrej Stepanchuk, Howard Chu, The Flvstreamer Team; license: GPL
-Connecting ...
-ERROR: rtmp server sent error
-Starting Live Stream
-Metadata:
-  author
-  copyright
-  description
-  keywords
-  rating
-  title
-  presetname            Custom
-  creationdate          Mon Jan 17 15:22:50 2011
-  videodevice           Osprey-210 Video Device 1
-  framerate             25.00
-  width                 680.00
-  height                394.00
-  videocodecid          avc1
-  videodatarate         650.00
-  avclevel              31.00
-  avcprofile            66.00
-  videokeyframe_frequency5.00
-  audiodevice           Osprey-210 Audio Device 1
-  audiosamplerate       22050.00
-  audiochannels         1.00
-  audioinputvolume      75.00
-  audiocodecid          .mp3
-  audiodatarate         48.00
-)
-  end
+  let(:log_v22) {File.read("spec/log/v22.log")}
+  let(:log_v23) {File.read("spec/log/v23.log")}
 
   describe "extract_metadata" do
-    it "should extract relevant metadata" do
-      this.extract_metadata(log).should eql({
+    it "should extract relevant metadata from RTMPDump v2.2" do
+      this.extract_metadata(log_v22).should eql({
+        "presetname" => "Custom",
+        "creationdate" => "Mon Jan 17 15:22:50 2011",
+        "videodevice" => "Osprey-210 Video Device 1",
+        "framerate" => "25.00",
+        "width" => "680.00",
+        "height" => "394.00",
+        "videocodecid" => "avc1",
+        "videodatarate" => "650.00",
+        "avclevel" => "31.00",
+        "avcprofile" => "66.00",
+        "audiodevice" => "Osprey-210 Audio Device 1",
+        "audiosamplerate" => "22050.00",
+        "audiochannels" => "1.00",
+        "audioinputvolume" => "75.00",
+        "audiocodecid" => ".mp3",
+        "audiodatarate" => "48.00"
+      })
+    end
+    
+    it "should extract relevant metadata from RTMPDump v2.3" do
+      this.extract_metadata(log_v23).should eql({
         "presetname" => "Custom",
         "creationdate" => "Mon Jan 17 15:22:50 2011",
         "videodevice" => "Osprey-210 Video Device 1",

data/vidibus-recording.gemspec

@@ -13,10 +13,10 @@ Gem::Specification.new do |s|
   s.description       = "Allows recording of RTMP video streams. Uses RTMPdump."
 
   s.required_rubygems_version = ">= 1.3.6"
-
+  
+  s.add_dependency "activesupport", "~> 3.0.0"
   s.add_dependency "mongoid", "~> 2.0.0.beta.20"
   s.add_dependency "delayed_job_mongoid"
-
   s.add_dependency "vidibus-uuid"
 
   s.add_development_dependency "bundler", ">= 1.0.0"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vidibus-recording
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Andre Pankratz
@@ -19,9 +19,25 @@ date: 2011-01-24 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: mongoid
+  name: activesupport
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: mongoid
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -35,11 +51,11 @@ dependencies:
         - 20
         version: 2.0.0.beta.20
   type: :runtime
-  version_requirements: *id001
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: delayed_job_mongoid
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -49,11 +65,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: vidibus-uuid
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -63,11 +79,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: bundler
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -79,11 +95,11 @@ dependencies:
         - 0
         version: 1.0.0
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -93,11 +109,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -111,11 +127,11 @@ dependencies:
         - 20
         version: 2.0.0.beta.20
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rr
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -125,11 +141,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: relevance-rcov
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -139,7 +155,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id008
+  version_requirements: *id009
 description: Allows recording of RTMP video streams. Uses RTMPdump.
 email: andre@vidibus.com
 executables: []
@@ -164,6 +180,8 @@ files:
 - lib/vidibus/recording/job.rb
 - lib/vidibus/recording/mongoid.rb
 - lib/vidibus/recording/version.rb
+- spec/log/v22.log
+- spec/log/v23.log
 - spec/spec_helper.rb
 - spec/vidibus/recording/backend/rtmpdump_spec.rb
 - spec/vidibus/recording/backend_spec.rb