92be1caf4f
This reverts commit bc900cb1d1810fcf678fe41cf1e3966daa39c88c. Reason for revert: Broke downstream projects. Original change's description: > Move rtp-specific config out of EncoderSettings. > > In VideoSendStream::Config, move payload_name and payload_type from > EncoderSettings to Rtp. > > EncoderSettings now contains configuration for VideoStreamEncoder only, > and should perhaps be renamed in a follow up cl. It's no longer > passed as an argument to VideoCodecInitializer::SetupCodec. > > The latter then needs a different way to know the codec type, > which is provided by a new codec_type member in VideoEncoderConfig. > > Bug: webrtc:8830 > Change-Id: Ifcc691aef1ee6a95e43c0452c5e630d92a511cd6 > Reviewed-on: https://webrtc-review.googlesource.com/62062 > Commit-Queue: Niels Moller <nisse@webrtc.org> > Reviewed-by: Magnus Jedvert <magjed@webrtc.org> > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > Reviewed-by: Rasmus Brandt <brandtr@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22532} TBR=brandtr@webrtc.org,magjed@webrtc.org,nisse@webrtc.org,stefan@webrtc.org Change-Id: I01f06c1fcf21eb2cd40dca7d4f268614200ee490 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8830 Reviewed-on: https://webrtc-review.googlesource.com/63720 Reviewed-by: Niels Moller <nisse@webrtc.org> Commit-Queue: Niels Moller <nisse@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22537}
57 lines
1.8 KiB
C++
57 lines
1.8 KiB
C++
/*
|
|
* Copyright (c) 2014 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_ENCODER_SETTINGS_H_
|
|
#define TEST_ENCODER_SETTINGS_H_
|
|
|
|
#include <vector>
|
|
|
|
#include "call/video_receive_stream.h"
|
|
#include "call/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);
|
|
|
|
VideoReceiveStream::Decoder CreateMatchingDecoder(
|
|
const VideoSendStream::Config::EncoderSettings& encoder_settings);
|
|
} // namespace test
|
|
} // namespace webrtc
|
|
|
|
#endif // TEST_ENCODER_SETTINGS_H_
|