
This reverts commit 6c2c13af06b32778b86950681758a7970d1c5d9e. Reason for revert: Intend to investigate and fix perf problems. Original change's description: > Revert "Reland "Move rtp-specific config out of EncoderSettings."" > > This reverts commit 04dd1768625eb2241d1fb97fd0137897e703e266. > > Reason for revert: Regression in ramp up perf tests. > > Original change's description: > > Reland "Move rtp-specific config out of EncoderSettings." > > > > This is a reland of bc900cb1d1810fcf678fe41cf1e3966daa39c88c > > > > 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} > > > > Bug: webrtc:8830 > > Change-Id: If88ef7d57cdaa4fae3c7b2a97ea5a6e1b833e019 > > Reviewed-on: https://webrtc-review.googlesource.com/63721 > > Reviewed-by: Rasmus Brandt <brandtr@webrtc.org> > > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > > Commit-Queue: Niels Moller <nisse@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#22595} > > TBR=brandtr@webrtc.org,magjed@webrtc.org,nisse@webrtc.org,stefan@webrtc.org > > Bug: webrtc:8830,chromium:827080 > Change-Id: Iaaf146de91ec5c0d741b8efdf143f7e173084fef > Reviewed-on: https://webrtc-review.googlesource.com/65520 > Commit-Queue: Niels Moller <nisse@webrtc.org> > Reviewed-by: Niels Moller <nisse@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#22677} TBR=brandtr@webrtc.org,magjed@webrtc.org,nisse@webrtc.org,stefan@webrtc.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: webrtc:8830, chromium:827080 Change-Id: I9b62987bf5daced90dfeb3ebb6739c80117c487f Reviewed-on: https://webrtc-review.googlesource.com/66862 Commit-Queue: Niels Moller <nisse@webrtc.org> Reviewed-by: Niels Moller <nisse@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22751}
126 lines
4.7 KiB
C++
126 lines
4.7 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.
|
|
*/
|
|
#include "test/encoder_settings.h"
|
|
|
|
#include <algorithm>
|
|
#include <string>
|
|
|
|
#include "media/engine/internaldecoderfactory.h"
|
|
#include "modules/video_coding/codecs/h264/include/h264.h"
|
|
#include "modules/video_coding/codecs/multiplex/include/multiplex_decoder_adapter.h"
|
|
#include "modules/video_coding/codecs/vp8/include/vp8.h"
|
|
#include "modules/video_coding/codecs/vp9/include/vp9.h"
|
|
#include "rtc_base/refcountedobject.h"
|
|
#include "test/fake_decoder.h"
|
|
|
|
namespace webrtc {
|
|
namespace test {
|
|
|
|
const size_t DefaultVideoStreamFactory::kMaxNumberOfStreams;
|
|
const int DefaultVideoStreamFactory::kMaxBitratePerStream[] = {150000, 450000,
|
|
1500000};
|
|
const int DefaultVideoStreamFactory::kDefaultMinBitratePerStream[] = {
|
|
30000, 200000, 700000};
|
|
|
|
// static
|
|
std::vector<VideoStream> CreateVideoStreams(
|
|
int width,
|
|
int height,
|
|
const webrtc::VideoEncoderConfig& encoder_config) {
|
|
RTC_DCHECK(encoder_config.number_of_streams <=
|
|
DefaultVideoStreamFactory::kMaxNumberOfStreams);
|
|
|
|
std::vector<VideoStream> stream_settings(encoder_config.number_of_streams);
|
|
int bitrate_left_bps = encoder_config.max_bitrate_bps;
|
|
|
|
for (size_t i = 0; i < encoder_config.number_of_streams; ++i) {
|
|
stream_settings[i].width =
|
|
(i + 1) * width / encoder_config.number_of_streams;
|
|
stream_settings[i].height =
|
|
(i + 1) * height / encoder_config.number_of_streams;
|
|
stream_settings[i].max_framerate = 30;
|
|
stream_settings[i].min_bitrate_bps =
|
|
DefaultVideoStreamFactory::kDefaultMinBitratePerStream[i];
|
|
stream_settings[i].target_bitrate_bps = stream_settings[i].max_bitrate_bps =
|
|
std::min(bitrate_left_bps,
|
|
DefaultVideoStreamFactory::kMaxBitratePerStream[i]);
|
|
stream_settings[i].max_qp = 56;
|
|
if (i < encoder_config.simulcast_layers.size()) {
|
|
// Higher level controls are setting the active configuration for the
|
|
// VideoStream.
|
|
stream_settings[i].active = encoder_config.simulcast_layers[i].active;
|
|
} else {
|
|
stream_settings[i].active = true;
|
|
}
|
|
bitrate_left_bps -= stream_settings[i].target_bitrate_bps;
|
|
}
|
|
|
|
stream_settings[encoder_config.number_of_streams - 1].max_bitrate_bps +=
|
|
bitrate_left_bps;
|
|
stream_settings[0].bitrate_priority = encoder_config.bitrate_priority;
|
|
|
|
return stream_settings;
|
|
}
|
|
|
|
DefaultVideoStreamFactory::DefaultVideoStreamFactory() {}
|
|
|
|
std::vector<VideoStream> DefaultVideoStreamFactory::CreateEncoderStreams(
|
|
int width,
|
|
int height,
|
|
const webrtc::VideoEncoderConfig& encoder_config) {
|
|
return CreateVideoStreams(width, height, encoder_config);
|
|
}
|
|
|
|
void FillEncoderConfiguration(VideoCodecType codec_type,
|
|
size_t num_streams,
|
|
VideoEncoderConfig* configuration) {
|
|
RTC_DCHECK_LE(num_streams, DefaultVideoStreamFactory::kMaxNumberOfStreams);
|
|
|
|
configuration->codec_type = codec_type;
|
|
configuration->number_of_streams = num_streams;
|
|
configuration->video_stream_factory =
|
|
new rtc::RefCountedObject<DefaultVideoStreamFactory>();
|
|
configuration->max_bitrate_bps = 0;
|
|
configuration->simulcast_layers = std::vector<VideoStream>(num_streams);
|
|
for (size_t i = 0; i < num_streams; ++i) {
|
|
configuration->max_bitrate_bps +=
|
|
DefaultVideoStreamFactory::kMaxBitratePerStream[i];
|
|
}
|
|
}
|
|
|
|
VideoReceiveStream::Decoder CreateMatchingDecoder(
|
|
int payload_type, const std::string& payload_name) {
|
|
VideoReceiveStream::Decoder decoder;
|
|
decoder.payload_type = payload_type;
|
|
decoder.payload_name = payload_name;
|
|
if (payload_name == "H264") {
|
|
decoder.decoder = H264Decoder::Create().release();
|
|
} else if (payload_name == "VP8") {
|
|
decoder.decoder = VP8Decoder::Create().release();
|
|
} else if (payload_name == "VP9") {
|
|
decoder.decoder = VP9Decoder::Create().release();
|
|
} else if (payload_name == "multiplex") {
|
|
decoder.decoder = new MultiplexDecoderAdapter(
|
|
new InternalDecoderFactory(), SdpVideoFormat(cricket::kVp9CodecName));
|
|
} else {
|
|
decoder.decoder = new FakeDecoder();
|
|
}
|
|
return decoder;
|
|
}
|
|
|
|
VideoReceiveStream::Decoder CreateMatchingDecoder(
|
|
const VideoSendStream::Config& config) {
|
|
return CreateMatchingDecoder(config.rtp.payload_type,
|
|
config.rtp.payload_name);
|
|
}
|
|
|
|
} // namespace test
|
|
} // namespace webrtc
|