rtsp_server 0.0.7 → 0.0.8

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/lib/rtsp/server.rb +12 -11
  3. data/lib/rtsp/version.rb +1 -1
  4. metadata +29 -29
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: b53407fbe797bfc418bb26e51665810ee92f81fd
4
- data.tar.gz: cd2f207622d2175b86edbf75d958048dde814be9
3
+ metadata.gz: 3667e18d955df482b9e7751437e553e595a61242
4
+ data.tar.gz: 59a189ea97400ce6528949d4be1933ca9ba554bd
5
5
  SHA512:
6
- metadata.gz: 4616d850bd09ed72d108dd24c0ea24827cf8020f1e9e5c012d03a650d5db7c8d3d9e718b2154edc4e65823431009d5c0360755b47b8911d987b9d4847185de5d
7
- data.tar.gz: 1aaab635b4bb93eb221e648928670abfed470dd42df9da46c112ec80439618a8bc7c872e322adb1c285e925b31948ce79120a4e94feb6e0cef64eef1b87e66e3
6
+ metadata.gz: 5a85d2813d4a5fbe64684221ab2a7aba4e97219631c80ffa28b90011e8a5a30323d6a209d5839d6f03613921895c357b1c80e7432f51a428aefe4b56a62a8669
7
+ data.tar.gz: 03988b3000ce0e672bb833b1783cdc61ccf094ea2652da5a5515bf42e623b2d02b869ac9187c6d149f0c77b74db3e3a18be027cb45d5255a32e689c79040a1d4
data/lib/rtsp/server.rb CHANGED
@@ -94,9 +94,9 @@ module RTSP
94
94
  return(-1) if ex.is_a?(EOFError)
95
95
  count += 1
96
96
  sleep 0.001
97
- sleep 1 if count > 10
98
- count = 0 unless request_str == ""
99
- retry if count < 50
97
+ sleep 1 if count > 10
98
+ count = 0 unless request_str == ""
99
+ retry if count < 70
100
100
  return -1 if request_str == ""
101
101
  end
102
102
 
@@ -170,7 +170,7 @@ module RTSP
170
170
  response = []
171
171
  transport = generate_transport(request, server_port, request.stream_index)
172
172
  response << "Transport: #{transport.join}"
173
- response << "Session: #{@session}"
173
+ response << "Session: #{@session}; timeout=60"
174
174
  response << "\r\n"
175
175
 
176
176
  [response]
@@ -182,11 +182,12 @@ module RTSP
182
182
  # @return [Array<Array<String>>] Response headers and body.
183
183
  def play(request)
184
184
  RTSP::Server.log "Received PLAY request from #{request.remote_host}"
185
- sid = request.session[:session_id]
185
+ sid = request.session[:session_id] rescue NoMethodError
186
186
  response = []
187
187
  response << "Session: #{sid}"
188
- response << "Range: #{request.range}"
189
- index = request.stream_index - 1
188
+ response << "Range: #{request.range}" rescue NoMethodError
189
+ index = request.stream_index - 1 rescue NoMethodError
190
+ index = 1 unless index.is_a?(Fixnum)
190
191
  rtp_sequence, rtp_timestamp = @stream_server.parse_sequence_number(
191
192
  @stream_server.source_ip[index], @stream_server.source_port[index])
192
193
  @stream_server.start_streaming sid
@@ -236,7 +237,7 @@ module RTSP
236
237
  # @return [Array<Array<String>>] Response headers and body.
237
238
  def teardown(request)
238
239
  RTSP::Server.log "Received TEARDOWN request from #{request.remote_host}"
239
- sid = request.session[:session_id]
240
+ sid = request.session[:session_id] rescue NoMethodError
240
241
  @stream_server.stop_streaming sid
241
242
  response = []
242
243
  response << "\r\n"
@@ -251,7 +252,7 @@ module RTSP
251
252
  def pause(request)
252
253
  RTSP::Server.log "Received PAUSE request from #{request.remote_host}"
253
254
  response = []
254
- sid = request.session[:session_id]
255
+ sid = request.session[:session_id] rescue NoMethodError
255
256
  response << "Session: #{sid}"
256
257
  response << "\r\n"
257
258
  @stream_server.disconnect sid
@@ -273,8 +274,8 @@ module RTSP
273
274
  result << "CSeq: #{request.cseq}"
274
275
 
275
276
  unless body.nil?
276
- result << "Content-Type: #{request.accept}"
277
- result << "Content-Base: #{request.url}/"
277
+ result << "Content-Type: #{request.accept}" rescue NoMethodError
278
+ result << "Content-Base: #{request.url}/" rescue NoMethodError
278
279
  result << "Content-Length: #{body.size}"
279
280
  end
280
281
 
data/lib/rtsp/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  module RTSP
2
2
  # rtsp version
3
- VERSION = "0.0.7"
3
+ VERSION = "0.0.8"
4
4
  end
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.7
4
+ version: 0.0.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - Steve Loveless, Mike Kirby
@@ -9,174 +9,174 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2014-01-31 00:00:00.000000000 Z
12
+ date: 2014-02-07 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: parslet
16
16
  requirement: !ruby/object:Gem::Requirement
17
17
  requirements:
18
- - - '>='
18
+ - - ">="
19
19
  - !ruby/object:Gem::Version
20
20
  version: 1.1.0
21
21
  type: :runtime
22
22
  prerelease: false
23
23
  version_requirements: !ruby/object:Gem::Requirement
24
24
  requirements:
25
- - - '>='
25
+ - - ">="
26
26
  - !ruby/object:Gem::Version
27
27
  version: 1.1.0
28
28
  - !ruby/object:Gem::Dependency
29
29
  name: rtp
30
30
  requirement: !ruby/object:Gem::Requirement
31
31
  requirements:
32
- - - '>='
32
+ - - ">="
33
33
  - !ruby/object:Gem::Version
34
34
  version: 0.0.1
35
35
  type: :runtime
36
36
  prerelease: false
37
37
  version_requirements: !ruby/object:Gem::Requirement
38
38
  requirements:
39
- - - '>='
39
+ - - ">="
40
40
  - !ruby/object:Gem::Version
41
41
  version: 0.0.1
42
42
  - !ruby/object:Gem::Dependency
43
43
  name: sdp
44
44
  requirement: !ruby/object:Gem::Requirement
45
45
  requirements:
46
- - - ~>
46
+ - - "~>"
47
47
  - !ruby/object:Gem::Version
48
48
  version: 0.2.6
49
49
  type: :runtime
50
50
  prerelease: false
51
51
  version_requirements: !ruby/object:Gem::Requirement
52
52
  requirements:
53
- - - ~>
53
+ - - "~>"
54
54
  - !ruby/object:Gem::Version
55
55
  version: 0.2.6
56
56
  - !ruby/object:Gem::Dependency
57
57
  name: sys-proctable
58
58
  requirement: !ruby/object:Gem::Requirement
59
59
  requirements:
60
- - - '>='
60
+ - - ">="
61
61
  - !ruby/object:Gem::Version
62
62
  version: '0'
63
63
  type: :runtime
64
64
  prerelease: false
65
65
  version_requirements: !ruby/object:Gem::Requirement
66
66
  requirements:
67
- - - '>='
67
+ - - ">="
68
68
  - !ruby/object:Gem::Version
69
69
  version: '0'
70
70
  - !ruby/object:Gem::Dependency
71
71
  name: bundler
72
72
  requirement: !ruby/object:Gem::Requirement
73
73
  requirements:
74
- - - '>='
74
+ - - ">="
75
75
  - !ruby/object:Gem::Version
76
76
  version: '0'
77
77
  type: :development
78
78
  prerelease: false
79
79
  version_requirements: !ruby/object:Gem::Requirement
80
80
  requirements:
81
- - - '>='
81
+ - - ">="
82
82
  - !ruby/object:Gem::Version
83
83
  version: '0'
84
84
  - !ruby/object:Gem::Dependency
85
85
  name: code_statistics
86
86
  requirement: !ruby/object:Gem::Requirement
87
87
  requirements:
88
- - - ~>
88
+ - - "~>"
89
89
  - !ruby/object:Gem::Version
90
90
  version: 0.2.13
91
91
  type: :development
92
92
  prerelease: false
93
93
  version_requirements: !ruby/object:Gem::Requirement
94
94
  requirements:
95
- - - ~>
95
+ - - "~>"
96
96
  - !ruby/object:Gem::Version
97
97
  version: 0.2.13
98
98
  - !ruby/object:Gem::Dependency
99
99
  name: cucumber
