c22a3a6a7d
Now decision between using SimulcastEncoderAdapter and using VP8 encoder is postponed before codec is initialized for VP8 internal codecs. This is done be new VP8EncoderProxy class. New error code for codec initialization is used to signal that simulcast parameters are not supported. Bug: webrtc:7925 Change-Id: I3a82c21bf5dfaaa7fa25350986830523f02c39d8 Reviewed-on: https://webrtc-review.googlesource.com/13980 Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org> Reviewed-by: Erik Språng <sprang@webrtc.org> Reviewed-by: Magnus Jedvert <magjed@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20419}
86 lines
2.8 KiB
C++
86 lines
2.8 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(
|
|
cricket::WebRtcVideoEncoderFactory* factory)
|
|
: factory_(factory), callback_(nullptr) {
|
|
encoder_ = CreateScopedVideoEncoder(factory_, cricket::VideoCodec("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_));
|
|
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 BitrateAllocation& bitrate,
|
|
uint32_t new_framerate) {
|
|
return encoder_->SetRateAllocation(bitrate, new_framerate);
|
|
}
|
|
|
|
VideoEncoder::ScalingSettings VP8EncoderSimulcastProxy::GetScalingSettings()
|
|
const {
|
|
return encoder_->GetScalingSettings();
|
|
}
|
|
|
|
int32_t VP8EncoderSimulcastProxy::SetPeriodicKeyFrames(bool enable) {
|
|
return encoder_->SetPeriodicKeyFrames(enable);
|
|
}
|
|
|
|
bool VP8EncoderSimulcastProxy::SupportsNativeHandle() const {
|
|
return encoder_->SupportsNativeHandle();
|
|
}
|
|
|
|
const char* VP8EncoderSimulcastProxy::ImplementationName() const {
|
|
return encoder_->ImplementationName();
|
|
}
|
|
|
|
} // namespace webrtc
|