external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

for #340, #343, add wiki and use srs string function, support hls_entry_prefix(hls base url). 2.0.142

Browse source
This commit is contained in:
winlin 2015-03-17 07:57:58 +08:00
parent 1a12ff0d94
commit 2241ba0e34
5 changed files with 12 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

10
trunk/src/app/srs_app_hls.cpp
View file

@ -203,14 +203,14 @@ int SrsHlsMuxer::sequence_no()
return _sequence_no;
}
int SrsHlsMuxer::update_config(SrsRequest* r, string hls_entry_prefix, string path, int fragment, int window)
int SrsHlsMuxer::update_config(SrsRequest* r, string entry_prefix, string path, int fragment, int window)
{
int ret = ERROR_SUCCESS;
srs_freep(req);
req = r->copy();
entry_prefix = hls_entry_prefix;
hls_entry_prefix = entry_prefix;
hls_path = path;
hls_fragment = fragment;
hls_window = window;
@ -301,8 +301,10 @@ int SrsHlsMuxer::segment_open(int64_t segment_start_dts)
current->full_path += "/";
current->full_path += filename;
// TODO: support base url, and so on.
current->uri += entry_prefix;
current->uri += hls_entry_prefix;
if (!hls_entry_prefix.empty() && !srs_string_ends_with(hls_entry_prefix, "/")) {
current->uri += "/";
}
current->uri += filename;
std::string tmp_file = current->full_path + ".tmp";