mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-16 15:20:42 +01:00

This reverts commit7961dc2dbd
. Reason for revert: WebRTC does not build Original change's description: > Revert "Replace VideoDecoder with VideoDecoderFactory in VideoReceiveStream config." > > This reverts commit529d0d9795
. > > Reason for revert: Seems to break perf tests, likely some breakage in video_quality_tests decoder configuration. > > Original change's description: > > Replace VideoDecoder with VideoDecoderFactory in VideoReceiveStream config. > > > > Preparation for deleting EnableFrameRecordning, and also a step > > towards landing of the new VideoStreamDecoder. > > > > Bug: webrtc:9106 > > Change-Id: I50964ee458b08a702ec69b82a62e4995c57cee82 > > Reviewed-on: https://webrtc-review.googlesource.com/97660 > > Commit-Queue: Niels Moller <nisse@webrtc.org> > > Reviewed-by: Rasmus Brandt <brandtr@webrtc.org> > > Reviewed-by: Anders Carlsson <andersc@webrtc.org> > > Reviewed-by: Sebastian Jansson <srte@webrtc.org> > > Reviewed-by: Erik Språng <sprang@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#24861} > > TBR=brandtr@webrtc.org,nisse@webrtc.org,andersc@webrtc.org,sprang@webrtc.org,philipel@webrtc.org,srte@webrtc.org > > Change-Id: Id34e4a3452a7dbc06167a4df5bb4c2825ebd7bd0 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:9106 > Reviewed-on: https://webrtc-review.googlesource.com/102421 > Reviewed-by: Niels Moller <nisse@webrtc.org> > Commit-Queue: Niels Moller <nisse@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#24866} TBR=brandtr@webrtc.org,nisse@webrtc.org,andersc@webrtc.org,sprang@webrtc.org,philipel@webrtc.org,srte@webrtc.org Change-Id: I23a439e1ceef79109b1f966b80b2663203968269 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:9106 Reviewed-on: https://webrtc-review.googlesource.com/102422 Reviewed-by: Oleh Prypin <oprypin@webrtc.org> Commit-Queue: Oleh Prypin <oprypin@webrtc.org> Cr-Commit-Position: refs/heads/master@{#24867}
135 lines
4.8 KiB
C++
135 lines
4.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.
|
|
*/
|
|
#include "test/encoder_settings.h"
|
|
|
|
#include <algorithm>
|
|
#include <string>
|
|
|
|
#include "rtc_base/refcountedobject.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];
|
|
|
|
int target_bitrate_bps = -1;
|
|
int max_bitrate_bps = -1;
|
|
// Use configured values instead of default values if values has been
|
|
// configured.
|
|
if (i < encoder_config.simulcast_layers.size()) {
|
|
const VideoStream& stream = encoder_config.simulcast_layers[i];
|
|
|
|
max_bitrate_bps =
|
|
stream.max_bitrate_bps > 0
|
|
? stream.max_bitrate_bps
|
|
: DefaultVideoStreamFactory::kMaxBitratePerStream[i];
|
|
max_bitrate_bps = std::min(bitrate_left_bps, max_bitrate_bps);
|
|
|
|
target_bitrate_bps =
|
|
stream.target_bitrate_bps > 0
|
|
? stream.target_bitrate_bps
|
|
: DefaultVideoStreamFactory::kMaxBitratePerStream[i];
|
|
target_bitrate_bps = std::min(max_bitrate_bps, target_bitrate_bps);
|
|
} else {
|
|
max_bitrate_bps = std::min(
|
|
bitrate_left_bps, DefaultVideoStreamFactory::kMaxBitratePerStream[i]);
|
|
target_bitrate_bps = max_bitrate_bps;
|
|
}
|
|
|
|
RTC_DCHECK_NE(target_bitrate_bps, -1);
|
|
RTC_DCHECK_NE(max_bitrate_bps, -1);
|
|
stream_settings[i].target_bitrate_bps = target_bitrate_bps;
|
|
stream_settings[i].max_bitrate_bps = max_bitrate_bps;
|
|
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.video_format = SdpVideoFormat(payload_name);
|
|
return decoder;
|
|
}
|
|
|
|
VideoReceiveStream::Decoder CreateMatchingDecoder(
|
|
const VideoSendStream::Config& config) {
|
|
return CreateMatchingDecoder(config.rtp.payload_type,
|
|
config.rtp.payload_name);
|
|
}
|
|
|
|
} // namespace test
|
|
} // namespace webrtc
|