This reverts commit efb94d57eb88638c323d93dddc281390dada5021. Reason for revert: Investigate and fix build errors. Original change's description: > Revert "Revert "Replace VideoDecoder with VideoDecoderFactory in VideoReceiveStream config."" > > This reverts commit 7961dc2dbdb3391a003d63630d5107e258ff3e78. > > Reason for revert: WebRTC does not build > > Original change's description: > > Revert "Replace VideoDecoder with VideoDecoderFactory in VideoReceiveStream config." > > > > This reverts commit 529d0d9795b81dbed5e4231f15d3752a5fc0df32. > > > > Reason for revert: Seems to break perf tests, likely some breakage in video_quality_tests decoder configuration. > > > > Original change's description: > > > Replace VideoDecoder with VideoDecoderFactory in VideoReceiveStream config. > > > > > > Preparation for deleting EnableFrameRecordning, and also a step > > > towards landing of the new VideoStreamDecoder. > > > > > > Bug: webrtc:9106 > > > Change-Id: I50964ee458b08a702ec69b82a62e4995c57cee82 > > > Reviewed-on: https://webrtc-review.googlesource.com/97660 > > > Commit-Queue: Niels Moller <nisse@webrtc.org> > > > Reviewed-by: Rasmus Brandt <brandtr@webrtc.org> > > > Reviewed-by: Anders Carlsson <andersc@webrtc.org> > > > Reviewed-by: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Erik Språng <sprang@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#24861} > > > > TBR=brandtr@webrtc.org,nisse@webrtc.org,andersc@webrtc.org,sprang@webrtc.org,philipel@webrtc.org,srte@webrtc.org > > > > Change-Id: Id34e4a3452a7dbc06167a4df5bb4c2825ebd7bd0 > > No-Presubmit: true > > No-Tree-Checks: true > > No-Try: true > > Bug: webrtc:9106 > > Reviewed-on: https://webrtc-review.googlesource.com/102421 > > Reviewed-by: Niels Moller <nisse@webrtc.org> > > Commit-Queue: Niels Moller <nisse@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#24866} > > TBR=brandtr@webrtc.org,nisse@webrtc.org,andersc@webrtc.org,sprang@webrtc.org,philipel@webrtc.org,srte@webrtc.org > > Change-Id: I23a439e1ceef79109b1f966b80b2663203968269 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:9106 > Reviewed-on: https://webrtc-review.googlesource.com/102422 > Reviewed-by: Oleh Prypin <oprypin@webrtc.org> > Commit-Queue: Oleh Prypin <oprypin@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#24867} TBR=brandtr@webrtc.org,oprypin@webrtc.org,nisse@webrtc.org,andersc@webrtc.org,sprang@webrtc.org,philipel@webrtc.org,srte@webrtc.org Change-Id: I9dafbc070e7f39dcb0ddbd61cb620164258fe894 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:9106 Reviewed-on: https://webrtc-review.googlesource.com/102460 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/master@{#24872}
118 lines
4.1 KiB
C++
118 lines
4.1 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.
|
|
*/
|
|
#ifndef TEST_SCENARIO_VIDEO_STREAM_H_
|
|
#define TEST_SCENARIO_VIDEO_STREAM_H_
|
|
#include <memory>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "rtc_base/constructormagic.h"
|
|
#include "test/frame_generator_capturer.h"
|
|
#include "test/scenario/call_client.h"
|
|
#include "test/scenario/column_printer.h"
|
|
#include "test/scenario/network_node.h"
|
|
#include "test/scenario/scenario_config.h"
|
|
#include "test/test_video_capturer.h"
|
|
|
|
namespace webrtc {
|
|
namespace test {
|
|
// SendVideoStream provides an interface for changing parameters and retrieving
|
|
// states at run time.
|
|
class SendVideoStream : public NetworkReceiverInterface {
|
|
public:
|
|
RTC_DISALLOW_COPY_AND_ASSIGN(SendVideoStream);
|
|
~SendVideoStream();
|
|
void SetCaptureFramerate(int framerate);
|
|
void SetMaxFramerate(absl::optional<int> max_framerate);
|
|
VideoSendStream::Stats GetStats() const;
|
|
ColumnPrinter StatsPrinter();
|
|
void Start();
|
|
|
|
private:
|
|
friend class Scenario;
|
|
friend class VideoStreamPair;
|
|
friend class ReceiveVideoStream;
|
|
// Handles RTCP feedback for this stream.
|
|
SendVideoStream(CallClient* sender,
|
|
VideoStreamConfig config,
|
|
Transport* send_transport);
|
|
bool TryDeliverPacket(rtc::CopyOnWriteBuffer packet,
|
|
uint64_t receiver,
|
|
Timestamp at_time) override;
|
|
|
|
std::vector<uint32_t> ssrcs_;
|
|
std::vector<uint32_t> rtx_ssrcs_;
|
|
VideoSendStream* send_stream_ = nullptr;
|
|
CallClient* const sender_;
|
|
const VideoStreamConfig config_;
|
|
std::unique_ptr<VideoEncoderFactory> encoder_factory_;
|
|
std::unique_ptr<TestVideoCapturer> video_capturer_;
|
|
FrameGeneratorCapturer* frame_generator_ = nullptr;
|
|
};
|
|
|
|
// ReceiveVideoStream represents a video receiver. It can't be used directly.
|
|
class ReceiveVideoStream : public NetworkReceiverInterface {
|
|
public:
|
|
RTC_DISALLOW_COPY_AND_ASSIGN(ReceiveVideoStream);
|
|
~ReceiveVideoStream();
|
|
|
|
private:
|
|
friend class Scenario;
|
|
friend class VideoStreamPair;
|
|
ReceiveVideoStream(CallClient* receiver,
|
|
VideoStreamConfig config,
|
|
SendVideoStream* send_stream,
|
|
size_t chosen_stream,
|
|
Transport* feedback_transport);
|
|
bool TryDeliverPacket(rtc::CopyOnWriteBuffer packet,
|
|
uint64_t receiver,
|
|
Timestamp at_time) override;
|
|
VideoReceiveStream* receive_stream_ = nullptr;
|
|
FlexfecReceiveStream* flecfec_stream_ = nullptr;
|
|
std::unique_ptr<rtc::VideoSinkInterface<webrtc::VideoFrame>> renderer_;
|
|
CallClient* const receiver_;
|
|
const VideoStreamConfig config_;
|
|
std::unique_ptr<VideoDecoder> decoder_;
|
|
};
|
|
|
|
// VideoStreamPair represents a video streaming session. It can be used to
|
|
// access underlying send and receive classes. It can also be used in calls to
|
|
// the Scenario class.
|
|
class VideoStreamPair {
|
|
public:
|
|
RTC_DISALLOW_COPY_AND_ASSIGN(VideoStreamPair);
|
|
~VideoStreamPair();
|
|
SendVideoStream* send() { return &send_stream_; }
|
|
ReceiveVideoStream* receive() { return &receive_stream_; }
|
|
|
|
private:
|
|
friend class Scenario;
|
|
VideoStreamPair(CallClient* sender,
|
|
std::vector<NetworkNode*> send_link,
|
|
uint64_t send_receiver_id,
|
|
CallClient* receiver,
|
|
std::vector<NetworkNode*> return_link,
|
|
uint64_t return_receiver_id,
|
|
VideoStreamConfig config);
|
|
|
|
const VideoStreamConfig config_;
|
|
std::vector<NetworkNode*> send_link_;
|
|
std::vector<NetworkNode*> return_link_;
|
|
NetworkNodeTransport send_transport_;
|
|
NetworkNodeTransport return_transport_;
|
|
|
|
SendVideoStream send_stream_;
|
|
ReceiveVideoStream receive_stream_;
|
|
};
|
|
} // namespace test
|
|
} // namespace webrtc
|
|
|
|
#endif // TEST_SCENARIO_VIDEO_STREAM_H_
|