cb96062e05
This reverts commit 504edc09136c9b37cae3c3d42a12c711e427b08c. Reason for revert: reland after speculative revert Original change's description: > Revert "Remove obsolete field trial from the tests" > > This reverts commit fd5770df4e265cae3650d9dc885900ff0200f28d. > > Reason for revert: Speculative revert > > Original change's description: > > Remove obsolete field trial from the tests > > > > Bug: webrtc:8968 > > Change-Id: I78f5cca98a469dcfbbecba7a16d31e5aac500fc9 > > Reviewed-on: https://webrtc-review.googlesource.com/97332 > > Reviewed-by: Erik Språng <sprang@webrtc.org> > > Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#24534} > > TBR=ilnik@webrtc.org,sprang@webrtc.org > > Change-Id: I8b806c04174ffc70b66beca664f239dbf5f0363a > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:8968 > Reviewed-on: https://webrtc-review.googlesource.com/97601 > Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> > Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#24544} TBR=ilnik@webrtc.org,sprang@webrtc.org Change-Id: I2f6f96a204e5088c05b390d019ba6aa73b7db175 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8968 Reviewed-on: https://webrtc-review.googlesource.com/97602 Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org> Cr-Commit-Position: refs/heads/master@{#24545}
93 lines
3.0 KiB
C++
93 lines
3.0 KiB
C++
/*
|
|
* Copyright 2018 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "logging/rtc_event_log/rtc_event_log.h"
|
|
#include "modules/video_coding/codecs/vp8/include/vp8.h"
|
|
#include "test/call_test.h"
|
|
#include "test/encoder_settings.h"
|
|
#include "test/field_trial.h"
|
|
#include "test/gtest.h"
|
|
#include "video/end_to_end_tests/multi_stream_tester.h"
|
|
|
|
namespace webrtc {
|
|
class MultiStreamEndToEndTest : public test::CallTest {
|
|
public:
|
|
MultiStreamEndToEndTest() = default;
|
|
};
|
|
|
|
// Each renderer verifies that it receives the expected resolution, and as soon
|
|
// as every renderer has received a frame, the test finishes.
|
|
TEST_F(MultiStreamEndToEndTest, SendsAndReceivesMultipleStreams) {
|
|
class VideoOutputObserver : public rtc::VideoSinkInterface<VideoFrame> {
|
|
public:
|
|
VideoOutputObserver(const MultiStreamTester::CodecSettings& settings,
|
|
uint32_t ssrc,
|
|
test::FrameGeneratorCapturer** frame_generator)
|
|
: settings_(settings),
|
|
ssrc_(ssrc),
|
|
frame_generator_(frame_generator),
|
|
done_(false, false) {}
|
|
|
|
void OnFrame(const VideoFrame& video_frame) override {
|
|
EXPECT_EQ(settings_.width, video_frame.width());
|
|
EXPECT_EQ(settings_.height, video_frame.height());
|
|
(*frame_generator_)->Stop();
|
|
done_.Set();
|
|
}
|
|
|
|
uint32_t Ssrc() { return ssrc_; }
|
|
|
|
bool Wait() { return done_.Wait(kDefaultTimeoutMs); }
|
|
|
|
private:
|
|
const MultiStreamTester::CodecSettings& settings_;
|
|
const uint32_t ssrc_;
|
|
test::FrameGeneratorCapturer** const frame_generator_;
|
|
rtc::Event done_;
|
|
};
|
|
|
|
class Tester : public MultiStreamTester {
|
|
public:
|
|
explicit Tester(test::SingleThreadedTaskQueueForTesting* task_queue)
|
|
: MultiStreamTester(task_queue) {}
|
|
virtual ~Tester() {}
|
|
|
|
protected:
|
|
void Wait() override {
|
|
for (const auto& observer : observers_) {
|
|
EXPECT_TRUE(observer->Wait())
|
|
<< "Time out waiting for from on ssrc " << observer->Ssrc();
|
|
}
|
|
}
|
|
|
|
void UpdateSendConfig(
|
|
size_t stream_index,
|
|
VideoSendStream::Config* send_config,
|
|
VideoEncoderConfig* encoder_config,
|
|
test::FrameGeneratorCapturer** frame_generator) override {
|
|
observers_[stream_index].reset(new VideoOutputObserver(
|
|
codec_settings[stream_index], send_config->rtp.ssrcs.front(),
|
|
frame_generator));
|
|
}
|
|
|
|
void UpdateReceiveConfig(
|
|
size_t stream_index,
|
|
VideoReceiveStream::Config* receive_config) override {
|
|
receive_config->renderer = observers_[stream_index].get();
|
|
}
|
|
|
|
private:
|
|
std::unique_ptr<VideoOutputObserver> observers_[kNumStreams];
|
|
} tester(&task_queue_);
|
|
|
|
tester.RunTest();
|
|
}
|
|
} // namespace webrtc
|