rtsp_server 0.0.3-universal-java → 0.0.4-universal-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 563ffb4ecc71a20f07d22317b648bc0f22e48cb5
-  data.tar.gz: b204ab9a43a6c3f280ac5ca54a7eac0bc06dcd41
+  metadata.gz: c8464455a6f8c1a5620bdd8f05f83c4aa9bcf03a
+  data.tar.gz: a88f157ece57f6fb1aa770793133efb97a9c8c71
 SHA512:
-  metadata.gz: 6a16432fb3f33c6aaff1f489de0ed6e0b1c4dd50edeb8263bc097e93f214def67ae3b7dca93f72d1ba90e9c45decec6aac270e5fa0d6f90713c139ca7b6d6e1d
-  data.tar.gz: 43445fd3eba90f28ddf49cb5154263fbafacf8959ac14a8bb3c77b5d5b34ddbbc97c8c11cab7265d671e510cab154055803dc28b4491f9fa735e23bac40fa57e
+  metadata.gz: 701117fc4639fcad9eaa92ac6313c380a0de1460ae69b0a0069df609dd191d9df337ac6db60a65ad3c6e397e06c2f80347529359e3ac6c90b583e72a4408ce7c
+  data.tar.gz: 5e9d29de707b867ca7d9bbb1e73ac29e1f8eab8684d853d76c9d502752422f761a9e0326190087accabed553b0b0facd08cc393c5769a33f12424db623d0e4a5

data/lib/rtsp/common.rb

@@ -62,7 +62,7 @@ module RTSP
       /client_port=(?<port>.*)-/ =~ transport
 
       if port.nil?
-        log("Could not find client port associated with transport", :warn)
+        RTSP::Request.log("Could not find client port associated with transport", :warn)
       else
         "#{@remote_host}:#{port}"
       end

data/lib/rtsp/server.rb

@@ -110,7 +110,7 @@ module RTSP
       remote_address = io.remote_address.ip_address
       /(?<action>.*) rtsp:\/\// =~ request_str
       request = RTSP::Request.new(request_str, remote_address)
-      @agent[io] = request.user_agent
+      @agent[io] = request.user_agent rescue NoMethodError
       response, body = send(action.downcase.to_sym, request)
 
       add_headers(request, response, body)
@@ -292,8 +292,14 @@ module RTSP
     # @param [Fixnum] server_port Port on which the stream_server is streaming from.
     def generate_transport request, server_port, index=1
       port_specifier = 'client_port'
-      transport = request.transport.split(port_specifier)
-      transport[1] = port_specifier + transport[1]
+
+      if request.transport.include?(port_specifier)
+        transport = request.transport.split(port_specifier)
+        transport[1] = port_specifier + transport[1]
+     else
+       stream_port = RTSP::StreamServer.instance.source_port.first
+       transport = [request.transport + ';', "port=#{stream_port}-#{stream_port + 1}"]
+     end
 
       if request.transport.include?("unicast")
         transport[0] << "destination=#{request.remote_host};"

data/lib/rtsp/socat_streaming.rb

@@ -69,7 +69,7 @@ module RTSP
     # @param [Fixnum] index Stream index.
     # @return [Fixnum] The port the streamer will stream on.
     def setup_streamer(sid, transport_url, index=1, multicast=false)
-      dest_ip, dest_port = transport_url.split ":"
+      dest_ip, dest_port = transport_url.split ":" unless multicast
 
       @rtcp_source_identifier ||= RTCP_SOURCE.pack("H*")
       local_port = multicast ? @source_port[index - 1] : free_port(true)

data/lib/rtsp/version.rb

@@ -1,4 +1,4 @@
 module RTSP
   # rtsp version
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rtsp_server
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: universal-java
 authors:
 - Steve Loveless, Mike Kirby
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-12-19 00:00:00.000000000 Z
+date: 2013-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet