| … | |
… | |
| 85 | } |
85 | } |
| 86 | |
86 | |
| 87 | bool |
87 | bool |
| 88 | client::handle_command () |
88 | client::handle_command () |
| 89 | { |
89 | { |
| 90 | bool skipping = false; |
|
|
| 91 | |
|
|
| 92 | while (!cmd_queue.empty () |
90 | if (!cmd_queue.empty () |
| 93 | && !(state == ST_PLAYING && pl->ob && pl->ob->speed_left <= 0)) |
91 | && state == ST_PLAYING |
|
|
92 | && pl->ob->speed_left > 0.f) |
| 94 | { |
93 | { |
| 95 | command &cmd = cmd_queue.front (); |
94 | command &cmd = cmd_queue.front (); |
| 96 | |
95 | |
| 97 | if (cmd.stamp + MAX_QUEUE_BACKLOG < now ()) |
96 | if (cmd.stamp + MAX_QUEUE_BACKLOG < now ()) |
| 98 | { |
97 | { |
| 99 | if (!skipping) |
|
|
| 100 | { |
|
|
| 101 | skipping = true; |
|
|
| 102 | reset_state (); |
98 | reset_state (); |
| 103 | send_packet_printf ("drawinfo %d ignoring delayed commands.", NDI_RED); |
99 | send_packet_printf ("drawinfo %d ignoring delayed commands.", NDI_RED); |
| 104 | } |
|
|
| 105 | |
|
|
| 106 | cmd_queue.pop_front (); |
|
|
| 107 | } |
100 | } |
| 108 | else |
101 | else |
| 109 | { |
|
|
| 110 | execute (cmd.handler, cmd.data, cmd.datalen); |
102 | execute (cmd.handler, cmd.data, cmd.datalen); |
|
|
103 | |
| 111 | cmd_queue.pop_front (); |
104 | cmd_queue.pop_front (); |
| 112 | return true; |
105 | return true; |
| 113 | } |
|
|
| 114 | } |
106 | } |
| 115 | |
107 | else |
| 116 | return false; |
108 | return false; |
| 117 | } |
109 | } |
| 118 | |
110 | |
| 119 | void |
111 | void |
| 120 | flush_sockets (void) |
112 | flush_sockets (void) |
| 121 | { |
113 | { |
| … | |
… | |
| 170 | draw_client_map (pl->ob); |
162 | draw_client_map (pl->ob); |
| 171 | |
163 | |
| 172 | if (update_look) |
164 | if (update_look) |
| 173 | esrv_draw_look (pl->ob); |
165 | esrv_draw_look (pl->ob); |
| 174 | |
166 | |
| 175 | if (askface.empty ()) |
167 | if (askface.empty () && !partial_face_ofs) |
| 176 | { |
168 | { |
|
|
169 | // regularly send a new face when queue is empty |
| 177 | if (bg_scrub && !--bg_scrub && enable_bg_scrub) |
170 | if (bg_scrub && !--bg_scrub && enable_bg_scrub) |
| 178 | while (scrub_idx < faces.size () - 1) |
171 | while (scrub_idx < faces.size () - 1) |
| 179 | { |
172 | { |
| 180 | ++scrub_idx; |
173 | ++scrub_idx; |
| 181 | if (!faces_sent [scrub_idx]) |
174 | if (!faces_sent [scrub_idx]) |
| 182 | { |
175 | { |
| 183 | send_face (scrub_idx); |
176 | send_face (scrub_idx); |
|
|
177 | flush_fx (); |
|
|
178 | |
| 184 | bg_scrub = 1; // send up to one face per tick, unless an image was requested |
179 | bg_scrub = 1; // send up to one face per tick, unless an image was requested |
| 185 | break; |
180 | break; |
| 186 | } |
181 | } |
| 187 | } |
182 | } |
|
|
183 | |
|
|
184 | rate_avail = max_rate - outputbuffer_len (); |
| 188 | } |
185 | } |
| 189 | else |
186 | else |
| 190 | while (!askface.empty () && outputbuffer_len () < max_rate) |
|
|
| 191 | { |
187 | { |
| 192 | // use a lifo to send most recently requested images |
188 | int ol = outputbuffer_len (); |
| 193 | faceidx face = askface.back (); |
|
|
| 194 | askface.pop_back (); |
|
|
| 195 | |
189 | |
| 196 | send_image (face); |
190 | rate_avail = min (max_rate, rate_avail + max_rate); |
|
|
191 | rate_avail -= ol; |
| 197 | |
192 | |
|
|
193 | int avail = rate_avail; |
|
|
194 | |
|
|
195 | // if we can split images, transfer up to mss packets if possible |
|
|
196 | // but never more 768 bytes more. |
|
|
197 | if (fxix) avail += min (768, mss - (ol % mss)); |
|
|
198 | |
| 198 | bg_scrub = BG_SCRUB_RATE; |
199 | bg_scrub = BG_SCRUB_RATE; |
|
|
200 | |
|
|
201 | while (avail > 0) |
|
|
202 | { |
|
|
203 | if (partial_face_ofs) |
|
|
204 | { |
|
|
205 | if (facedata *d = face_data (partial_face, faceset)) |
|
|
206 | { |
|
|
207 | // 9 bytes is enough for fx_FFFOOO, 40 leaves some room |
|
|
208 | int chunk = min (min (avail - 40, MAXSOCKBUF - 9), partial_face_ofs); |
|
|
209 | |
|
|
210 | if (chunk <= 0) |
|
|
211 | break; |
|
|
212 | |
|
|
213 | partial_face_ofs -= chunk; |
|
|
214 | |
|
|
215 | packet sl ("ix"); |
|
|
216 | |
|
|
217 | sl << ber32 (partial_face) |
|
|
218 | << ber32 (partial_face_ofs) |
|
|
219 | << data (d->data.data () + partial_face_ofs, chunk); |
|
|
220 | |
|
|
221 | send_packet (sl); |
|
|
222 | } |
|
|
223 | else |
|
|
224 | partial_face_ofs = 0; |
|
|
225 | } |
|
|
226 | else if (!askface.empty ()) |
|
|
227 | { |
|
|
228 | // use a lifo to send most recently requested images |
|
|
229 | faceidx facenum = askface.back (); |
|
|
230 | askface.pop_back (); |
|
|
231 | |
|
|
232 | if (fxix) |
|
|
233 | { |
|
|
234 | if (facedata *d = face_data (facenum, faceset)) |
|
|
235 | { |
|
|
236 | partial_face = facenum; |
|
|
237 | partial_face_ofs = d->data.size (); |
|
|
238 | } |
|
|
239 | } |
|
|
240 | else |
|
|
241 | send_image (facenum); |
|
|
242 | } |
|
|
243 | else |
|
|
244 | break; |
|
|
245 | |
|
|
246 | int consumed = ol - outputbuffer_len (); |
|
|
247 | avail -= consumed; |
|
|
248 | rate_avail -= consumed; |
| 199 | } |
249 | } |
|
|
250 | } |
| 200 | } |
251 | } |
| 201 | |
252 | |
