X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=stream.cpp;h=d7a78a602098ab5d77dda08873af8c3d7b29e11b;hp=50679ca5f5738c2bf0870d6816f24490284d3679;hb=f0621e41fdb96ce1bd58e7561e0aa76345072ba3;hpb=8095c4ac52431d9e593ece77bdc21566a2ed9240 diff --git a/stream.cpp b/stream.cpp index 50679ca..d7a78a6 100644 --- a/stream.cpp +++ b/stream.cpp @@ -8,6 +8,7 @@ #include #include #include +#include #include #include "log.h" @@ -19,21 +20,19 @@ using namespace std; -Stream::Stream(const string &url, size_t backlog_size, size_t prebuffering_bytes, Encoding encoding) +Stream::Stream(const string &url, size_t backlog_size, size_t prebuffering_bytes, Encoding encoding, Encoding src_encoding) : url(url), encoding(encoding), + src_encoding(src_encoding), data_fd(make_tempfile("")), backlog_size(backlog_size), - prebuffering_bytes(prebuffering_bytes), - bytes_received(0), - last_suitable_starting_point(-1), - pacing_rate(~0U) + prebuffering_bytes(prebuffering_bytes) { if (data_fd == -1) { exit(1); } - pthread_mutex_init(&queued_data_mutex, NULL); + pthread_mutex_init(&queued_data_mutex, nullptr); } Stream::~Stream() @@ -51,17 +50,23 @@ Stream::Stream(const StreamProto &serialized, int data_fd) data_fd(data_fd), backlog_size(serialized.backlog_size()), prebuffering_bytes(serialized.prebuffering_bytes()), - bytes_received(serialized.bytes_received()), - pacing_rate(~0U) + bytes_received(serialized.bytes_received()) { if (data_fd == -1) { exit(1); } - assert(serialized.has_last_suitable_starting_point()); - last_suitable_starting_point = serialized.last_suitable_starting_point(); + for (ssize_t point : serialized.suitable_starting_point()) { + if (point == -1) { + // Can happen when upgrading from before 1.1.3, + // where this was an optional field with -1 signifying + // "no such point". + continue; + } + suitable_starting_points.push_back(point); + } - pthread_mutex_init(&queued_data_mutex, NULL); + pthread_mutex_init(&queued_data_mutex, nullptr); } StreamProto Stream::serialize() @@ -73,7 +78,9 @@ StreamProto Stream::serialize() serialized.set_backlog_size(backlog_size); serialized.set_prebuffering_bytes(prebuffering_bytes); serialized.set_bytes_received(bytes_received); - serialized.set_last_suitable_starting_point(last_suitable_starting_point); + for (size_t point : suitable_starting_points) { + serialized.add_suitable_starting_point(point); + } serialized.set_url(url); data_fd = -1; return serialized; @@ -117,11 +124,12 @@ void Stream::set_backlog_size(size_t new_size) DataElement data_element; data_element.data.iov_base = const_cast(existing_data.data()); data_element.data.iov_len = existing_data.size(); - data_element.suitable_for_stream_start = NOT_SUITABLE_FOR_STREAM_START; // Ignored by add_data_raw(). + data_element.metacube_flags = 0; // Ignored by add_data_raw(). vector data_elements; data_elements.push_back(data_element); add_data_raw(data_elements); + remove_obsolete_starting_points(); } void Stream::put_client_to_sleep(Client *client) @@ -133,7 +141,7 @@ void Stream::put_client_to_sleep(Client *client) vector collect_iovecs(const vector &data, size_t bytes_wanted) { vector ret; - size_t max_iovecs = std::min(data.size(), IOV_MAX); + size_t max_iovecs = min(data.size(), IOV_MAX); for (size_t i = 0; i < max_iovecs && bytes_wanted > 0; ++i) { if (data[i].data.iov_len <= bytes_wanted) { // Consume the entire iovec. @@ -165,7 +173,7 @@ vector remove_iovecs(const vector &dat Stream::DataElement data_element; data_element.data.iov_base = reinterpret_cast(data[i].data.iov_base) + bytes_wanted; data_element.data.iov_len = data[i].data.iov_len - bytes_wanted; - data_element.suitable_for_stream_start = NOT_SUITABLE_FOR_STREAM_START; + data_element.metacube_flags = METACUBE_FLAGS_NOT_SUITABLE_FOR_STREAM_START; ret.push_back(data_element); bytes_wanted = 0; } @@ -202,24 +210,39 @@ void Stream::add_data_raw(const vector &orig_data) } } -void Stream::add_data_deferred(const char *data, size_t bytes, StreamStartSuitability suitable_for_stream_start) +void Stream::remove_obsolete_starting_points() { + // We could do a binary search here (std::lower_bound), but it seems + // overkill for removing what's probably only a few points. + while (!suitable_starting_points.empty() && + bytes_received - suitable_starting_points[0] > backlog_size) { + suitable_starting_points.pop_front(); + } +} + +void Stream::add_data_deferred(const char *data, size_t bytes, uint16_t metacube_flags) +{ + // For regular output, we don't want to send the client twice + // (it's already sent out together with the HTTP header). + // However, for Metacube output, we need to send it so that + // the Cubemap instance in the other end has a chance to update it. + // It may come twice in its stream, but Cubemap doesn't care. + if (encoding == Stream::STREAM_ENCODING_RAW && + (metacube_flags & METACUBE_FLAGS_HEADER) != 0) { + return; + } + MutexLock lock(&queued_data_mutex); - assert(suitable_for_stream_start == SUITABLE_FOR_STREAM_START || - suitable_for_stream_start == NOT_SUITABLE_FOR_STREAM_START); DataElement data_element; - data_element.suitable_for_stream_start = suitable_for_stream_start; + data_element.metacube_flags = metacube_flags; if (encoding == Stream::STREAM_ENCODING_METACUBE) { // Add a Metacube block header before the data. metacube2_block_header hdr; memcpy(hdr.sync, METACUBE2_SYNC, sizeof(hdr.sync)); hdr.size = htonl(bytes); - hdr.flags = htons(0); - if (suitable_for_stream_start == NOT_SUITABLE_FOR_STREAM_START) { - hdr.flags |= htons(METACUBE_FLAGS_NOT_SUITABLE_FOR_STREAM_START); - } + hdr.flags = htons(metacube_flags); hdr.csum = htons(metacube2_compute_crc(&hdr)); data_element.data.iov_base = new char[bytes + sizeof(hdr)]; @@ -243,7 +266,7 @@ void Stream::add_data_deferred(const char *data, size_t bytes, StreamStartSuitab void Stream::process_queued_data() { - std::vector queued_data_copy; + vector queued_data_copy; // Hold the lock for as short as possible, since add_data_raw() can possibly // write to disk, which might disturb the input thread. @@ -256,19 +279,32 @@ void Stream::process_queued_data() swap(queued_data, queued_data_copy); } - // Update the last suitable starting point for the stream, - // if the queued data contains such a starting point. + // Add suitable starting points for the stream, if the queued data + // contains such starting points. Note that we drop starting points + // if they're less than 10 kB apart, so that we don't get a huge + // amount of them for e.g. each and every MPEG-TS 188-byte cell. + // The 10 kB value is somewhat arbitrary, but at least it should make + // the RAM cost of saving the position ~0.1% (or less) of the actual + // data, and 10 kB is a very fine granularity in most streams. + static const int minimum_start_point_distance = 10240; size_t byte_position = bytes_received; - for (size_t i = 0; i < queued_data_copy.size(); ++i) { - if (queued_data_copy[i].suitable_for_stream_start == SUITABLE_FOR_STREAM_START) { - last_suitable_starting_point = byte_position; + for (const DataElement &elem : queued_data_copy) { + if ((elem.metacube_flags & METACUBE_FLAGS_NOT_SUITABLE_FOR_STREAM_START) == 0) { + size_t num_points = suitable_starting_points.size(); + if (num_points >= 2 && + suitable_starting_points[num_points - 1] - suitable_starting_points[num_points - 2] < minimum_start_point_distance) { + // p[n-1] - p[n-2] < 10 kB, so drop p[n-1]. + suitable_starting_points.pop_back(); + } + suitable_starting_points.push_back(byte_position); } - byte_position += queued_data_copy[i].data.iov_len; + byte_position += elem.data.iov_len; } add_data_raw(queued_data_copy); - for (size_t i = 0; i < queued_data_copy.size(); ++i) { - char *data = reinterpret_cast(queued_data_copy[i].data.iov_base); + remove_obsolete_starting_points(); + for (const DataElement &elem : queued_data_copy) { + char *data = reinterpret_cast(elem.data.iov_base); delete[] data; }