Skip to content

Commit

Permalink
replace the placeholder of ts url in m3u8
Browse files Browse the repository at this point in the history
  • Loading branch information
Haibo Chen committed Aug 24, 2021
1 parent 85620a3 commit 6f2608d
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 6 deletions.
23 changes: 17 additions & 6 deletions trunk/src/app/srs_app_hls.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,17 @@ void SrsHlsSegment::config_cipher(unsigned char* key,unsigned char* iv)

SrsEncFileWriter* fw = (SrsEncFileWriter*)writer;
fw->config_cipher(key, iv);
}

srs_error_t SrsHlsSegment::rename()
{
if (true) {
std::stringstream ss;
ss << srsu2msi(duration());
uri = srs_string_replace(uri, "[duration]", ss.str());
}

return SrsFragment::rename();
}

SrsDvrAsyncCallOnHls::SrsDvrAsyncCallOnHls(SrsContextId c, SrsRequest* r, string p, string t, string m, string mu, int s, srs_utime_t d)
Expand Down Expand Up @@ -607,6 +618,11 @@ srs_error_t SrsHlsMuxer::do_segment_close()
bool matchMinDuration = current->duration() >= SRS_HLS_SEGMENT_MIN_DURATION;
bool matchMaxDuration = current->duration() <= max_td * 2 * 1000;
if (matchMinDuration && matchMaxDuration) {
// rename from tmp to real path
if ((err = current->rename()) != srs_success) {
return srs_error_wrap(err, "rename");
}

// use async to call the http hooks, for it will cause thread switch.
if ((err = async->execute(new SrsDvrAsyncCallOnHls(_srs_context->get_id(), req, current->fullpath(),
current->uri, m3u8, m3u8_url, current->sequence_no, current->duration()))) != srs_success) {
Expand All @@ -620,12 +636,7 @@ srs_error_t SrsHlsMuxer::do_segment_close()

// close the muxer of finished segment.
srs_freep(current->tscw);

// rename from tmp to real path
if ((err = current->rename()) != srs_success) {
return srs_error_wrap(err, "rename");
}


segments->append(current);
current = NULL;
} else {
Expand Down
2 changes: 2 additions & 0 deletions trunk/src/app/srs_app_hls.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ class SrsHlsSegment : public SrsFragment
virtual ~SrsHlsSegment();
public:
void config_cipher(unsigned char* key,unsigned char* iv);
// replace the placeholder
virtual srs_error_t rename();
};

// The hls async call: on_hls
Expand Down

0 comments on commit 6f2608d

Please sign in to comment.