external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-14 12:21:55 +00:00
Code Issues Releases Wiki Activity

For #1105, http server support mp4 range.

Browse source
This commit is contained in:
winlin 2019-12-26 18:33:52 +08:00
parent 7584c47aaf
commit b9d720c927
3 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -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
* <strong>v3.0, 2019-12-26, [3.0 alpha6(3.0.85)][r3.0a6] released. 116056 lines.</strong>
* v3.0, 2019-12-26, For [#1488][bug #1488], pass client ip to http callback. 3.0.85

4
trunk/src/app/srs_app_http_static.cpp
View file

@ -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);
}

9
trunk/src/protocol/srs_http_stack.cpp
View file

@ -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;