rtsp_server 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77b1c4b86a85675da639393964752c3197adf745
-  data.tar.gz: 55b4a43b06260e899293283b5f2395517f0d4092
+  metadata.gz: 151ab5a38e1667cf874f111ee48c7d94743a4b05
+  data.tar.gz: fe1958651325fb1ca9321202f4b47c7d276136cf
 SHA512:
-  metadata.gz: 88e84cdb94758caa71064a75101bc660094db2eee6542bbe9bc5f52b9f3a4577de135fec7973d70551c98f94c0fa83d74afb00238beb062a4a18cbba348c7d4d
-  data.tar.gz: e83171aa472d1810dade7ca92a412c323390f9d9f3b1306fd5b7052c9e59dd954e71c7300a6fdfe24d5077617560c7cfa955077dcfbc3d254215ff6fe64c2a19
+  metadata.gz: 03c9d9c6038029902871d95ca7e8c6c04e71059b607a6e30d67bbc2569632c27954ed96ed81547d5eb8820f841faf7f31a608c66a33258611a656abd69857dd3
+  data.tar.gz: 737f15c8a7cb198e27faedf9a47f72e7e6b30bde6d929773cb91f2ca2a2e7d672ceb47d7b916b9bc51de5fdd4b50b1dac8ae612883083d087fe9caa2fb572d54

data/lib/rtsp/common.rb

@@ -145,4 +145,4 @@ module RTSP
       self.instance_eval "def #{name}; @#{name}; end"
     end
   end
-end
+end

data/lib/rtsp/server.rb

@@ -155,10 +155,11 @@ module RTSP
     def setup(request)
       RTSP::Server.log "Received SETUP request from #{request.remote_host}"
       @session = @session.next
+      multicast_check = request.transport.include?('multicast')
       server_port = @stream_server.setup_streamer(@session,
-        request.transport_url, request.stream_index)
+        request.transport_url, request.stream_index, multicast_check)
       response = []
-      transport = generate_transport(request, server_port)
+      transport = generate_transport(request, server_port, request.stream_index)
       response << "Transport: #{transport.join}"
       response << "Session: #{@session}"
       response << "\r\n"
@@ -289,13 +290,20 @@ module RTSP
     #
     # @param [RTSP::Request] Request object.
     # @param [Fixnum] server_port Port on which the stream_server is streaming from.
-    def generate_transport request, server_port
-      port_specifier = request.transport.include?("unicast") ? "client_port" : "port"
+    def generate_transport request, server_port, index=1
+      port_specifier = 'client_port'
       transport = request.transport.split(port_specifier)
-      transport[0] << "destination=#{request.remote_host};"
-      transport[0] << "source=#{@stream_server.interface_ip};"
       transport[1] = port_specifier + transport[1]
-      transport[1] << ";server_port=#{server_port}-#{server_port+1}"
+
+      if request.transport.include?("unicast")
+        transport[0] << "destination=#{request.remote_host};"
+        transport[1] << ";server_port=#{server_port}-#{server_port+1}"
+      else
+        transport[0] << "destination=#{@stream_server.source_ip[index - 1]};"
+        transport[1] << ";ttl=10"
+      end
+        
+      transport[0] << "source=#{@stream_server.interface_ip};"
 
       transport
     end

data/lib/rtsp/socat_streaming.rb

@@ -68,26 +68,34 @@ module RTSP
     # @param [String] transport_url Destination IP:port.
     # @param [Fixnum] index Stream index.
     # @return [Fixnum] The port the streamer will stream on.
-    def setup_streamer(sid, transport_url, index=1)
+    def setup_streamer(sid, transport_url, index=1, multicast=false)
       dest_ip, dest_port = transport_url.split ":"
-      @rtcp_source_identifier ||= RTCP_SOURCE.pack("H*")
-      local_port = free_port(true)
-
-      @rtcp_threads[sid] = Thread.start do
-        s = UDPSocket.new
-        s.bind(@interface_ip, local_port+1)
 
-        loop do
-          begin
-            _, sender = s.recvfrom(36)
-            s.send(@rtcp_source_identifier, 0, sender[3], sender[1])
+      @rtcp_source_identifier ||= RTCP_SOURCE.pack("H*")
+      local_port = multicast ? @source_port[index - 1] : free_port(true)
+     
+      unless multicast
+        @rtcp_threads[sid] = Thread.start do
+          s = UDPSocket.new
+          s.bind(@interface_ip, local_port+1)
+ 
+          loop do
+            begin
+              _, sender = s.recvfrom(36)
+              s.send(@rtcp_source_identifier, 0, sender[3], sender[1])
+            end
           end
         end
       end
 
       @cleaner ||= Thread.start { cleanup_defunct }
       @processes ||= Sys::ProcTable.ps.map { |p| p.cmdline }
-      @sessions[sid] = build_socat(dest_ip, dest_port, local_port, index)
+
+      if multicast
+        @sessions[sid] = :multicast
+      else
+        @sessions[sid] = build_socat(dest_ip, dest_port, local_port, index)
+      end
 
       local_port
     end
@@ -100,7 +108,7 @@ module RTSP
     #
     # @param [String] session ID.
     def start_streaming sid
-      spawn_socat(sid, @sessions[sid])
+      spawn_socat(sid, @sessions[sid]) unless @sessions[sid] == :multicast
     end
 
     # Stop streaming for the requested session.
@@ -128,15 +136,15 @@ module RTSP
 v=0\r
 o=- 1345481255966282 1 IN IP4 #{@interface_ip}\r
 s=Session streamed by "Streaming Server"\r
-i=stream1\r
+i=stream1#{multicast ? 'm' : ''}\r
 t=0 0\r
 a=tool:LIVE555 Streaming Media v2007.07.09\r
 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\r
-m=video 0 RTP/AVP 96\r
+a=x-qt-text-inf:stream1#{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
 a=fmtp:#{fmtp}\r
@@ -219,7 +227,10 @@ EOF
 
     # Disconnects all streams that are currently streaming.
     def disconnect_all_streams
-      @pids.values.each { |pid| Process.kill(9, pid.to_i) if pid.to_i > 1000 }
+      @pids.values.each do |pid|
+        Process.kill(9, pid.to_i) if pid.to_i > 1000 rescue Errno::ESRCH
+      end
+
       @sessions.clear
       @pids.clear
     end

data/lib/rtsp/version.rb

@@ -1,4 +1,4 @@
 module RTSP
   # rtsp version
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rtsp_server
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Steve Loveless, Mike Kirby