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(); virtual srs_error_t start();
// Set socket option TCP_NODELAY. // Set socket option TCP_NODELAY.
virtual srs_error_t set_tcp_nodelay(bool v); 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); virtual srs_error_t set_socket_buffer(srs_utime_t buffer_v);
// interface ISrsOneCycleThreadHandler // interface ISrsOneCycleThreadHandler
public: 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_home;
string file_name; string file_name;
int64_t sequence_number; 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) { if ((err = mpd->get_fragment(video, file_home, file_name, sequence_number, basetime)) != srs_success) {
return srs_error_wrap(err, "get fragment"); return srs_error_wrap(err, "get fragment");
} }
@ -271,14 +271,14 @@ srs_error_t SrsMpdWriter::write(SrsFormat* format)
return err; 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; srs_error_t err = srs_success;
home = fragment_home; home = fragment_home;
sn = srs_update_system_time() / fragment; sn = srs_update_system_time() / fragment;
basetime = sn * srsu2ms(fragment); basetime = sn * fragment;
if (video) { if (video) {
file_name = "video-" + srs_int2str(sn) + ".m4s"; 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); virtual srs_error_t write(SrsFormat* format);
public: public:
// Get the fragment relative home and filename. // Get the fragment relative home and filename.
// The basetime is the absolute time in ms, while the sn(sequence number) is basetime/fragment. // 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, uint64_t& basetime); virtual srs_error_t get_fragment(bool video, std::string& home, std::string& filename, int64_t& sn, srs_utime_t& basetime);
}; };
/** /**

4
trunk/src/kernel/srs_kernel_mp4.cpp
View file

@ -6144,7 +6144,7 @@ SrsMp4M2tsSegmentEncoder::~SrsMp4M2tsSegmentEncoder()
srs_freep(buffer); srs_freep(buffer);
} }
srs_error_t SrsMp4M2tsSegmentEncoder::initialize(ISrsWriter* w, uint32_t sequence, uint64_t basetime, uint32_t tid) srs_error_t SrsMp4M2tsSegmentEncoder::initialize(ISrsWriter* w, uint32_t sequence, srs_utime_t basetime, uint32_t tid)
{ {
srs_error_t err = srs_success; srs_error_t err = srs_success;
@ -6252,7 +6252,7 @@ srs_error_t SrsMp4M2tsSegmentEncoder::flush(uint64_t& dts)
traf->set_tfdt(tfdt); traf->set_tfdt(tfdt);
tfdt->version = 1; tfdt->version = 1;
tfdt->base_media_decode_time = decode_basetime; tfdt->base_media_decode_time = srsu2ms(decode_basetime);
SrsMp4TrackFragmentRunBox* trun = new SrsMp4TrackFragmentRunBox(); SrsMp4TrackFragmentRunBox* trun = new SrsMp4TrackFragmentRunBox();
traf->set_trun(trun); traf->set_trun(trun);

5
trunk/src/kernel/srs_kernel_mp4.hpp
View file

@ -469,6 +469,7 @@ public:
class SrsMp4TrackFragmentDecodeTimeBox : public SrsMp4FullBox class SrsMp4TrackFragmentDecodeTimeBox : public SrsMp4FullBox
{ {
public: public:
// It's in ms.
uint64_t base_media_decode_time; uint64_t base_media_decode_time;
public: public:
SrsMp4TrackFragmentDecodeTimeBox(); SrsMp4TrackFragmentDecodeTimeBox();
@ -2198,7 +2199,7 @@ private:
ISrsWriter* writer; ISrsWriter* writer;
SrsBuffer* buffer; SrsBuffer* buffer;
uint32_t sequence_number; uint32_t sequence_number;
uint64_t decode_basetime; srs_utime_t decode_basetime;
uint32_t track_id; uint32_t track_id;
private: private:
uint32_t nb_audios; uint32_t nb_audios;
@ -2212,7 +2213,7 @@ public:
virtual ~SrsMp4M2tsSegmentEncoder(); virtual ~SrsMp4M2tsSegmentEncoder();
public: public:
// Initialize the encoder with a writer w. // Initialize the encoder with a writer w.
virtual srs_error_t initialize(ISrsWriter* w, uint32_t sequence, uint64_t basetime, uint32_t tid); virtual srs_error_t initialize(ISrsWriter* w, uint32_t sequence, srs_utime_t basetime, uint32_t tid);
// Cache a sample. // Cache a sample.
// @param ht, The sample handler type, audio/soun or video/vide. // @param ht, The sample handler type, audio/soun or video/vide.
// @param ft, The frame type. For video, it's SrsVideoAvcFrameType. // @param ft, The frame type. For video, it's SrsVideoAvcFrameType.