rtsp_server 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2e47197e6b28f0761ec7faf33a18d9924aa26b5
-  data.tar.gz: d5aeeffafe5493aa17087b045a79dbcdb6a7c47a
+  metadata.gz: df5443ff82faa1499e38e8d5f5a09c8255d3ebe7
+  data.tar.gz: 8c317116787c5e0222389b8ba73b97fba4413ffb
 SHA512:
-  metadata.gz: b3192fd082fe4f2c6372a468b309800bc1baf5a702cf1179f40f53a611babb76bfbea34f69b1fc3ec7dd1a7042ae3e171d7fef194f4386e04b90e9545bb8756d
-  data.tar.gz: 05c443abd96199f29b577489063c54670baf81932e985223738d3159d521e5b958371adf0acdc2ee9e11ab0983ff900ad30ec41eb0bd86a9d340063d8ef1ef92
+  metadata.gz: e4435667c4132eae51e487d709720628ede839b7dbafa9d00575654144d1a0e4b33a535f9e1bb40b6202b48bf2a9b85c09ff0de6a2447721d569611c8d70bec0
+  data.tar.gz: 7c7c300939245e32ea545df524dd846e7674718d26de522abf315d18d802b34ac28f46fa0138e8a3fd3c21ac419bfaa3b39569aeb20cefce0ccfa87933888cf1

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]

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.5"
 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.5
 platform: ruby
 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
@@ -194,48 +194,48 @@ extra_rdoc_files:
 - LICENSE.rdoc
 - README.rdoc
 files:
-- lib/rtsp.rb
+- .gemtest
+- ChangeLog.rdoc
+- Gemfile
+- LICENSE.rdoc
+- README.rdoc
+- Rakefile
+- bin/rtsp_client
+- features/client_changes_state.feature
+- features/client_requests.feature
+- features/control_streams_as_client.feature
+- features/step_definitions/client_changes_state_steps.rb
+- features/step_definitions/client_requests_steps.rb
+- features/step_definitions/control_streams_as_client_steps.rb
+- features/support/env.rb
+- features/support/hooks.rb
 - lib/ext/logger.rb
-- lib/rtsp/error.rb
-- lib/rtsp/socat_streaming.rb
-- lib/rtsp/transport_parser.rb
-- lib/rtsp/message.rb
-- lib/rtsp/stream_server.rb
-- lib/rtsp/helpers.rb
-- lib/rtsp/global.rb
-- lib/rtsp/server.rb
+- lib/rtsp.rb
 - lib/rtsp/client.rb
 - lib/rtsp/common.rb
+- lib/rtsp/error.rb
+- lib/rtsp/global.rb
+- lib/rtsp/helpers.rb
+- lib/rtsp/message.rb
 - lib/rtsp/request.rb
-- lib/rtsp/version.rb
 - lib/rtsp/response.rb
-- bin/rtsp_client
-- spec/rtsp_spec.rb
-- spec/spec_helper.rb
-- spec/support/fake_rtsp_server.rb
-- spec/rtsp/message_spec.rb
+- lib/rtsp/server.rb
+- lib/rtsp/socat_streaming.rb
+- lib/rtsp/stream_server.rb
+- lib/rtsp/transport_parser.rb
+- lib/rtsp/version.rb
+- rtsp.gemspec
+- spec/rtsp/client_spec.rb
 - spec/rtsp/helpers_spec.rb
+- spec/rtsp/message_spec.rb
 - spec/rtsp/response_spec.rb
-- spec/rtsp/client_spec.rb
 - spec/rtsp/transport_parser_spec.rb
-- tasks/stats.rake
+- spec/rtsp_spec.rb
+- spec/spec_helper.rb
+- spec/support/fake_rtsp_server.rb
 - tasks/roodi.rake
 - tasks/roodi_config.yaml
-- LICENSE.rdoc
-- ChangeLog.rdoc
-- README.rdoc
-- .gemtest
-- rtsp.gemspec
-- Gemfile
-- Rakefile
-- features/client_requests.feature
-- features/client_changes_state.feature
-- features/step_definitions/client_changes_state_steps.rb
-- features/step_definitions/control_streams_as_client_steps.rb
-- features/step_definitions/client_requests_steps.rb
-- features/support/env.rb
-- features/support/hooks.rb
-- features/control_streams_as_client.feature
+- tasks/stats.rake
 homepage: https://github.com/turboladen/rtsp
 licenses:
 - MIT
@@ -256,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Library to allow RTSP streaming from RTSP-enabled devices.