mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2024-11-19 11:10:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deliberately under-estimate the response length for the on-demand

Browse Source 
transcoder. HTTP clients in the wild seem to, in general, get more
cranky when we over-estimate and close the stream too early.
This commit is contained in:
casey langen 2017-06-03 22:10:15 -07:00
parent f48e321527
commit a613022209
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/websocket_remote/Constants.h
View File

@ -81,6 +81,7 @@ namespace key {
static const std::string title = "title";
static const std::string external_id = "external_id";
static const std::string filename = "filename";
static const std::string duration = "duration";
static const std::string artist = "artist";
static const std::string album = "album";
static const std::string album_artist = "album_artist";

7
src/plugins/websocket_remote/HttpServer.cpp
View File

@ -349,7 +349,9 @@ int HttpServer::HandleRequest(
}
if (track) {
std::string duration = GetMetadataString(track, key::duration);
std::string filename = GetMetadataString(track, key::filename);
track->Release();
size_t bitrate = getUnsignedUrlParam(connection, "bitrate", 0);
@ -448,6 +450,11 @@ int HttpServer::HandleRequest(
MHD_add_response_header(response, "X-musikcube-Estimated-Content-Length", "true");
}
if (duration.size()) {
MHD_add_response_header(response, "X-Content-Duration", duration.c_str());
MHD_add_response_header(response, "Content-Duration", duration.c_str());
}
if (byExternalId) {
/* if we're using an on-demand transcoder, ensure the client does not cache the
result because we have to guess the content length. */

6
src/plugins/websocket_remote/TranscodingDataStream.cpp
View File

@ -61,7 +61,11 @@ TranscodingDataStream::TranscodingDataStream(
this->decoder = context.environment->GetDecoder(this->input);
if (this->decoder) {
this->pcmBuffer = context.environment->GetBuffer(SAMPLES_PER_BUFFER);
this->length = (PositionType)(this->decoder->GetDuration() * 1000.0 * (float)bitrate / 8.0);
/* note that we purposely under-estimate the content length by a couple
seconds. we do this because http clients seem to be more likely to be
throw a fit if we over estimate, instead of under-estimate. */
this->length = (PositionType)((this->decoder->GetDuration() - 2.0) * 1000.0 * (float)bitrate / 8.0);
}
}
}