cc7125f240
When a simulcast stream is enabled or disabled, we want this state change to be reflected properly in the RtpRtcp modules. Each video send stream can contain multiple rtp_rtcp_modules pertaining to different simulcast streams. These modules are currently all turned on/off when the send stream is started and stopped. This change allows for individual modules to be turned on/off. This means if a module stops sending it will send a bye message, so the receiving side will not expect more frames to be sent when the stream is inactive and the encoder is no longer encoding/sending images. Bug: webrtc:8653 Change-Id: Ib6d00240f627b4ff1714646e847026f24c7c3aa4 Reviewed-on: https://webrtc-review.googlesource.com/42841 Commit-Queue: Seth Hampson <shampson@webrtc.org> Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org> Reviewed-by: Stefan Holmer <stefan@webrtc.org> Reviewed-by: Erik Språng <sprang@webrtc.org> Cr-Commit-Position: refs/heads/master@{#21880}
112 lines
4.2 KiB
C++
112 lines
4.2 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 "modules/video_coding/codecs/h264/include/h264.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(size_t num_streams,
|
|
VideoEncoderConfig* configuration) {
|
|
RTC_DCHECK_LE(num_streams, DefaultVideoStreamFactory::kMaxNumberOfStreams);
|
|
|
|
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(
|
|
const VideoSendStream::Config::EncoderSettings& encoder_settings) {
|
|
VideoReceiveStream::Decoder decoder;
|
|
decoder.payload_type = encoder_settings.payload_type;
|
|
decoder.payload_name = encoder_settings.payload_name;
|
|
if (encoder_settings.payload_name == "H264") {
|
|
decoder.decoder = H264Decoder::Create().release();
|
|
} else if (encoder_settings.payload_name == "VP8") {
|
|
decoder.decoder = VP8Decoder::Create().release();
|
|
} else if (encoder_settings.payload_name == "VP9") {
|
|
decoder.decoder = VP9Decoder::Create().release();
|
|
} else {
|
|
decoder.decoder = new FakeDecoder();
|
|
}
|
|
return decoder;
|
|
}
|
|
} // namespace test
|
|
} // namespace webrtc
|