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

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

@ -6144,7 +6144,7 @@ SrsMp4M2tsSegmentEncoder::~SrsMp4M2tsSegmentEncoder()
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;
@ -6252,7 +6252,7 @@ srs_error_t SrsMp4M2tsSegmentEncoder::flush(uint64_t& dts)
traf->set_tfdt(tfdt);
tfdt->version = 1;
tfdt->base_media_decode_time = decode_basetime;
tfdt->base_media_decode_time = srsu2ms(decode_basetime);
SrsMp4TrackFragmentRunBox* trun = new SrsMp4TrackFragmentRunBox();
traf->set_trun(trun);

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

@ -469,6 +469,7 @@ public:
class SrsMp4TrackFragmentDecodeTimeBox : public SrsMp4FullBox
{
public:
// It's in ms.
uint64_t base_media_decode_time;
public:
SrsMp4TrackFragmentDecodeTimeBox();
@ -2198,7 +2199,7 @@ private:
ISrsWriter* writer;
SrsBuffer* buffer;
uint32_t sequence_number;
uint64_t decode_basetime;
srs_utime_t decode_basetime;
uint32_t track_id;
private:
uint32_t nb_audios;
@ -2212,7 +2213,7 @@ public:
virtual ~SrsMp4M2tsSegmentEncoder();
public:
// 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.
// @param ht, The sample handler type, audio/soun or video/vide.
// @param ft, The frame type. For video, it's SrsVideoAvcFrameType.