Index: webrtc/test/encoder_settings.h |
diff --git a/webrtc/test/encoder_settings.h b/webrtc/test/encoder_settings.h |
index 82d8c5f3ddc109fb5e3ddc447e6fe820a5f12843..a44d3661e10c9bed571b3d0a2fd2335fac6f3c86 100644 |
--- a/webrtc/test/encoder_settings.h |
+++ b/webrtc/test/encoder_settings.h |
@@ -10,43 +10,12 @@ |
#ifndef WEBRTC_TEST_ENCODER_SETTINGS_H_ |
#define WEBRTC_TEST_ENCODER_SETTINGS_H_ |
-#include <vector> |
- |
#include "webrtc/video_receive_stream.h" |
#include "webrtc/video_send_stream.h" |
namespace webrtc { |
namespace test { |
- |
-class DefaultVideoStreamFactory |
- : public VideoEncoderConfig::VideoStreamFactoryInterface { |
- public: |
- DefaultVideoStreamFactory(); |
- |
- static const size_t kMaxNumberOfStreams = 3; |
- // Defined as {150000, 450000, 1500000}; |
- static const int kMaxBitratePerStream[]; |
- // Defined as {50000, 200000, 700000}; |
- static const int kDefaultMinBitratePerStream[]; |
- |
- private: |
- std::vector<VideoStream> CreateEncoderStreams( |
- int width, |
- int height, |
- const VideoEncoderConfig& encoder_config) override; |
-}; |
- |
-// Creates |encoder_config.number_of_streams| VideoStreams where index |
-// |encoder_config.number_of_streams -1| have width = |width|, height = |
-// |height|. The total max bitrate of all VideoStreams is |
-// |encoder_config.max_bitrate_bps|. |
-std::vector<VideoStream> CreateVideoStreams( |
- int width, |
- int height, |
- const webrtc::VideoEncoderConfig& encoder_config); |
- |
-void FillEncoderConfiguration(size_t num_streams, |
- VideoEncoderConfig* configuration); |
+std::vector<VideoStream> CreateVideoStreams(size_t num_streams); |
VideoReceiveStream::Decoder CreateMatchingDecoder( |
const VideoSendStream::Config::EncoderSettings& encoder_settings); |