rtsp_server 0.0.7-universal-java → 0.0.8-universal-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7039571cf22811870cc0df4ff0100c263ef1d2a
-  data.tar.gz: 43b80971c6845db545fea45b3dacd9a218c2102b
+  metadata.gz: b3260d0fff65469b2336598b496f72bbf96a64ff
+  data.tar.gz: 9b1595e49cbcdb36e517f90e651330baad013b6c
 SHA512:
-  metadata.gz: 89409944e6204311b572d875489d25090976a734fa91acb228c1baed007bd947a068f580906428fb1c001a96f3d24cd0d74fa5a1eb4ffde4b2d7a1ac8e1f47ae
-  data.tar.gz: 443298f0d4265c9b4199cc252939c25d0200122c2e6d5e9197937f8e3876bfcf8a3f234c77a2b393b344813e84534e550157dbc6b34cd6b55363b9095ee68591
+  metadata.gz: 798345d644ff429f6063ea2eaa750e9579ee78c0f4dd5ea7831434ea86445385caa63250857aa131a47fee0f3ccb630647d60ae92e58b8733f1107b4f12d39b3
+  data.tar.gz: 28db53d04da0d532bb5156489eb229e5995191f50938e567362fb4165d8a4552f6d9aeb0cf4a75e47dc284cd706e5d3f912427fec0c652e79c57642e24fff108

data/lib/rtsp/server.rb

@@ -94,9 +94,9 @@ module RTSP
         return(-1) if ex.is_a?(EOFError)
         count += 1
         sleep 0.001
-	sleep 1 if count > 10
-	count = 0 unless request_str == ""
-        retry if count < 50
+        sleep 1 if count > 10
+        count = 0 unless request_str == ""
+        retry if count < 70
         return -1 if request_str == ""
       end
       
@@ -170,7 +170,7 @@ module RTSP
       response = []
       transport = generate_transport(request, server_port, request.stream_index)
       response << "Transport: #{transport.join}"
-      response << "Session: #{@session}"
+      response << "Session: #{@session}; timeout=60"
       response << "\r\n"
 
       [response]
@@ -182,11 +182,12 @@ module RTSP
     # @return [Array<Array<String>>] Response headers and body.
     def play(request)
       RTSP::Server.log "Received PLAY request from #{request.remote_host}"
-      sid = request.session[:session_id]
+      sid = request.session[:session_id] rescue NoMethodError
       response = []
       response << "Session: #{sid}"
-      response << "Range: #{request.range}"
-      index = request.stream_index - 1
+      response << "Range: #{request.range}" rescue NoMethodError
+      index = request.stream_index - 1 rescue NoMethodError
+      index = 1 unless index.is_a?(Fixnum)
       rtp_sequence, rtp_timestamp = @stream_server.parse_sequence_number(
         @stream_server.source_ip[index], @stream_server.source_port[index])
       @stream_server.start_streaming sid
@@ -236,7 +237,7 @@ module RTSP
     # @return [Array<Array<String>>] Response headers and body.
     def teardown(request)
       RTSP::Server.log "Received TEARDOWN request from #{request.remote_host}"
-      sid = request.session[:session_id]
+      sid = request.session[:session_id] rescue NoMethodError
       @stream_server.stop_streaming sid
       response = []
       response << "\r\n"
@@ -251,7 +252,7 @@ module RTSP
     def pause(request)
       RTSP::Server.log "Received PAUSE request from #{request.remote_host}"
       response = []
-      sid = request.session[:session_id]
+      sid = request.session[:session_id] rescue NoMethodError
       response << "Session: #{sid}"
       response << "\r\n"
       @stream_server.disconnect sid
@@ -273,8 +274,8 @@ module RTSP
       result << "CSeq: #{request.cseq}"
 
       unless body.nil?
-        result << "Content-Type: #{request.accept}"
-        result << "Content-Base: #{request.url}/"
+        result << "Content-Type: #{request.accept}" rescue NoMethodError
+        result << "Content-Base: #{request.url}/" rescue NoMethodError
         result << "Content-Length: #{body.size}"
       end
 

data/lib/rtsp/version.rb

@@ -1,4 +1,4 @@
 module RTSP
   # rtsp version
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rtsp_server
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: universal-java
 authors:
 - Steve Loveless, Mike Kirby
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-01-31 00:00:00.000000000 Z
+date: 2014-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet