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

Squash: Merge v4.0.203

Browse source
This commit is contained in:
winlin 2021-12-04 11:21:35 +08:00
parent e16830e989
commit 8576fa7052
12 changed files with 137 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

3
trunk/src/app/srs_app_rtc_source.hpp
View file

@ -307,7 +307,7 @@ private:
RtcPacketCache cache_video_pkts_[s_cache_size];
uint16_t header_sn_;
uint16_t lost_sn_;
int64_t key_frame_ts_;
int64_t rtp_key_frame_ts_;
public:
SrsRtmpFromRtcBridger(SrsLiveSource *src);
virtual ~SrsRtmpFromRtcBridger();
@ -527,6 +527,7 @@ protected:
SrsNtp last_sender_report_ntp1_;
int64_t last_sender_report_rtp_time1_;
double rate_;
uint64_t last_sender_report_sys_time_;
public:
SrsRtcRecvTrack(SrsRtcConnection* session, SrsRtcTrackDescription* stream_descs, bool is_audio);