Rename VideoReceiveStream to VideoReceiveStreamInterface
Bug: webrtc:7484
Change-Id: I653cfe46486e0396897dd333069a894d67e3c07b
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/262769
Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#36958}
diff --git a/test/scenario/stats_collection.cc b/test/scenario/stats_collection.cc
index 0e9d1f8..c684998 100644
--- a/test/scenario/stats_collection.cc
+++ b/test/scenario/stats_collection.cc
@@ -174,7 +174,8 @@
last_update_ = at_time;
}
-void VideoReceiveStatsCollector::AddStats(VideoReceiveStream::Stats sample) {
+void VideoReceiveStatsCollector::AddStats(
+ VideoReceiveStreamInterface::Stats sample) {
if (sample.decode_ms > 0)
stats_.decode_time.AddSampleMs(sample.decode_ms);
if (sample.max_decode_ms > 0)
diff --git a/test/scenario/stats_collection.h b/test/scenario/stats_collection.h
index 908385e..0d2f487 100644
--- a/test/scenario/stats_collection.h
+++ b/test/scenario/stats_collection.h
@@ -90,7 +90,7 @@
};
class VideoReceiveStatsCollector {
public:
- void AddStats(VideoReceiveStream::Stats sample);
+ void AddStats(VideoReceiveStreamInterface::Stats sample);
CollectedVideoReceiveStats& stats() { return stats_; }
private:
diff --git a/test/scenario/stats_collection_unittest.cc b/test/scenario/stats_collection_unittest.cc
index 96b2830..35f0ced 100644
--- a/test/scenario/stats_collection_unittest.cc
+++ b/test/scenario/stats_collection_unittest.cc
@@ -45,7 +45,7 @@
// Querying the video stats from within the expected runtime environment
// (i.e. the TQ that belongs to the CallClient, not the Scenario TQ that
// we're currently on).
- VideoReceiveStream::Stats video_receive_stats;
+ VideoReceiveStreamInterface::Stats video_receive_stats;
auto* video_stream = video->receive();
callee->SendTask([&video_stream, &video_receive_stats]() {
video_receive_stats = video_stream->GetStats();
diff --git a/test/scenario/video_stream.cc b/test/scenario/video_stream.cc
index 305c69d..3fcef57 100644
--- a/test/scenario/video_stream.cc
+++ b/test/scenario/video_stream.cc
@@ -317,16 +317,16 @@
}
}
-VideoReceiveStream::Config CreateVideoReceiveStreamConfig(
+VideoReceiveStreamInterface::Config CreateVideoReceiveStreamConfig(
VideoStreamConfig config,
Transport* feedback_transport,
VideoDecoderFactory* decoder_factory,
- VideoReceiveStream::Decoder decoder,
+ VideoReceiveStreamInterface::Decoder decoder,
rtc::VideoSinkInterface<VideoFrame>* renderer,
uint32_t local_ssrc,
uint32_t ssrc,
uint32_t rtx_ssrc) {
- VideoReceiveStream::Config recv(feedback_transport);
+ VideoReceiveStreamInterface::Config recv(feedback_transport);
recv.rtp.transport_cc = config.stream.packet_feedback;
recv.rtp.local_ssrc = local_ssrc;
recv.rtp.extensions = GetVideoRtpExtensions(config);
@@ -546,7 +546,7 @@
decoder_factory_ = std::make_unique<InternalDecoderFactory>();
}
- VideoReceiveStream::Decoder decoder =
+ VideoReceiveStreamInterface::Decoder decoder =
CreateMatchingDecoder(CodecTypeToPayloadType(config.encoder.codec),
CodecTypeToPayloadString(config.encoder.codec));
size_t num_streams = 1;
@@ -611,9 +611,9 @@
});
}
-VideoReceiveStream::Stats ReceiveVideoStream::GetStats() const {
+VideoReceiveStreamInterface::Stats ReceiveVideoStream::GetStats() const {
if (receive_streams_.empty())
- return VideoReceiveStream::Stats();
+ return VideoReceiveStreamInterface::Stats();
// TODO(srte): Handle multiple receive streams.
return receive_streams_.back()->GetStats();
}
diff --git a/test/scenario/video_stream.h b/test/scenario/video_stream.h
index 1451f59..fc4a562 100644
--- a/test/scenario/video_stream.h
+++ b/test/scenario/video_stream.h
@@ -81,7 +81,7 @@
void Start();
void Stop();
- VideoReceiveStream::Stats GetStats() const;
+ VideoReceiveStreamInterface::Stats GetStats() const;
private:
friend class Scenario;
@@ -93,7 +93,7 @@
Transport* feedback_transport,
VideoFrameMatcher* matcher);
- std::vector<VideoReceiveStream*> receive_streams_;
+ std::vector<VideoReceiveStreamInterface*> receive_streams_;
FlexfecReceiveStream* flecfec_stream_ = nullptr;
FakeVideoRenderer fake_renderer_;
std::vector<std::unique_ptr<rtc::VideoSinkInterface<VideoFrame>>>
