2014-03-19 08:43:57 +00:00
|
|
|
/*
|
|
|
|
|
* 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.
|
|
|
|
|
*/
|
2017-09-15 06:47:31 +02:00
|
|
|
#include "test/encoder_settings.h"
|
2014-03-19 08:43:57 +00:00
|
|
|
|
2016-10-02 23:45:26 -07:00
|
|
|
#include <algorithm>
|
2014-03-19 08:43:57 +00:00
|
|
|
|
2019-01-25 20:26:48 +01:00
|
|
|
#include "api/scoped_refptr.h"
|
2018-11-28 16:47:49 +01:00
|
|
|
#include "api/video_codecs/sdp_video_format.h"
|
|
|
|
|
#include "call/rtp_config.h"
|
|
|
|
|
#include "rtc_base/checks.h"
|
2019-01-11 09:11:00 -08:00
|
|
|
#include "rtc_base/ref_counted_object.h"
|
2014-03-19 08:43:57 +00:00
|
|
|
|
|
|
|
|
namespace webrtc {
|
|
|
|
|
namespace test {
|
|
|
|
|
|
2016-10-02 23:45:26 -07:00
|
|
|
const size_t DefaultVideoStreamFactory::kMaxNumberOfStreams;
|
|
|
|
|
const int DefaultVideoStreamFactory::kMaxBitratePerStream[] = {150000, 450000,
|
|
|
|
|
1500000};
|
|
|
|
|
const int DefaultVideoStreamFactory::kDefaultMinBitratePerStream[] = {
|
2017-02-21 07:28:31 -08:00
|
|
|
30000, 200000, 700000};
|
2014-03-19 08:43:57 +00:00
|
|
|
|
2016-10-02 23:45:26 -07:00
|
|
|
// static
|
|
|
|
|
std::vector<VideoStream> CreateVideoStreams(
|
|
|
|
|
int width,
|
|
|
|
|
int height,
|
|
|
|
|
const webrtc::VideoEncoderConfig& encoder_config) {
|
|
|
|
|
RTC_DCHECK(encoder_config.number_of_streams <=
|
|
|
|
|
DefaultVideoStreamFactory::kMaxNumberOfStreams);
|
2014-03-19 08:43:57 +00:00
|
|
|
|
2016-10-02 23:45:26 -07:00
|
|
|
std::vector<VideoStream> stream_settings(encoder_config.number_of_streams);
|
2019-07-08 17:56:40 +02:00
|
|
|
|
|
|
|
|
int bitrate_left_bps = 0;
|
|
|
|
|
if (encoder_config.max_bitrate_bps > 0) {
|
|
|
|
|
bitrate_left_bps = encoder_config.max_bitrate_bps;
|
|
|
|
|
} else {
|
|
|
|
|
for (size_t stream_num = 0; stream_num < encoder_config.number_of_streams;
|
|
|
|
|
++stream_num) {
|
|
|
|
|
bitrate_left_bps +=
|
|
|
|
|
DefaultVideoStreamFactory::kMaxBitratePerStream[stream_num];
|
|
|
|
|
}
|
|
|
|
|
}
|
2014-03-19 08:43:57 +00:00
|
|
|
|
2016-10-02 23:45:26 -07:00
|
|
|
for (size_t i = 0; i < encoder_config.number_of_streams; ++i) {
|
2018-06-08 11:04:04 +00:00
|
|
|
stream_settings[i].width =
|
|
|
|
|
(i + 1) * width / encoder_config.number_of_streams;
|
|
|
|
|
stream_settings[i].height =
|
|
|
|
|
(i + 1) * height / encoder_config.number_of_streams;
|
2016-10-02 23:45:26 -07:00
|
|
|
stream_settings[i].max_framerate = 30;
|
2020-10-17 12:57:58 +02:00
|
|
|
stream_settings[i].max_qp = 56;
|
2016-10-02 23:45:26 -07:00
|
|
|
stream_settings[i].min_bitrate_bps =
|
|
|
|
|
DefaultVideoStreamFactory::kDefaultMinBitratePerStream[i];
|
2018-04-17 16:12:21 +02:00
|
|
|
|
2020-10-17 12:57:58 +02:00
|
|
|
// Use configured values instead of default values if set.
|
|
|
|
|
const VideoStream stream = (i < encoder_config.simulcast_layers.size())
|
|
|
|
|
? encoder_config.simulcast_layers[i]
|
|
|
|
|
: VideoStream();
|
|
|
|
|
|
|
|
|
|
int 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);
|
|
|
|
|
|
2021-03-05 13:29:19 +01:00
|
|
|
int target_bitrate_bps = stream.target_bitrate_bps > 0
|
|
|
|
|
? stream.target_bitrate_bps
|
|
|
|
|
: max_bitrate_bps;
|
2020-10-17 12:57:58 +02:00
|
|
|
target_bitrate_bps = std::min(max_bitrate_bps, target_bitrate_bps);
|
|
|
|
|
|
|
|
|
|
if (stream.min_bitrate_bps > 0) {
|
|
|
|
|
RTC_DCHECK_LE(stream.min_bitrate_bps, target_bitrate_bps);
|
|
|
|
|
stream_settings[i].min_bitrate_bps = stream.min_bitrate_bps;
|
|
|
|
|
}
|
|
|
|
|
if (stream.max_framerate > 0) {
|
|
|
|
|
stream_settings[i].max_framerate = stream.max_framerate;
|
|
|
|
|
}
|
|
|
|
|
if (stream.num_temporal_layers) {
|
|
|
|
|
RTC_DCHECK_GE(*stream.num_temporal_layers, 1);
|
|
|
|
|
stream_settings[i].num_temporal_layers = stream.num_temporal_layers;
|
|
|
|
|
}
|
|
|
|
|
if (stream.scale_resolution_down_by >= 1.0) {
|
|
|
|
|
stream_settings[i].width = width / stream.scale_resolution_down_by;
|
|
|
|
|
stream_settings[i].height = height / stream.scale_resolution_down_by;
|
2018-04-17 16:12:21 +02:00
|
|
|
}
|
|
|
|
|
stream_settings[i].target_bitrate_bps = target_bitrate_bps;
|
|
|
|
|
stream_settings[i].max_bitrate_bps = max_bitrate_bps;
|
2021-03-05 13:29:19 +01:00
|
|
|
stream_settings[i].active =
|
|
|
|
|
encoder_config.number_of_streams == 1 || stream.active;
|
2018-04-17 16:12:21 +02:00
|
|
|
|
2016-10-02 23:45:26 -07:00
|
|
|
bitrate_left_bps -= stream_settings[i].target_bitrate_bps;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
stream_settings[encoder_config.number_of_streams - 1].max_bitrate_bps +=
|
|
|
|
|
bitrate_left_bps;
|
2017-12-22 09:36:42 -08:00
|
|
|
stream_settings[0].bitrate_priority = encoder_config.bitrate_priority;
|
2014-03-19 08:43:57 +00:00
|
|
|
|
2014-06-06 10:49:19 +00:00
|
|
|
return stream_settings;
|
2014-03-19 08:43:57 +00:00
|
|
|
}
|
|
|
|
|
|
2016-10-02 23:45:26 -07:00
|
|
|
DefaultVideoStreamFactory::DefaultVideoStreamFactory() {}
|
|
|
|
|
|
|
|
|
|
std::vector<VideoStream> DefaultVideoStreamFactory::CreateEncoderStreams(
|
|
|
|
|
int width,
|
|
|
|
|
int height,
|
|
|
|
|
const webrtc::VideoEncoderConfig& encoder_config) {
|
|
|
|
|
return CreateVideoStreams(width, height, encoder_config);
|
|
|
|
|
}
|
|
|
|
|
|
Reland "Reland "Move rtp-specific config out of EncoderSettings.""
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}
2018-04-05 15:36:51 +02:00
|
|
|
void FillEncoderConfiguration(VideoCodecType codec_type,
|
|
|
|
|
size_t num_streams,
|
2016-10-02 23:45:26 -07:00
|
|
|
VideoEncoderConfig* configuration) {
|
|
|
|
|
RTC_DCHECK_LE(num_streams, DefaultVideoStreamFactory::kMaxNumberOfStreams);
|
|
|
|
|
|
Reland "Reland "Move rtp-specific config out of EncoderSettings.""
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}
2018-04-05 15:36:51 +02:00
|
|
|
configuration->codec_type = codec_type;
|
2016-10-02 23:45:26 -07:00
|
|
|
configuration->number_of_streams = num_streams;
|
|
|
|
|
configuration->video_stream_factory =
|
2021-04-27 14:43:08 +02:00
|
|
|
rtc::make_ref_counted<DefaultVideoStreamFactory>();
|
2016-10-02 23:45:26 -07:00
|
|
|
configuration->max_bitrate_bps = 0;
|
2018-02-02 08:46:16 -08:00
|
|
|
configuration->simulcast_layers = std::vector<VideoStream>(num_streams);
|
2016-10-02 23:45:26 -07:00
|
|
|
for (size_t i = 0; i < num_streams; ++i) {
|
|
|
|
|
configuration->max_bitrate_bps +=
|
|
|
|
|
DefaultVideoStreamFactory::kMaxBitratePerStream[i];
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2014-10-29 15:28:39 +00:00
|
|
|
VideoReceiveStream::Decoder CreateMatchingDecoder(
|
2018-06-19 15:03:05 +02:00
|
|
|
int payload_type,
|
|
|
|
|
const std::string& payload_name) {
|
2014-10-29 15:28:39 +00:00
|
|
|
VideoReceiveStream::Decoder decoder;
|
Reland "Reland "Move rtp-specific config out of EncoderSettings.""
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}
2018-04-05 15:36:51 +02:00
|
|
|
decoder.payload_type = payload_type;
|
2018-09-11 15:56:04 +02:00
|
|
|
decoder.video_format = SdpVideoFormat(payload_name);
|
2014-10-29 15:28:39 +00:00
|
|
|
return decoder;
|
2014-03-19 08:43:57 +00:00
|
|
|
}
|
Reland "Reland "Move rtp-specific config out of EncoderSettings.""
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}
2018-04-05 15:36:51 +02:00
|
|
|
|
|
|
|
|
VideoReceiveStream::Decoder CreateMatchingDecoder(
|
|
|
|
|
const VideoSendStream::Config& config) {
|
|
|
|
|
return CreateMatchingDecoder(config.rtp.payload_type,
|
|
|
|
|
config.rtp.payload_name);
|
|
|
|
|
}
|
|
|
|
|
|
2014-03-19 08:43:57 +00:00
|
|
|
} // namespace test
|
|
|
|
|
} // namespace webrtc
|