370f93a34a
This is a reland of 11dfff0878c949f2e19d95a0ddc209cdad94b3b4 Now that I am sure that WebRTC code is not calling the obsolete versions, I will just remove the NOT_REACHED and call the new version from the old ones, so as not to trip up downstream projects. Original change's description: > Inform VideoEncoder of negotiated capabilities > > After this CL lands, an announcement will be made to > discuss-webrtc about the deprecation of one version > of InitEncode(). > > Bug: webrtc:10720 > Change-Id: Ib992af0272bbb16ae16ef7e69491f365702d179e > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/140884 > Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> > Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> > Reviewed-by: Erik Språng <sprang@webrtc.org> > Commit-Queue: Elad Alon <eladalon@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#28224} TBR=sakal@webrtc.org,kwiberg@webrtc.org,sprang@webrtc.org Bug: webrtc:10720 Change-Id: I46c69e45c190805c07f7e51acbe277d7eebd1600 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/141412 Commit-Queue: Elad Alon <eladalon@webrtc.org> Reviewed-by: Elad Alon <eladalon@webrtc.org> Cr-Commit-Position: refs/heads/master@{#28236}
99 lines
3.1 KiB
C++
99 lines
3.1 KiB
C++
/*
|
|
* Copyright (c) 2018 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.
|
|
*/
|
|
|
|
#ifndef TEST_VIDEO_ENCODER_PROXY_FACTORY_H_
|
|
#define TEST_VIDEO_ENCODER_PROXY_FACTORY_H_
|
|
|
|
#include <memory>
|
|
#include <vector>
|
|
|
|
#include "absl/memory/memory.h"
|
|
#include "api/video_codecs/video_encoder.h"
|
|
#include "api/video_codecs/video_encoder_factory.h"
|
|
|
|
namespace webrtc {
|
|
namespace test {
|
|
|
|
namespace {
|
|
const VideoEncoder::Capabilities kCapabilities(false);
|
|
}
|
|
|
|
// An encoder factory with a single underlying VideoEncoder object,
|
|
// intended for test purposes. Each call to CreateVideoEncoder returns
|
|
// a proxy for the same encoder, typically an instance of FakeEncoder.
|
|
class VideoEncoderProxyFactory final : public VideoEncoderFactory {
|
|
public:
|
|
explicit VideoEncoderProxyFactory(VideoEncoder* encoder) : encoder_(encoder) {
|
|
codec_info_.is_hardware_accelerated = false;
|
|
codec_info_.has_internal_source = false;
|
|
}
|
|
|
|
// Unused by tests.
|
|
std::vector<SdpVideoFormat> GetSupportedFormats() const override {
|
|
RTC_NOTREACHED();
|
|
return {};
|
|
}
|
|
|
|
CodecInfo QueryVideoEncoder(const SdpVideoFormat& format) const override {
|
|
return codec_info_;
|
|
}
|
|
|
|
std::unique_ptr<VideoEncoder> CreateVideoEncoder(
|
|
const SdpVideoFormat& format) override {
|
|
return absl::make_unique<EncoderProxy>(encoder_);
|
|
}
|
|
|
|
void SetIsHardwareAccelerated(bool is_hardware_accelerated) {
|
|
codec_info_.is_hardware_accelerated = is_hardware_accelerated;
|
|
}
|
|
void SetHasInternalSource(bool has_internal_source) {
|
|
codec_info_.has_internal_source = has_internal_source;
|
|
}
|
|
|
|
private:
|
|
// Wrapper class, since CreateVideoEncoder needs to surrender
|
|
// ownership to the object it returns.
|
|
class EncoderProxy final : public VideoEncoder {
|
|
public:
|
|
explicit EncoderProxy(VideoEncoder* encoder) : encoder_(encoder) {}
|
|
|
|
private:
|
|
int32_t Encode(const VideoFrame& input_image,
|
|
const std::vector<VideoFrameType>* frame_types) override {
|
|
return encoder_->Encode(input_image, frame_types);
|
|
}
|
|
int32_t InitEncode(const VideoCodec* config,
|
|
const Settings& settings) override {
|
|
return encoder_->InitEncode(config, settings);
|
|
}
|
|
int32_t RegisterEncodeCompleteCallback(
|
|
EncodedImageCallback* callback) override {
|
|
return encoder_->RegisterEncodeCompleteCallback(callback);
|
|
}
|
|
int32_t Release() override { return encoder_->Release(); }
|
|
void SetRates(const RateControlParameters& parameters) override {
|
|
encoder_->SetRates(parameters);
|
|
}
|
|
VideoEncoder::EncoderInfo GetEncoderInfo() const override {
|
|
return encoder_->GetEncoderInfo();
|
|
}
|
|
|
|
VideoEncoder* const encoder_;
|
|
};
|
|
|
|
VideoEncoder* const encoder_;
|
|
CodecInfo codec_info_;
|
|
};
|
|
|
|
} // namespace test
|
|
} // namespace webrtc
|
|
|
|
#endif // TEST_VIDEO_ENCODER_PROXY_FACTORY_H_
|