100
100
  requirement: !ruby/object:Gem::Requirement
101
101
  requirements:
102
- - - '>='
102
+ - - ">="
103
103
  - !ruby/object:Gem::Version
104
104
  version: 1.1.0
105
105
  type: :development
106
106
  prerelease: false
107
107
  version_requirements: !ruby/object:Gem::Requirement
108
108
  requirements:
109
- - - '>='
109
+ - - ">="
110
110
  - !ruby/object:Gem::Version
111
111
  version: 1.1.0
112
112
  - !ruby/object:Gem::Dependency
113
113
  name: roodi
114
114
  requirement: !ruby/object:Gem::Requirement
115
115
  requirements:
116
- - - '>='
116
+ - - ">="
117
117
  - !ruby/object:Gem::Version
118
118
  version: 2.1.0
119
119
  type: :development
120
120
  prerelease: false
121
121
  version_requirements: !ruby/object:Gem::Requirement
122
122
  requirements:
123
- - - '>='
123
+ - - ">="
124
124
  - !ruby/object:Gem::Version
125
125
  version: 2.1.0
126
126
  - !ruby/object:Gem::Dependency
127
127
  name: rake
128
128
  requirement: !ruby/object:Gem::Requirement
129
129
  requirements:
130
- - - '>='
130
+ - - ">="
131
131
  - !ruby/object:Gem::Version
132
132
  version: 0.8.7
133
133
  type: :development
134
134
  prerelease: false
135
135
  version_requirements: !ruby/object:Gem::Requirement
136
136
  requirements:
137
- - - '>='
137
+ - - ">="
138
138
  - !ruby/object:Gem::Version
139
139
  version: 0.8.7
140
140
  - !ruby/object:Gem::Dependency
141
141
  name: rspec
142
142
  requirement: !ruby/object:Gem::Requirement
143
143
  requirements:
144
- - - '>='
144
+ - - ">="
145
145
  - !ruby/object:Gem::Version
146
146
  version: 2.5.0
147
147
  type: :development
148
148
  prerelease: false
149
149
  version_requirements: !ruby/object:Gem::Requirement
150
150
  requirements:
151
- - - '>='
151
+ - - ">="
152
152
  - !ruby/object:Gem::Version
153
153
  version: 2.5.0
154
154
  - !ruby/object:Gem::Dependency
155
155
  name: simplecov
156
156
  requirement: !ruby/object:Gem::Requirement
157
157
  requirements:
158
- - - '>='
158
+ - - ">="
159
159
  - !ruby/object:Gem::Version
160
160
  version: 0.4.0
161
161
  type: :development
162
162
  prerelease: false
163
163
  version_requirements: !ruby/object:Gem::Requirement
164
164
  requirements:
165
- - - '>='
165
+ - - ">="
166
166
  - !ruby/object:Gem::Version
167
167
  version: 0.4.0
168
168
  - !ruby/object:Gem::Dependency
169
169
  name: yard
170
170
  requirement: !ruby/object:Gem::Requirement
171
171
  requirements:
172
- - - '>='
172
+ - - ">="
173
173
  - !ruby/object:Gem::Version
174
174
  version: 0.6.0
175
175
  type: :development
176
176
  prerelease: false
177
177
  version_requirements: !ruby/object:Gem::Requirement
178
178
  requirements:
179
- - - '>='
179
+ - - ">="
180
180
  - !ruby/object:Gem::Version
181
181
  version: 0.6.0
182
182
  description: |-
@@ -194,7 +194,7 @@ extra_rdoc_files:
194
194
  - LICENSE.rdoc
195
195
  - README.rdoc
196
196
  files:
197
- - .gemtest
197
+ - ".gemtest"
198
198
  - ChangeLog.rdoc
199
199
  - Gemfile
200
200
  - LICENSE.rdoc
@@ -246,12 +246,12 @@ require_paths:
246
246
  - lib
247
247
  required_ruby_version: !ruby/object:Gem::Requirement
248
248
  requirements:
249
- - - '>='
249
+ - - ">="
250
250
  - !ruby/object:Gem::Version
251
251
  version: '0'
252
252
  required_rubygems_version: !ruby/object:Gem::Requirement
253
253
  requirements:
254
- - - '>='
254
+ - - ">="
255
255
  - !ruby/object:Gem::Version
256
256
  version: '0'
257
257
  requirements: []