mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-13 05:40:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename ReceiveStream to ReceiveStreamInterface

Browse source 
Bug: webrtc:7484
Change-Id: I41176a66b8399f6c8cf568630f2808eb95cf6247
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/262767
Auto-Submit: Tomas Gunnarsson <tommi@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#36917}
This commit is contained in:
Tommi 2022-05-18 09:18:37 +02:00 committed by WebRTC LUCI CQ
parent f92a0846c3
commit 0601db9a48
4 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
call/call.cc
View file

@ -85,7 +85,7 @@ bool HasTransportSequenceNumber(const RtpHeaderExtensionMap& map) {
map.IsRegistered(kRtpExtensionTransportSequenceNumber02); map.IsRegistered(kRtpExtensionTransportSequenceNumber02);
} }
bool UseSendSideBwe(const ReceiveStream* stream) { bool UseSendSideBwe(const ReceiveStreamInterface* stream) {
return stream->transport_cc() && return stream->transport_cc() &&
HasTransportSequenceNumber(stream->GetRtpExtensionMap()); HasTransportSequenceNumber(stream->GetRtpExtensionMap());
} }
@ -361,7 +361,7 @@ class Call final : public webrtc::Call,
bool IdentifyReceivedPacket(RtpPacketReceived& packet, bool IdentifyReceivedPacket(RtpPacketReceived& packet,
bool* use_send_side_bwe = nullptr); bool* use_send_side_bwe = nullptr);
bool RegisterReceiveStream(uint32_t ssrc, ReceiveStream* stream); bool RegisterReceiveStream(uint32_t ssrc, ReceiveStreamInterface* stream);
bool UnregisterReceiveStream(uint32_t ssrc); bool UnregisterReceiveStream(uint32_t ssrc);
void UpdateAggregateNetworkState(); void UpdateAggregateNetworkState();
@ -416,7 +416,7 @@ class Call final : public webrtc::Call,
// TODO(bugs.webrtc.org/11993): Move receive_rtp_config_ over to the // TODO(bugs.webrtc.org/11993): Move receive_rtp_config_ over to the
// network thread. // network thread.
std::map<uint32_t, ReceiveStream*> receive_rtp_config_ std::map<uint32_t, ReceiveStreamInterface*> receive_rtp_config_
RTC_GUARDED_BY(&receive_11993_checker_); RTC_GUARDED_BY(&receive_11993_checker_);
// Audio and Video send streams are owned by the client that creates them. // Audio and Video send streams are owned by the client that creates them.
@ -1710,7 +1710,8 @@ bool Call::IdentifyReceivedPacket(RtpPacketReceived& packet,
return true; return true;
} }
bool Call::RegisterReceiveStream(uint32_t ssrc, ReceiveStream* stream) { bool Call::RegisterReceiveStream(uint32_t ssrc,
ReceiveStreamInterface* stream) {
RTC_DCHECK_RUN_ON(&receive_11993_checker_); RTC_DCHECK_RUN_ON(&receive_11993_checker_);
RTC_DCHECK(stream); RTC_DCHECK(stream);
auto inserted = receive_rtp_config_.emplace(ssrc, stream); auto inserted = receive_rtp_config_.emplace(ssrc, stream);

2
call/flexfec_receive_stream.h
View file

@ -25,7 +25,7 @@
namespace webrtc { namespace webrtc {
class FlexfecReceiveStream : public RtpPacketSinkInterface, class FlexfecReceiveStream : public RtpPacketSinkInterface,
public ReceiveStream { public ReceiveStreamInterface {
public: public:
~FlexfecReceiveStream() override = default; ~FlexfecReceiveStream() override = default;

2
call/flexfec_receive_stream_impl.h
View file

@ -58,7 +58,7 @@ class FlexfecReceiveStreamImpl : public FlexfecReceiveStream {
Stats GetStats() const override; Stats GetStats() const override;
// ReceiveStream impl. // ReceiveStreamInterface impl.
void SetRtpExtensions(std::vector<RtpExtension> extensions) override; void SetRtpExtensions(std::vector<RtpExtension> extensions) override;
RtpHeaderExtensionMap GetRtpExtensionMap() const override; RtpHeaderExtensionMap GetRtpExtensionMap() const override;

10
call/receive_stream.h
View file

@ -24,7 +24,7 @@ namespace webrtc {
// Common base interface for MediaReceiveStream based classes and // Common base interface for MediaReceiveStream based classes and
// FlexfecReceiveStream. // FlexfecReceiveStream.
class ReceiveStream { class ReceiveStreamInterface {
public: public:
// Receive-stream specific RTP settings. // Receive-stream specific RTP settings.
// TODO(tommi): This struct isn't needed at this level anymore. Move it closer // TODO(tommi): This struct isn't needed at this level anymore. Move it closer
@ -68,11 +68,11 @@ class ReceiveStream {
virtual bool transport_cc() const = 0; virtual bool transport_cc() const = 0;
protected: protected:
virtual ~ReceiveStream() {} virtual ~ReceiveStreamInterface() {}
}; };
// Either an audio or video receive stream. // Either an audio or video receive stream.
class MediaReceiveStream : public ReceiveStream { class MediaReceiveStream : public ReceiveStreamInterface {
public: public:
// Starts stream activity. // Starts stream activity.
// When a stream is active, it can receive, process and deliver packets. // When a stream is active, it can receive, process and deliver packets.
@ -94,6 +94,10 @@ class MediaReceiveStream : public ReceiveStream {
virtual std::vector<RtpSource> GetSources() const = 0; virtual std::vector<RtpSource> GetSources() const = 0;
}; };
// TODO(bugs.webrtc.org/7484): Remove this once downstream usage of the
// deprecated name is gone.
using ReceiveStream [[deprecated]] = ReceiveStreamInterface;
} // namespace webrtc } // namespace webrtc
#endif // CALL_RECEIVE_STREAM_H_ #endif // CALL_RECEIVE_STREAM_H_