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: Remove dead code

Browse source
This commit is contained in:
winlin 2020-05-15 08:24:26 +08:00
parent d8cf9b64c8
commit 620ca902e2
4 changed files with 10 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

10
trunk/src/app/srs_app_rtc_source.cpp
View file

@ -115,13 +115,7 @@ void SrsRtcConsumer::update_source_id()
should_update_source_id = true; should_update_source_id = true;
} }
srs_error_t SrsRtcConsumer::enqueue(SrsSharedPtrMessage* shared_msg, bool atc, SrsRtmpJitterAlgorithm ag) srs_error_t SrsRtcConsumer::enqueue(SrsRtpPacket2* pkt)
{
srs_error_t err = srs_success;
return err;
}
srs_error_t SrsRtcConsumer::enqueue2(SrsRtpPacket2* pkt)
{ {
srs_error_t err = srs_success; srs_error_t err = srs_success;
@ -404,7 +398,7 @@ srs_error_t SrsRtcSource::on_rtp(SrsRtpPacket2* pkt)
for (int i = 0; i < (int)consumers.size(); i++) { for (int i = 0; i < (int)consumers.size(); i++) {
SrsRtcConsumer* consumer = consumers.at(i); SrsRtcConsumer* consumer = consumers.at(i);
if ((err = consumer->enqueue2(pkt->copy())) != srs_success) { if ((err = consumer->enqueue(pkt->copy())) != srs_success) {
return srs_error_wrap(err, "consume message"); return srs_error_wrap(err, "consume message");
} }
} }

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

@ -45,7 +45,7 @@ class SrsAudioRecode;
class SrsRtpPacket2; class SrsRtpPacket2;
class SrsSample; class SrsSample;
class SrsRtcConsumer : public ISrsConsumerQueue class SrsRtcConsumer
{ {
private: private:
SrsRtcSource* source; SrsRtcSource* source;
@ -63,9 +63,10 @@ public:
public: public:
// When source id changed, notice client to print. // When source id changed, notice client to print.
virtual void update_source_id(); virtual void update_source_id();
// Put or get RTP packet in queue. // Put RTP packet into queue.
virtual srs_error_t enqueue(SrsSharedPtrMessage* shared_msg, bool atc, SrsRtmpJitterAlgorithm ag); // @note We do not drop packet here, but drop it in sender.
srs_error_t enqueue2(SrsRtpPacket2* pkt); srs_error_t enqueue(SrsRtpPacket2* pkt);
// Get all RTP packets from queue.
virtual srs_error_t dump_packets(std::vector<SrsRtpPacket2*>& pkts); virtual srs_error_t dump_packets(std::vector<SrsRtpPacket2*>& pkts);
// Wait for at-least some messages incoming in queue. // Wait for at-least some messages incoming in queue.
virtual void wait(int nb_msgs); virtual void wait(int nb_msgs);

10
trunk/src/app/srs_app_source.cpp
View file

@ -418,14 +418,6 @@ ISrsWakable::~ISrsWakable()
{ {
} }
ISrsConsumerQueue::ISrsConsumerQueue()
{
}
ISrsConsumerQueue::~ISrsConsumerQueue()
{
}
SrsConsumer::SrsConsumer(SrsSource* s, SrsConnection* c) SrsConsumer::SrsConsumer(SrsSource* s, SrsConnection* c)
{ {
source = s; source = s;
@ -1570,7 +1562,7 @@ SrsFormat* SrsMetaCache::ash_format()
return aformat; return aformat;
} }
srs_error_t SrsMetaCache::dumps(ISrsConsumerQueue* consumer, bool atc, SrsRtmpJitterAlgorithm ag, bool dm, bool ds) srs_error_t SrsMetaCache::dumps(SrsConsumer* consumer, bool atc, SrsRtmpJitterAlgorithm ag, bool dm, bool ds)
{ {
srs_error_t err = srs_success; srs_error_t err = srs_success;

14
trunk/src/app/srs_app_source.hpp
View file

@ -182,18 +182,8 @@ public:
virtual void wakeup() = 0; virtual void wakeup() = 0;
}; };
// Enqueue the packet to consumer.
class ISrsConsumerQueue
{
public:
ISrsConsumerQueue();
virtual ~ISrsConsumerQueue();
public:
virtual srs_error_t enqueue(SrsSharedPtrMessage* shared_msg, bool atc, SrsRtmpJitterAlgorithm ag) = 0;
};
// The consumer for SrsSource, that is a play client. // The consumer for SrsSource, that is a play client.
class SrsConsumer : virtual public ISrsWakable, virtual public ISrsConsumerQueue class SrsConsumer : virtual public ISrsWakable
{ {
private: private:
SrsRtmpJitter* jitter; SrsRtmpJitter* jitter;
@ -445,7 +435,7 @@ public:
// Dumps cached metadata to consumer. // Dumps cached metadata to consumer.
// @param dm Whether dumps the metadata. // @param dm Whether dumps the metadata.
// @param ds Whether dumps the sequence header. // @param ds Whether dumps the sequence header.
virtual srs_error_t dumps(ISrsConsumerQueue* consumer, bool atc, SrsRtmpJitterAlgorithm ag, bool dm, bool ds); virtual srs_error_t dumps(SrsConsumer* consumer, bool atc, SrsRtmpJitterAlgorithm ag, bool dm, bool ds);
public: public:
// Previous exists sequence header. // Previous exists sequence header.
virtual SrsSharedPtrMessage* previous_vsh(); virtual SrsSharedPtrMessage* previous_vsh();