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

Refine SrsTcpClient.timeout in time unit.

Browse source
This commit is contained in:
winlin 2019-04-18 07:58:37 +08:00
parent 33c66b64c5
commit 288bed6e26
5 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/src/app/srs_app_conn.hpp
View file

@ -102,7 +102,7 @@ public:
virtual srs_error_t start();
// Set socket option TCP_NODELAY.
virtual srs_error_t set_tcp_nodelay(bool v);
// Set socket option SO_SNDBUF in ms.
// Set socket option SO_SNDBUF in srs_utime_t.
virtual srs_error_t set_socket_buffer(srs_utime_t buffer_v);
// interface ISrsOneCycleThreadHandler
public:

6
trunk/src/app/srs_app_dash.cpp
View file

@ -88,7 +88,7 @@ srs_error_t SrsFragmentedMp4::initialize(SrsRequest* r, bool video, SrsMpdWriter
string file_home;
string file_name;
int64_t sequence_number;
uint64_t basetime;
srs_utime_t basetime;
if ((err = mpd->get_fragment(video, file_home, file_name, sequence_number, basetime)) != srs_success) {
return srs_error_wrap(err, "get fragment");
}
@ -271,14 +271,14 @@ srs_error_t SrsMpdWriter::write(SrsFormat* format)
return err;
}
srs_error_t SrsMpdWriter::get_fragment(bool video, std::string& home, std::string& file_name, int64_t& sn, uint64_t& basetime)
srs_error_t SrsMpdWriter::get_fragment(bool video, std::string& home, std::string& file_name, int64_t& sn, srs_utime_t& basetime)
{
srs_error_t err = srs_success;
home = fragment_home;
sn = srs_update_system_time() / fragment;
basetime = sn * srsu2ms(fragment);
basetime = sn * fragment;
if (video) {
file_name = "video-" + srs_int2str(sn) + ".m4s";

4
trunk/src/app/srs_app_dash.hpp
View file

@ -109,8 +109,8 @@ public:
virtual srs_error_t write(SrsFormat* format);
public:
// Get the fragment relative home and filename.
// The basetime is the absolute time in ms, while the sn(sequence number) is basetime/fragment.
virtual srs_error_t get_fragment(bool video, std::string& home, std::string& filename, int64_t& sn, uint64_t& basetime);
// The basetime is the absolute time in srs_utime_t, while the sn(sequence number) is basetime/fragment.
virtual srs_error_t get_fragment(bool video, std::string& home, std::string& filename, int64_t& sn, srs_utime_t& basetime);
};
/**