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

adjust code style, fix some bug, add rtc session timeout

Browse source
This commit is contained in:
xiaozhihong 2020-03-13 00:24:56 +08:00
parent da72caf8b9
commit 6decdc7838
10 changed files with 508 additions and 251 deletions
Download patch file Download diff file Expand all files Collapse all files

5
trunk/src/app/srs_app_rtp.cpp
View file

@ -87,10 +87,12 @@ srs_error_t SrsRtpMuxer::frame_to_packet(SrsSharedPtrMessage* shared_frame, SrsF
packet_fu_a(shared_frame, format, &sample, rtp_packet_vec);
}
#if 0
srs_trace("nal size=%d, nal=%s", sample.size, dump_string_hex(sample.bytes, sample.size, sample.size).c_str());
for (int i = 0; i < shared_frame->nb_rtp_fragments; ++i) {
srs_trace("rtp=%s", dump_string_hex(shared_frame->rtp_fragments[i].bytes, shared_frame->rtp_fragments[i].size, kRtpPacketSize).c_str());
}
#endif
}
SrsSample* rtp_samples = new SrsSample[rtp_packet_vec.size()];
@ -134,7 +136,6 @@ srs_error_t SrsRtpMuxer::packet_fu_a(SrsSharedPtrMessage* shared_frame, SrsForma
stream->write_1bytes(kH264PayloadType);
}
// sequence
srs_trace("sequence=%u", sequence);
stream->write_2bytes(sequence++);
// timestamp
stream->write_4bytes(int32_t(shared_frame->timestamp * 90));
@ -186,7 +187,6 @@ srs_error_t SrsRtpMuxer::packet_single_nalu(SrsSharedPtrMessage* shared_frame, S
// marker payloadtype
stream->write_1bytes(kMarker | kH264PayloadType);
// sequenct
srs_trace("sequence=%u", sequence);
stream->write_2bytes(sequence++);
// timestamp
stream->write_4bytes(int32_t(shared_frame->timestamp * 90));
@ -220,7 +220,6 @@ srs_error_t SrsRtpMuxer::packet_stap_a(const string &sps, const string& pps, Srs
// marker payloadtype
stream->write_1bytes(kMarker | kH264PayloadType);
// sequenct
srs_trace("sequence=%u", sequence);
stream->write_2bytes(sequence++);
// timestamp
stream->write_4bytes(int32_t(shared_frame->timestamp * 90));