X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=stream.cpp;h=7ea8a956ee7addf099bb586ef41686decd91dbfc;hp=62c7507cc796b4075ece559fb00564b0ce46229e;hb=c020a9df307f6a5794336919fe5f2ac9a5a94e0a;hpb=20e85bd6901355cc40a6cfb4c0deb7232d9aa63f diff --git a/stream.cpp b/stream.cpp index 62c7507..7ea8a95 100644 --- a/stream.cpp +++ b/stream.cpp @@ -1,5 +1,6 @@ #include #include +#include #include #include #include @@ -22,7 +23,7 @@ using namespace std; Stream::Stream(const string &url, size_t backlog_size, - size_t prebuffering_bytes, + uint64_t prebuffering_bytes, Encoding encoding, Encoding src_encoding, unsigned hls_frag_duration, @@ -421,8 +422,8 @@ shared_ptr Stream::generate_hls_playlist(bool http_11, bool close_ "#EXTM3U\r\n" "#EXT-X-VERSION:7\r\n" "#EXT-X-TARGETDURATION:%u\r\n" - "#EXT-X-MEDIA-SEQUENCE:%zu\r\n" - "#EXT-X-DISCONTINUITY-SEQUENCE:%zu\r\n", + "#EXT-X-MEDIA-SEQUENCE:%" PRIu64 "\r\n" + "#EXT-X-DISCONTINUITY-SEQUENCE:%" PRIu64 "\r\n", hls_frag_duration, first_fragment_index, discontinuity_counter); @@ -438,7 +439,7 @@ shared_ptr Stream::generate_hls_playlist(bool http_11, bool close_ if (fragments.size() >= 3) { for (size_t i = 0; i < fragments.size() - 2; ++i) { char buf[256]; - snprintf(buf, sizeof(buf), "#EXTINF:%f,\r\n%s?frag=%zu-%zu\r\n", + snprintf(buf, sizeof(buf), "#EXTINF:%f,\r\n%s?frag=%" PRIu64 "-%" PRIu64 "\r\n", fragments[i + 1].pts - fragments[i].pts, url.c_str(), fragments[i].byte_position, @@ -457,9 +458,9 @@ shared_ptr Stream::generate_hls_playlist(bool http_11, bool close_ assert(close_after_response); response = "HTTP/1.0 200 OK\r\n"; } - snprintf(buf, sizeof(buf), "Content-length: %zu\r\n", playlist.size()); + snprintf(buf, sizeof(buf), "Content-Length: %zu\r\n", playlist.size()); response.append(buf); - response.append("Content-type: application/x-mpegURL\r\n"); + response.append("Content-Type: application/x-mpegURL\r\n"); if (!allow_origin.empty()) { response.append("Access-Control-Allow-Origin: "); response.append(allow_origin);