a1d9ca47f9
This reverts commit 3e335d1423cab06cca8cdb4f1fadb0b16c9e7d38. Reason for revert: breaks downstream project Original change's description: > Add ability to specify if rate controller of video encoder is trusted. > > If rate controller is trusted, we disable the frame dropper in the > media optimization module. > > Bug: webrtc:9722 > Change-Id: I821f21fd74a400ee9d5aa3f6b42d4e569033acbe > Reviewed-on: https://webrtc-review.googlesource.com/c/105020 > Commit-Queue: Erik Språng <sprang@webrtc.org> > Reviewed-by: Per Kjellander <perkj@webrtc.org> > Reviewed-by: Niels Moller <nisse@webrtc.org> > Reviewed-by: Rasmus Brandt <brandtr@webrtc.org> > Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#25107} TBR=brandtr@webrtc.org,ilnik@webrtc.org,nisse@webrtc.org,sprang@webrtc.org,perkj@webrtc.org Change-Id: Ifdb0aae684894854a184ec1e7423a7c62e7ba237 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:9722 Reviewed-on: https://webrtc-review.googlesource.com/c/105360 Commit-Queue: Oleh Prypin <oprypin@webrtc.org> Reviewed-by: Oleh Prypin <oprypin@webrtc.org> Cr-Commit-Position: refs/heads/master@{#25117}
85 lines
2.9 KiB
C++
85 lines
2.9 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 "media/engine/vp8_encoder_simulcast_proxy.h"
|
|
|
|
#include "media/engine/scopedvideoencoder.h"
|
|
#include "media/engine/simulcast_encoder_adapter.h"
|
|
#include "rtc_base/checks.h"
|
|
|
|
namespace webrtc {
|
|
VP8EncoderSimulcastProxy::VP8EncoderSimulcastProxy(VideoEncoderFactory* factory,
|
|
const SdpVideoFormat& format)
|
|
: factory_(factory), video_format_(format), callback_(nullptr) {
|
|
encoder_ = factory_->CreateVideoEncoder(format);
|
|
}
|
|
|
|
VP8EncoderSimulcastProxy::VP8EncoderSimulcastProxy(VideoEncoderFactory* factory)
|
|
: VP8EncoderSimulcastProxy(factory, SdpVideoFormat("VP8")) {}
|
|
|
|
VP8EncoderSimulcastProxy::~VP8EncoderSimulcastProxy() {}
|
|
|
|
int VP8EncoderSimulcastProxy::Release() {
|
|
return encoder_->Release();
|
|
}
|
|
|
|
int VP8EncoderSimulcastProxy::InitEncode(const VideoCodec* inst,
|
|
int number_of_cores,
|
|
size_t max_payload_size) {
|
|
int ret = encoder_->InitEncode(inst, number_of_cores, max_payload_size);
|
|
if (ret == WEBRTC_VIDEO_CODEC_ERR_SIMULCAST_PARAMETERS_NOT_SUPPORTED) {
|
|
encoder_.reset(new SimulcastEncoderAdapter(factory_, video_format_));
|
|
if (callback_) {
|
|
encoder_->RegisterEncodeCompleteCallback(callback_);
|
|
}
|
|
ret = encoder_->InitEncode(inst, number_of_cores, max_payload_size);
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
int VP8EncoderSimulcastProxy::Encode(
|
|
const VideoFrame& input_image,
|
|
const CodecSpecificInfo* codec_specific_info,
|
|
const std::vector<FrameType>* frame_types) {
|
|
return encoder_->Encode(input_image, codec_specific_info, frame_types);
|
|
}
|
|
|
|
int VP8EncoderSimulcastProxy::RegisterEncodeCompleteCallback(
|
|
EncodedImageCallback* callback) {
|
|
callback_ = callback;
|
|
return encoder_->RegisterEncodeCompleteCallback(callback);
|
|
}
|
|
|
|
int VP8EncoderSimulcastProxy::SetChannelParameters(uint32_t packet_loss,
|
|
int64_t rtt) {
|
|
return encoder_->SetChannelParameters(packet_loss, rtt);
|
|
}
|
|
|
|
int VP8EncoderSimulcastProxy::SetRateAllocation(
|
|
const VideoBitrateAllocation& bitrate,
|
|
uint32_t new_framerate) {
|
|
return encoder_->SetRateAllocation(bitrate, new_framerate);
|
|
}
|
|
|
|
VideoEncoder::ScalingSettings VP8EncoderSimulcastProxy::GetScalingSettings()
|
|
const {
|
|
return encoder_->GetScalingSettings();
|
|
}
|
|
|
|
bool VP8EncoderSimulcastProxy::SupportsNativeHandle() const {
|
|
return encoder_->SupportsNativeHandle();
|
|
}
|
|
|
|
const char* VP8EncoderSimulcastProxy::ImplementationName() const {
|
|
return encoder_->ImplementationName();
|
|
}
|
|
|
|
} // namespace webrtc
|