rtsp_server 0.0.3-universal-java → 0.0.4-universal-java
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/rtsp/common.rb +1 -1
- data/lib/rtsp/server.rb +9 -3
- data/lib/rtsp/socat_streaming.rb +1 -1
- data/lib/rtsp/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: c8464455a6f8c1a5620bdd8f05f83c4aa9bcf03a
|
4
|
+
data.tar.gz: a88f157ece57f6fb1aa770793133efb97a9c8c71
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 701117fc4639fcad9eaa92ac6313c380a0de1460ae69b0a0069df609dd191d9df337ac6db60a65ad3c6e397e06c2f80347529359e3ac6c90b583e72a4408ce7c
|
7
|
+
data.tar.gz: 5e9d29de707b867ca7d9bbb1e73ac29e1f8eab8684d853d76c9d502752422f761a9e0326190087accabed553b0b0facd08cc393c5769a33f12424db623d0e4a5
|
data/lib/rtsp/common.rb
CHANGED
@@ -62,7 +62,7 @@ module RTSP
|
|
62
62
|
/client_port=(?<port>.*)-/ =~ transport
|
63
63
|
|
64
64
|
if port.nil?
|
65
|
-
log("Could not find client port associated with transport", :warn)
|
65
|
+
RTSP::Request.log("Could not find client port associated with transport", :warn)
|
66
66
|
else
|
67
67
|
"#{@remote_host}:#{port}"
|
68
68
|
end
|
data/lib/rtsp/server.rb
CHANGED
@@ -110,7 +110,7 @@ module RTSP
|
|
110
110
|
remote_address = io.remote_address.ip_address
|
111
111
|
/(?<action>.*) rtsp:\/\// =~ request_str
|
112
112
|
request = RTSP::Request.new(request_str, remote_address)
|
113
|
-
@agent[io] = request.user_agent
|
113
|
+
@agent[io] = request.user_agent rescue NoMethodError
|
114
114
|
response, body = send(action.downcase.to_sym, request)
|
115
115
|
|
116
116
|
add_headers(request, response, body)
|
@@ -292,8 +292,14 @@ module RTSP
|
|
292
292
|
# @param [Fixnum] server_port Port on which the stream_server is streaming from.
|
293
293
|
def generate_transport request, server_port, index=1
|
294
294
|
port_specifier = 'client_port'
|
295
|
-
|
296
|
-
transport
|
295
|
+
|
296
|
+
if request.transport.include?(port_specifier)
|
297
|
+
transport = request.transport.split(port_specifier)
|
298
|
+
transport[1] = port_specifier + transport[1]
|
299
|
+
else
|
300
|
+
stream_port = RTSP::StreamServer.instance.source_port.first
|
301
|
+
transport = [request.transport + ';', "port=#{stream_port}-#{stream_port + 1}"]
|
302
|
+
end
|
297
303
|
|
298
304
|
if request.transport.include?("unicast")
|
299
305
|
transport[0] << "destination=#{request.remote_host};"
|
data/lib/rtsp/socat_streaming.rb
CHANGED
@@ -69,7 +69,7 @@ module RTSP
|
|
69
69
|
# @param [Fixnum] index Stream index.
|
70
70
|
# @return [Fixnum] The port the streamer will stream on.
|
71
71
|
def setup_streamer(sid, transport_url, index=1, multicast=false)
|
72
|
-
dest_ip, dest_port = transport_url.split ":"
|
72
|
+
dest_ip, dest_port = transport_url.split ":" unless multicast
|
73
73
|
|
74
74
|
@rtcp_source_identifier ||= RTCP_SOURCE.pack("H*")
|
75
75
|
local_port = multicast ? @source_port[index - 1] : free_port(true)
|
data/lib/rtsp/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: rtsp_server
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.4
|
5
5
|
platform: universal-java
|
6
6
|
authors:
|
7
7
|
- Steve Loveless, Mike Kirby
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2013-12-
|
12
|
+
date: 2013-12-20 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: parslet
|