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

RTC: Merge package AV

Browse source
This commit is contained in:
winlin 2020-05-21 13:50:18 +08:00
parent 690c64e046
commit 5bd2812405
2 changed files with 13 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

32
trunk/src/app/srs_app_rtc_conn.cpp
View file

@ -771,28 +771,6 @@ srs_error_t SrsRtcPlayer::messages_to_packets(SrsRtcSource* source, const vector
if (pkt->is_audio()) { if (pkt->is_audio()) {
info.nn_audios++; info.nn_audios++;
if ((err = package_opus(pkt)) != srs_success) {
return srs_error_wrap(err, "package opus");
}
continue;
}
// For video, we should process all NALUs in samples.
info.nn_videos++;
// For video, we should set the RTP packet informations about this consumer.
if ((err = package_video(pkt)) != srs_success) {
return srs_error_wrap(err, "package video");
}
}
return err;
}
srs_error_t SrsRtcPlayer::package_opus(SrsRtpPacket2* pkt)
{
srs_error_t err = srs_success;
pkt->header.set_timestamp(audio_timestamp); pkt->header.set_timestamp(audio_timestamp);
pkt->header.set_sequence(audio_sequence++); pkt->header.set_sequence(audio_sequence++);
pkt->header.set_ssrc(audio_ssrc); pkt->header.set_ssrc(audio_ssrc);
@ -804,17 +782,17 @@ srs_error_t SrsRtcPlayer::package_opus(SrsRtpPacket2* pkt)
// TODO: FIXME: Why 960? Need Refactoring? // TODO: FIXME: Why 960? Need Refactoring?
audio_timestamp += 960; audio_timestamp += 960;
continue;
return err;
} }
srs_error_t SrsRtcPlayer::package_video(SrsRtpPacket2* pkt) // For video, we should process all NALUs in samples.
{ info.nn_videos++;
srs_error_t err = srs_success;
// For video, we should set the RTP packet informations about this consumer.
pkt->header.set_sequence(video_sequence++); pkt->header.set_sequence(video_sequence++);
pkt->header.set_ssrc(video_ssrc); pkt->header.set_ssrc(video_ssrc);
pkt->header.set_payload_type(video_payload_type); pkt->header.set_payload_type(video_payload_type);
}
return err; return err;
} }

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

@ -242,8 +242,6 @@ public:
private: private:
srs_error_t send_messages(SrsRtcSource* source, const std::vector<SrsRtpPacket2*>& pkts, SrsRtcOutgoingInfo& info); srs_error_t send_messages(SrsRtcSource* source, const std::vector<SrsRtpPacket2*>& pkts, SrsRtcOutgoingInfo& info);
srs_error_t messages_to_packets(SrsRtcSource* source, const std::vector<SrsRtpPacket2*>& pkts, SrsRtcOutgoingInfo& info); srs_error_t messages_to_packets(SrsRtcSource* source, const std::vector<SrsRtpPacket2*>& pkts, SrsRtcOutgoingInfo& info);
srs_error_t package_opus(SrsRtpPacket2* pkt);
srs_error_t package_video(SrsRtpPacket2* pkt);
srs_error_t send_packets(const std::vector<SrsRtpPacket2*>& pkts, SrsRtcOutgoingInfo& info); srs_error_t send_packets(const std::vector<SrsRtpPacket2*>& pkts, SrsRtcOutgoingInfo& info);
srs_error_t send_packets_gso(const std::vector<SrsRtpPacket2*>& pkts, SrsRtcOutgoingInfo& info); srs_error_t send_packets_gso(const std::vector<SrsRtpPacket2*>& pkts, SrsRtcOutgoingInfo& info);
public: public: