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}
123 lines
4.1 KiB
C++
123 lines
4.1 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/scopedvideoencoder.h"
|
|
|
|
#include <vector>
|
|
|
|
#include "api/video/video_bitrate_allocation.h"
|
|
#include "api/video_codecs/video_encoder.h"
|
|
|
|
namespace cricket {
|
|
|
|
namespace {
|
|
|
|
class ScopedVideoEncoder : public webrtc::VideoEncoder {
|
|
public:
|
|
ScopedVideoEncoder(WebRtcVideoEncoderFactory* factory,
|
|
webrtc::VideoEncoder* encoder);
|
|
|
|
int32_t InitEncode(const webrtc::VideoCodec* codec_settings,
|
|
int32_t number_of_cores,
|
|
size_t max_payload_size) override;
|
|
int32_t RegisterEncodeCompleteCallback(
|
|
webrtc::EncodedImageCallback* callback) override;
|
|
int32_t Release() override;
|
|
int32_t Encode(const webrtc::VideoFrame& frame,
|
|
const webrtc::CodecSpecificInfo* codec_specific_info,
|
|
const std::vector<webrtc::FrameType>* frame_types) override;
|
|
int32_t SetChannelParameters(uint32_t packet_loss, int64_t rtt) override;
|
|
int32_t SetRates(uint32_t bitrate, uint32_t framerate) override;
|
|
int32_t SetRateAllocation(const webrtc::VideoBitrateAllocation& allocation,
|
|
uint32_t framerate) override;
|
|
ScalingSettings GetScalingSettings() const override;
|
|
bool SupportsNativeHandle() const override;
|
|
const char* ImplementationName() const override;
|
|
|
|
~ScopedVideoEncoder() override;
|
|
|
|
private:
|
|
WebRtcVideoEncoderFactory* factory_;
|
|
webrtc::VideoEncoder* encoder_;
|
|
};
|
|
|
|
ScopedVideoEncoder::ScopedVideoEncoder(WebRtcVideoEncoderFactory* factory,
|
|
webrtc::VideoEncoder* encoder)
|
|
: factory_(factory), encoder_(encoder) {}
|
|
|
|
int32_t ScopedVideoEncoder::InitEncode(const webrtc::VideoCodec* codec_settings,
|
|
int32_t number_of_cores,
|
|
size_t max_payload_size) {
|
|
return encoder_->InitEncode(codec_settings, number_of_cores,
|
|
max_payload_size);
|
|
}
|
|
|
|
int32_t ScopedVideoEncoder::RegisterEncodeCompleteCallback(
|
|
webrtc::EncodedImageCallback* callback) {
|
|
return encoder_->RegisterEncodeCompleteCallback(callback);
|
|
}
|
|
|
|
int32_t ScopedVideoEncoder::Release() {
|
|
return encoder_->Release();
|
|
}
|
|
|
|
int32_t ScopedVideoEncoder::Encode(
|
|
const webrtc::VideoFrame& frame,
|
|
const webrtc::CodecSpecificInfo* codec_specific_info,
|
|
const std::vector<webrtc::FrameType>* frame_types) {
|
|
return encoder_->Encode(frame, codec_specific_info, frame_types);
|
|
}
|
|
|
|
int32_t ScopedVideoEncoder::SetChannelParameters(uint32_t packet_loss,
|
|
int64_t rtt) {
|
|
return encoder_->SetChannelParameters(packet_loss, rtt);
|
|
}
|
|
|
|
int32_t ScopedVideoEncoder::SetRates(uint32_t bitrate, uint32_t framerate) {
|
|
return encoder_->SetRates(bitrate, framerate);
|
|
}
|
|
|
|
int32_t ScopedVideoEncoder::SetRateAllocation(
|
|
const webrtc::VideoBitrateAllocation& allocation,
|
|
uint32_t framerate) {
|
|
return encoder_->SetRateAllocation(allocation, framerate);
|
|
}
|
|
|
|
webrtc::VideoEncoder::ScalingSettings ScopedVideoEncoder::GetScalingSettings()
|
|
const {
|
|
return encoder_->GetScalingSettings();
|
|
}
|
|
|
|
bool ScopedVideoEncoder::SupportsNativeHandle() const {
|
|
return encoder_->SupportsNativeHandle();
|
|
}
|
|
|
|
const char* ScopedVideoEncoder::ImplementationName() const {
|
|
return encoder_->ImplementationName();
|
|
}
|
|
|
|
ScopedVideoEncoder::~ScopedVideoEncoder() {
|
|
factory_->DestroyVideoEncoder(encoder_);
|
|
}
|
|
|
|
} // namespace
|
|
|
|
std::unique_ptr<webrtc::VideoEncoder> CreateScopedVideoEncoder(
|
|
WebRtcVideoEncoderFactory* factory,
|
|
const VideoCodec& codec) {
|
|
webrtc::VideoEncoder* encoder = factory->CreateVideoEncoder(codec);
|
|
if (!encoder)
|
|
return nullptr;
|
|
return std::unique_ptr<webrtc::VideoEncoder>(
|
|
new ScopedVideoEncoder(factory, encoder));
|
|
}
|
|
|
|
} // namespace cricket
|