diff --git a/README.md b/README.md index 0c2566e4b2..4ff5db450e 100755 --- a/README.md +++ b/README.md @@ -146,6 +146,7 @@ For previous versions, please read: ## V3 changes +* v3.0, 2019-12-26, For [#1105][bug #1105], http server support mp4 range. * v3.0, 2019-12-26, For [#1105][bug #1105], dvr mp4 supports playing on Chrome/Safari/Firefox. 3.0.86 * v3.0, 2019-12-26, [3.0 alpha6(3.0.85)][r3.0a6] released. 116056 lines. * v3.0, 2019-12-26, For [#1488][bug #1488], pass client ip to http callback. 3.0.85 diff --git a/trunk/src/app/srs_app_http_static.cpp b/trunk/src/app/srs_app_http_static.cpp index 5be561259c..dc4354ed04 100644 --- a/trunk/src/app/srs_app_http_static.cpp +++ b/trunk/src/app/srs_app_http_static.cpp @@ -157,10 +157,10 @@ srs_error_t SrsVodStream::serve_mp4_stream(ISrsHttpResponseWriter* w, ISrsHttpMe // parse -1 to whole file. if (end == -1) { - end = (int)fs->filesize(); + end = (int)(fs->filesize() - 1); } - if (end > fs->filesize() || start > end) { + if (end > fs->filesize() || start > end || end < 0) { return srs_error_new(ERROR_HTTP_REMUX_OFFSET_OVERFLOW, "http mp4 streaming %s overflow. size=%" PRId64 ", offset=%d", fullpath.c_str(), fs->filesize(), start); } diff --git a/trunk/src/protocol/srs_http_stack.cpp b/trunk/src/protocol/srs_http_stack.cpp index e2d1d1e57e..7979744e9f 100644 --- a/trunk/src/protocol/srs_http_stack.cpp +++ b/trunk/src/protocol/srs_http_stack.cpp @@ -486,6 +486,15 @@ srs_error_t SrsHttpFileServer::serve_mp4_file(ISrsHttpResponseWriter* w, ISrsHtt if (range.empty()) { range = r->query_get("bytes"); } + + // Fetch range from header. + SrsHttpHeader* h = r->header(); + if (range.empty() && h) { + range = h->get("Range"); + if (range.find("bytes=") == 0) { + range = range.substr(6); + } + } // rollback to serve whole file. size_t pos = string::npos;