|
10 | 10 | #define HLS_BUFFER_COUNT 2 |
11 | 11 | #define HLS_MAX_NO_READ 2 |
12 | 12 | #define HLS_MAX_URL_LEN 256 |
| 13 | +#define HLS_TIMEOUT 5000 |
13 | 14 |
|
14 | 15 | /// hide hls implementation in it's own namespace |
15 | 16 |
|
@@ -129,9 +130,9 @@ class URLLoaderHLS { |
129 | 130 | LOGI("playing %s", url_to_play); |
130 | 131 | p_stream->end(); |
131 | 132 | p_stream->setConnectionClose(true); |
132 | | - p_stream->setTimeout(5000); |
| 133 | + p_stream->setTimeout(HLS_TIMEOUT); |
133 | 134 | p_stream->begin(url_to_play); |
134 | | - p_stream->waitForData(5000); |
| 135 | + p_stream->waitForData(HLS_TIMEOUT); |
135 | 136 | urls.pop_front(); |
136 | 137 | // assert(urls[0]!=url); |
137 | 138 |
|
@@ -345,9 +346,9 @@ class HLSParser { |
345 | 346 | /// Default implementation for url resolver: determine absolue url from |
346 | 347 | /// relative url |
347 | 348 | static const char *resolveURL(const char *segment, const char *reqURL) { |
348 | | - static char result[HLS_MAX_URL_LEN] = { |
349 | | - 0}; // avoid dynamic memory allocation |
350 | | - StrView result_str(result, 256); |
| 349 | + // avoid dynamic memory allocation |
| 350 | + static char result[HLS_MAX_URL_LEN] = {0}; |
| 351 | + StrView result_str(result, HLS_MAX_URL_LEN); |
351 | 352 | StrView index_url(reqURL); |
352 | 353 | // Use prefix up to ? or laast / |
353 | 354 | int end = index_url.lastIndexOf("?"); |
@@ -387,7 +388,7 @@ class HLSParser { |
387 | 388 | bool parseIndex() { |
388 | 389 | TRACED(); |
389 | 390 | url_stream.end(); |
390 | | - url_stream.setTimeout(5000); |
| 391 | + url_stream.setTimeout(HLS_TIMEOUT); |
391 | 392 | url_stream.setConnectionClose(true); |
392 | 393 | if (!url_stream.begin(index_url_str)) return false; |
393 | 394 | url_active = true; |
@@ -469,7 +470,7 @@ class HLSParser { |
469 | 470 | return true; |
470 | 471 | } |
471 | 472 |
|
472 | | - void resetTimings(){ |
| 473 | + void resetTimings() { |
473 | 474 | next_sement_load_time_planned = millis(); |
474 | 475 | play_time = 0; |
475 | 476 | next_sement_load_time = 0xFFFFFFFFFFFFFFFF; |
@@ -518,15 +519,15 @@ class HLSParser { |
518 | 519 | return true; |
519 | 520 | } |
520 | 521 |
|
521 | | - void segmentsActivate(){ |
| 522 | + void segmentsActivate() { |
522 | 523 | LOGI("Reloading in %f sec", play_time / 1000.0); |
523 | 524 | if (play_time > 0) { |
524 | 525 | next_sement_load_time = next_sement_load_time_planned + play_time; |
525 | 526 | } |
526 | 527 |
|
527 | 528 | // we request a minimum of collected urls to play before we start |
528 | 529 | if (url_history.size() > START_URLS_LIMIT) active = true; |
529 | | - parse_segments_active = false; |
| 530 | + parse_segments_active = false; |
530 | 531 | } |
531 | 532 |
|
532 | 533 | /// parse the segments |
|
0 commit comments