mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 22:00:47 +01:00
157b7814b9
This CL removes two deprecated methods from the VideoEncoder interface:
* int32_t SetRates(uint32_t, uint32_t);
* int32_t SetRateAllocation(const VideoBitrateAllocation&, uint32_t);
These are no longer used, instead the new version must be implemented:
void SetRates(const RateControlParameters&) = 0;
Migrating is straight forward. For the old SetRates, simple replace:
int32_t MyEncoder::SetRates(uint32_t bitrate, uint32_t framerate) {
with
void MyEncoder::SetRates(const RateControlParameters& parameters) {
uint32_t bitrate = parameters.bitrate.get_sum_kbps();
uint32_t framerate =
static_cast<uint32_t>(parameters.framerate_fps + 0.5);
For SetRateAllocation, replace:
int32_t MyEncoder::SetRateAllocation(
const VideoBitrateAllocation& allocation,
uint32_t framerate) {
with
void MyEncoder::SetRates(const RateControlParameters& parameters) {
const VideoBitrateAllocation& allocation = parameters.bitrate;
uint32_t framerate =
static_cast<uint32_t>(parameters.framerate_fps + 0.5);
Two more things to note:
1. The new method is void. Previously the only use of the return value
in production code was to log a more or less generic error message.
Instead, log the actual error from the encoder when it happens,
then just return.
2. The new method is pure virtual; it must be overriden even in test.
This CL is intended to be landed two weeks after creation, on Thursday
May 9th 2019.
Bug: webrtc:10481
Change-Id: I61349571a280bd40cd100ca9f93c4aa7748ed30d
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/134214
Reviewed-by: Stefan Holmer <stefan@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Commit-Queue: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27926}
133 lines
4.2 KiB
C++
133 lines
4.2 KiB
C++
/*
|
|
* Copyright (c) 2017 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 "api/video_codecs/video_encoder.h"
|
|
|
|
#include <string.h>
|
|
|
|
#include "rtc_base/checks.h"
|
|
|
|
namespace webrtc {
|
|
|
|
// TODO(mflodman): Add default complexity for VP9 and VP9.
|
|
VideoCodecVP8 VideoEncoder::GetDefaultVp8Settings() {
|
|
VideoCodecVP8 vp8_settings;
|
|
memset(&vp8_settings, 0, sizeof(vp8_settings));
|
|
|
|
vp8_settings.numberOfTemporalLayers = 1;
|
|
vp8_settings.denoisingOn = true;
|
|
vp8_settings.automaticResizeOn = false;
|
|
vp8_settings.frameDroppingOn = true;
|
|
vp8_settings.keyFrameInterval = 3000;
|
|
|
|
return vp8_settings;
|
|
}
|
|
|
|
VideoCodecVP9 VideoEncoder::GetDefaultVp9Settings() {
|
|
VideoCodecVP9 vp9_settings;
|
|
memset(&vp9_settings, 0, sizeof(vp9_settings));
|
|
|
|
vp9_settings.numberOfTemporalLayers = 1;
|
|
vp9_settings.denoisingOn = true;
|
|
vp9_settings.frameDroppingOn = true;
|
|
vp9_settings.keyFrameInterval = 3000;
|
|
vp9_settings.adaptiveQpMode = true;
|
|
vp9_settings.automaticResizeOn = true;
|
|
vp9_settings.numberOfSpatialLayers = 1;
|
|
vp9_settings.flexibleMode = false;
|
|
vp9_settings.interLayerPred = InterLayerPredMode::kOn;
|
|
|
|
return vp9_settings;
|
|
}
|
|
|
|
VideoCodecH264 VideoEncoder::GetDefaultH264Settings() {
|
|
VideoCodecH264 h264_settings;
|
|
memset(&h264_settings, 0, sizeof(h264_settings));
|
|
|
|
h264_settings.frameDroppingOn = true;
|
|
h264_settings.keyFrameInterval = 3000;
|
|
h264_settings.numberOfTemporalLayers = 1;
|
|
|
|
return h264_settings;
|
|
}
|
|
|
|
VideoEncoder::ScalingSettings::ScalingSettings() = default;
|
|
|
|
VideoEncoder::ScalingSettings::ScalingSettings(KOff) : ScalingSettings() {}
|
|
|
|
VideoEncoder::ScalingSettings::ScalingSettings(int low, int high)
|
|
: thresholds(QpThresholds(low, high)) {}
|
|
|
|
VideoEncoder::ScalingSettings::ScalingSettings(int low,
|
|
int high,
|
|
int min_pixels)
|
|
: thresholds(QpThresholds(low, high)), min_pixels_per_frame(min_pixels) {}
|
|
|
|
VideoEncoder::ScalingSettings::ScalingSettings(const ScalingSettings&) =
|
|
default;
|
|
|
|
VideoEncoder::ScalingSettings::~ScalingSettings() {}
|
|
|
|
// static
|
|
constexpr VideoEncoder::ScalingSettings::KOff
|
|
VideoEncoder::ScalingSettings::kOff;
|
|
// static
|
|
constexpr uint8_t VideoEncoder::EncoderInfo::kMaxFramerateFraction;
|
|
|
|
VideoEncoder::EncoderInfo::EncoderInfo()
|
|
: scaling_settings(VideoEncoder::ScalingSettings::kOff),
|
|
supports_native_handle(false),
|
|
implementation_name("unknown"),
|
|
has_trusted_rate_controller(false),
|
|
is_hardware_accelerated(true),
|
|
has_internal_source(false),
|
|
fps_allocation{absl::InlinedVector<uint8_t, kMaxTemporalStreams>(
|
|
1,
|
|
kMaxFramerateFraction)} {}
|
|
|
|
VideoEncoder::EncoderInfo::EncoderInfo(const EncoderInfo&) = default;
|
|
|
|
VideoEncoder::EncoderInfo::~EncoderInfo() = default;
|
|
|
|
VideoEncoder::RateControlParameters::RateControlParameters()
|
|
: bitrate(VideoBitrateAllocation()),
|
|
framerate_fps(0.0),
|
|
bandwidth_allocation(DataRate::Zero()) {}
|
|
|
|
VideoEncoder::RateControlParameters::RateControlParameters(
|
|
const VideoBitrateAllocation& bitrate,
|
|
double framerate_fps)
|
|
: bitrate(bitrate),
|
|
framerate_fps(framerate_fps),
|
|
bandwidth_allocation(DataRate::bps(bitrate.get_sum_bps())) {}
|
|
|
|
VideoEncoder::RateControlParameters::RateControlParameters(
|
|
const VideoBitrateAllocation& bitrate,
|
|
double framerate_fps,
|
|
DataRate bandwidth_allocation)
|
|
: bitrate(bitrate),
|
|
framerate_fps(framerate_fps),
|
|
bandwidth_allocation(bandwidth_allocation) {}
|
|
|
|
VideoEncoder::RateControlParameters::~RateControlParameters() = default;
|
|
|
|
void VideoEncoder::OnPacketLossRateUpdate(float packet_loss_rate) {}
|
|
|
|
void VideoEncoder::OnRttUpdate(int64_t rtt_ms) {}
|
|
|
|
void VideoEncoder::OnLossNotification(
|
|
const LossNotification& loss_notification) {}
|
|
|
|
// TODO(webrtc:9722): Remove and make pure virtual.
|
|
VideoEncoder::EncoderInfo VideoEncoder::GetEncoderInfo() const {
|
|
return EncoderInfo();
|
|
}
|
|
|
|
} // namespace webrtc
|