rtsp_server 0.0.4-universal-java → 0.0.6-universal-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8464455a6f8c1a5620bdd8f05f83c4aa9bcf03a
-  data.tar.gz: a88f157ece57f6fb1aa770793133efb97a9c8c71
+  metadata.gz: dd2d5c99eddc854cd00f3ca817f21529050cbaf7
+  data.tar.gz: 58fee6187fa1e578745723518ea2e0374b063d07
 SHA512:
-  metadata.gz: 701117fc4639fcad9eaa92ac6313c380a0de1460ae69b0a0069df609dd191d9df337ac6db60a65ad3c6e397e06c2f80347529359e3ac6c90b583e72a4408ce7c
-  data.tar.gz: 5e9d29de707b867ca7d9bbb1e73ac29e1f8eab8684d853d76c9d502752422f761a9e0326190087accabed553b0b0facd08cc393c5769a33f12424db623d0e4a5
+  metadata.gz: 301618d21974506325f60cd897ef5517fe2fa246d23e730c372055b897d014155481739458a13fcc7d4ab874866d8d2e45378734656498acd7a7afdbb3967079
+  data.tar.gz: 1a7d5cf9fdd8d644132ea64aa2aa63d58ef26bbf9427a82f98f6b7190e85851d360864b0a8c0c64420a7663471f39145d51c4395e674dc3579d677d5c37fae45

data/lib/rtsp/server.rb

@@ -90,15 +90,22 @@ module RTSP
 
       begin
         request_str << io.read_nonblock(500)
-      rescue Errno::EAGAIN
-        return -1 if count > 50
+      rescue IO::WaitReadable
         count += 1
-        sleep 0.01
-        retry
+        sleep 0.001
+	    sleep 1 if count > 10
+	    count = 0 unless request_str == ""
+        retry if count < 50
+        return -1 if request_str == ""
       end
+      
+      responses = []
 
-      response = process_request(request_str, io)
-      io.send(response, 0)
+      request_str.split("\r\n\r\n").each do |r|
+        responses << process_request(r, io)
+      end
+
+     io.send(responses.join, 0)
     end
 
     # Process an RTSP request
@@ -229,8 +236,10 @@ module RTSP
       RTSP::Server.log "Received TEARDOWN request from #{request.remote_host}"
       sid = request.session[:session_id]
       @stream_server.stop_streaming sid
+      response = []
+      response << "\r\n"
 
-      [[]]
+      [response]
     end
 
     # Handles a pause request.
@@ -242,6 +251,7 @@ module RTSP
       response = []
       sid = request.session[:session_id]
       response << "Session: #{sid}"
+      response << "\r\n"
       @stream_server.disconnect sid
 
       [response]
@@ -297,8 +307,7 @@ module RTSP
         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}"]
+       transport = [request.transport + ';', "port=#{server_port}-#{server_port + 1}"]
      end
 
       if request.transport.include?("unicast")

data/lib/rtsp/socat_streaming.rb

@@ -128,7 +128,7 @@ module RTSP
     #
     # @param[Boolean] multicast True if the description is for a multicast stream.
     # @param [Fixnum] stream_index Index of the stream type.
-    def description multicast=false, stream_index=1
+    def description(multicast=false, stream_index=1)
       rtp_map = @rtp_map[stream_index - 1] || H264_RTP_MAP
       fmtp = @fmtp[stream_index - 1] || H264_FMTP
 
@@ -143,7 +143,7 @@ a=type:broadcast\r
 a=control:*\r
 a=range:npt=0-\r
 a=x-qt-text-nam:Session streamed by "Streaming Server"\r
-a=x-qt-text-inf:stream1#{multicast ? 'm' : ''}\r
+a=x-qt-text-inf:stream#{stream_index}#{multicast ? 'm' : ''}\r
 m=video #{multicast ? @source_port[stream_index - 1] : 0} RTP/AVP 96\r
 c=IN IP4 #{multicast ? "#{multicast_ip(stream_index)}/10" : "0.0.0.0"}\r
 a=rtpmap:#{rtp_map}\r

data/lib/rtsp/version.rb

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

metadata

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