f4a9991cce
This CL adds AddAdaptationResource to Call and AddAdaptationResource/GetAdaptationResources method to relevant VideoSendStream and VideoStreamEncoder interfaces and implementations. Unittests are added to ensure that resources can be added to the Call both before and after the creation of a VideoSendStream and that the resources always gets added to the streams. In a follow-up CL, we will continue to plumb the resources all the way to PeerConnectionInterface, and an integration test will then be added to ensure that injected resources are capable of triggering adaptation. Bug: webrtc:11525 Change-Id: I499e9c23c3e359df943414d420b2e0ce2e9b2d56 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/177002 Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> Reviewed-by: Evan Shrubsole <eshr@google.com> Reviewed-by: Stefan Holmer <stefan@webrtc.org> Commit-Queue: Henrik Boström <hbos@webrtc.org> Cr-Commit-Position: refs/heads/master@{#31499}
116 lines
3.6 KiB
C++
116 lines
3.6 KiB
C++
/*
|
|
* Copyright (c) 2013 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 VIDEO_VIDEO_SEND_STREAM_H_
|
|
#define VIDEO_VIDEO_SEND_STREAM_H_
|
|
|
|
#include <map>
|
|
#include <memory>
|
|
#include <vector>
|
|
|
|
#include "api/fec_controller.h"
|
|
#include "api/video/video_stream_encoder_interface.h"
|
|
#include "call/bitrate_allocator.h"
|
|
#include "call/video_receive_stream.h"
|
|
#include "call/video_send_stream.h"
|
|
#include "rtc_base/critical_section.h"
|
|
#include "rtc_base/event.h"
|
|
#include "rtc_base/task_queue.h"
|
|
#include "rtc_base/thread_checker.h"
|
|
#include "video/send_delay_stats.h"
|
|
#include "video/send_statistics_proxy.h"
|
|
|
|
namespace webrtc {
|
|
namespace test {
|
|
class VideoSendStreamPeer;
|
|
} // namespace test
|
|
|
|
class CallStats;
|
|
class IvfFileWriter;
|
|
class ProcessThread;
|
|
class RateLimiter;
|
|
class RtpRtcp;
|
|
class RtpTransportControllerSendInterface;
|
|
class RtcEventLog;
|
|
|
|
namespace internal {
|
|
|
|
class VideoSendStreamImpl;
|
|
|
|
// VideoSendStream implements webrtc::VideoSendStream.
|
|
// Internally, it delegates all public methods to VideoSendStreamImpl and / or
|
|
// VideoStreamEncoder. VideoSendStreamInternal is created and deleted on
|
|
// |worker_queue|.
|
|
class VideoSendStream : public webrtc::VideoSendStream {
|
|
public:
|
|
using RtpStateMap = std::map<uint32_t, RtpState>;
|
|
using RtpPayloadStateMap = std::map<uint32_t, RtpPayloadState>;
|
|
|
|
VideoSendStream(
|
|
Clock* clock,
|
|
int num_cpu_cores,
|
|
ProcessThread* module_process_thread,
|
|
TaskQueueFactory* task_queue_factory,
|
|
RtcpRttStats* call_stats,
|
|
RtpTransportControllerSendInterface* transport,
|
|
BitrateAllocatorInterface* bitrate_allocator,
|
|
SendDelayStats* send_delay_stats,
|
|
RtcEventLog* event_log,
|
|
VideoSendStream::Config config,
|
|
VideoEncoderConfig encoder_config,
|
|
const std::map<uint32_t, RtpState>& suspended_ssrcs,
|
|
const std::map<uint32_t, RtpPayloadState>& suspended_payload_states,
|
|
std::unique_ptr<FecController> fec_controller);
|
|
|
|
~VideoSendStream() override;
|
|
|
|
void DeliverRtcp(const uint8_t* packet, size_t length);
|
|
|
|
// webrtc::VideoSendStream implementation.
|
|
void UpdateActiveSimulcastLayers(
|
|
const std::vector<bool> active_layers) override;
|
|
void Start() override;
|
|
void Stop() override;
|
|
|
|
void AddAdaptationResource(rtc::scoped_refptr<Resource> resource) override;
|
|
std::vector<rtc::scoped_refptr<Resource>> GetAdaptationResources() override;
|
|
|
|
void SetSource(rtc::VideoSourceInterface<webrtc::VideoFrame>* source,
|
|
const DegradationPreference& degradation_preference) override;
|
|
|
|
void ReconfigureVideoEncoder(VideoEncoderConfig) override;
|
|
Stats GetStats() override;
|
|
|
|
void StopPermanentlyAndGetRtpStates(RtpStateMap* rtp_state_map,
|
|
RtpPayloadStateMap* payload_state_map);
|
|
|
|
private:
|
|
friend class test::VideoSendStreamPeer;
|
|
|
|
class ConstructionTask;
|
|
|
|
absl::optional<float> GetPacingFactorOverride() const;
|
|
|
|
rtc::ThreadChecker thread_checker_;
|
|
rtc::TaskQueue* const worker_queue_;
|
|
rtc::Event thread_sync_event_;
|
|
|
|
SendStatisticsProxy stats_proxy_;
|
|
const VideoSendStream::Config config_;
|
|
const VideoEncoderConfig::ContentType content_type_;
|
|
std::unique_ptr<VideoSendStreamImpl> send_stream_;
|
|
std::unique_ptr<VideoStreamEncoderInterface> video_stream_encoder_;
|
|
};
|
|
|
|
} // namespace internal
|
|
} // namespace webrtc
|
|
|
|
#endif // VIDEO_VIDEO_SEND_STREAM_H_
|