Index: webrtc/video_send_stream.h |
diff --git a/webrtc/video_send_stream.h b/webrtc/video_send_stream.h |
index 886367f0a50fb3d94b269a4208a1ed27be4d0828..6dbbd1dbf29a506c8433d8548954ee973fb068e1 100644 |
--- a/webrtc/video_send_stream.h |
+++ b/webrtc/video_send_stream.h |
@@ -13,13 +13,13 @@ |
#include <map> |
#include <string> |
+#include <vector> |
#include "webrtc/common_types.h" |
#include "webrtc/common_video/include/frame_callback.h" |
#include "webrtc/config.h" |
#include "webrtc/media/base/videosinkinterface.h" |
#include "webrtc/transport.h" |
-#include "webrtc/media/base/videosinkinterface.h" |
namespace webrtc { |
@@ -68,17 +68,30 @@ class VideoSendStream { |
}; |
struct Config { |
+ private: |
+ // Access to the copy constructor is private to force use of the Copy() |
+ // method for those exceptional cases where we do use it. |
+ Config(const Config&) = default; |
stefan-webrtc
2016/07/08 15:56:43
Perhaps put this last?
perkj_webrtc
2016/07/11 11:41:08
This currently match with what has been done for V
|
+ |
+ public: |
Config() = delete; |
+ Config(Config&&) = default; |
explicit Config(Transport* send_transport) |
: send_transport(send_transport) {} |
+ Config& operator=(Config&&) = default; |
+ Config& operator=(const Config&) = delete; |
+ |
+ // Mostly used by tests. Avoid creating copies if you can. |
+ Config Copy() const { return Config(*this); } |
+ |
std::string ToString() const; |
struct EncoderSettings { |
std::string ToString() const; |
std::string payload_name; |
- int payload_type = -1; |
+ int payload_type = 0; |
stefan-webrtc
2016/07/08 15:56:43
Why was this changed?
perkj_webrtc
2016/07/11 11:41:08
good question...
VieKeyRequestTest.CreateAndTrigg
|
// TODO(sophiechang): Delete this field when no one is using internal |
// sources anymore. |
@@ -147,10 +160,6 @@ class VideoSendStream { |
// than the measuring window, since the sample data will have been dropped. |
EncodedFrameObserver* post_encode_callback = nullptr; |
- // Renderer for local preview. The local renderer will be called even if |
- // sending hasn't started. 'nullptr' disables local rendering. |
- rtc::VideoSinkInterface<VideoFrame>* local_renderer = nullptr; |
stefan-webrtc
2016/07/08 15:56:43
Wouldn't it make sense to do this separately?
perkj_webrtc
2016/07/11 11:41:08
This is part of moving the input directly to ViEEn
|
- |
// Expected delay needed by the renderer, i.e. the frame will be delivered |
// this many milliseconds, if possible, earlier than expected render time. |
// Only valid if |local_renderer| is set. |
@@ -180,7 +189,7 @@ class VideoSendStream { |
// Set which streams to send. Must have at least as many SSRCs as configured |
// in the config. Encoder settings are passed on to the encoder instance along |
// with the VideoStream settings. |
- virtual void ReconfigureVideoEncoder(const VideoEncoderConfig& config) = 0; |
+ virtual void ReconfigureVideoEncoder(VideoEncoderConfig config) = 0; |
virtual Stats GetStats() = 0; |