6ae48c6609
Benefits of this is that the send config previously had unclear locking requirements, a lock was used to lock parts parts of it while reconfiguring the VideoEncoder. Primary work was splitting out video streams from config as well as encoder_settings as these change on ReconfigureVideoEncoder. Now threading requirements for both member configs are clear (as they are read-only), and encoder_settings doesn't stay in the config as a stale pointer. CreateVideoSendStream now takes video streams separately as well as the encoder_settings pointer, analogous to ReconfigureVideoEncoder. This change required changing so that pacing is silently enabled when using suspend_below_min_bitrate rather than silently setting it. R=henrik.lundin@webrtc.org, mflodman@webrtc.org, pthatcher@webrtc.org, stefan@webrtc.org BUG=3260 Review URL: https://webrtc-codereview.appspot.com/20409004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6349 4adac7df-926f-26a2-2b94-8c16560cd09d
95 lines
2.9 KiB
C++
95 lines
2.9 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 WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_
|
|
#define WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_
|
|
|
|
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
|
|
#include "webrtc/video/encoded_frame_callback_adapter.h"
|
|
#include "webrtc/video/send_statistics_proxy.h"
|
|
#include "webrtc/video/transport_adapter.h"
|
|
#include "webrtc/video_receive_stream.h"
|
|
#include "webrtc/video_send_stream.h"
|
|
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class CpuOveruseObserver;
|
|
class VideoEngine;
|
|
class ViEBase;
|
|
class ViECapture;
|
|
class ViECodec;
|
|
class ViEExternalCapture;
|
|
class ViEExternalCodec;
|
|
class ViEImageProcess;
|
|
class ViENetwork;
|
|
class ViERTP_RTCP;
|
|
|
|
namespace internal {
|
|
|
|
class VideoSendStream : public webrtc::VideoSendStream,
|
|
public VideoSendStreamInput,
|
|
public SendStatisticsProxy::StatsProvider {
|
|
public:
|
|
VideoSendStream(newapi::Transport* transport,
|
|
CpuOveruseObserver* overuse_observer,
|
|
webrtc::VideoEngine* video_engine,
|
|
const VideoSendStream::Config& config,
|
|
const std::vector<VideoStream> video_streams,
|
|
const void* encoder_settings,
|
|
int base_channel);
|
|
|
|
virtual ~VideoSendStream();
|
|
|
|
virtual void Start() OVERRIDE;
|
|
virtual void Stop() OVERRIDE;
|
|
|
|
virtual bool ReconfigureVideoEncoder(const std::vector<VideoStream>& streams,
|
|
const void* encoder_settings) OVERRIDE;
|
|
|
|
virtual Stats GetStats() const OVERRIDE;
|
|
|
|
bool DeliverRtcp(const uint8_t* packet, size_t length);
|
|
|
|
// From VideoSendStreamInput.
|
|
virtual void SwapFrame(I420VideoFrame* frame) OVERRIDE;
|
|
|
|
// From webrtc::VideoSendStream.
|
|
virtual VideoSendStreamInput* Input() OVERRIDE;
|
|
|
|
protected:
|
|
// From SendStatisticsProxy::StreamStatsProvider.
|
|
virtual bool GetSendSideDelay(VideoSendStream::Stats* stats) OVERRIDE;
|
|
virtual std::string GetCName() OVERRIDE;
|
|
|
|
private:
|
|
TransportAdapter transport_adapter_;
|
|
EncodedFrameCallbackAdapter encoded_frame_proxy_;
|
|
const VideoSendStream::Config config_;
|
|
|
|
ViEBase* video_engine_base_;
|
|
ViECapture* capture_;
|
|
ViECodec* codec_;
|
|
ViEExternalCapture* external_capture_;
|
|
ViEExternalCodec* external_codec_;
|
|
ViENetwork* network_;
|
|
ViERTP_RTCP* rtp_rtcp_;
|
|
ViEImageProcess* image_process_;
|
|
|
|
int channel_;
|
|
int capture_id_;
|
|
|
|
const scoped_ptr<SendStatisticsProxy> stats_proxy_;
|
|
};
|
|
} // namespace internal
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_
|