1ec2a16121
This reverts commit cdc5eb0de179dcc866ef770ea303879c64466879. Reason for revert: Causes wrong CPU adaptation to be used for some HW codecs since GetEncoderInfo() is polled before InitEncode(). Original change's description: > Replace VideoEncoderFactory::QueryVideoEncoder with VideoEncoder::GetEncoderInfo > > Make implementation of VideoEncoderFactory::QueryVideoEncoder optional > until it is removed downstream and remove all implementations of it. > > Bug: webrtc:10065 > Change-Id: Ibb1f9612234e536651ce53f05ee048a5d172a41f > Reviewed-on: https://webrtc-review.googlesource.com/c/113065 > Commit-Queue: Mirta Dvornicic <mirtad@webrtc.org> > Reviewed-by: Sebastian Jansson <srte@webrtc.org> > Reviewed-by: Per Kjellander <perkj@webrtc.org> > Reviewed-by: Rasmus Brandt <brandtr@webrtc.org> > Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> > Reviewed-by: Kári Helgason <kthelgason@webrtc.org> > Reviewed-by: Erik Språng <sprang@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#25924} TBR=brandtr@webrtc.org,sakal@webrtc.org,kthelgason@webrtc.org,sprang@webrtc.org,srte@webrtc.org,perkj@webrtc.org,mirtad@webrtc.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: webrtc:10065 Change-Id: Idaa452e1d8c1c58cdb4ec69b88fce9042589cc3c Reviewed-on: https://webrtc-review.googlesource.com/c/113800 Reviewed-by: Mirta Dvornicic <mirtad@webrtc.org> Reviewed-by: Per Kjellander <perkj@webrtc.org> Reviewed-by: Kári Helgason <kthelgason@webrtc.org> Reviewed-by: Rasmus Brandt <brandtr@webrtc.org> Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Mirta Dvornicic <mirtad@webrtc.org> Cr-Commit-Position: refs/heads/master@{#25943}
98 lines
3.3 KiB
C++
98 lines
3.3 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 {
|
|
|
|
// 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 CodecSpecificInfo* codec_specific_info,
|
|
const std::vector<FrameType>* frame_types) override {
|
|
return encoder_->Encode(input_image, codec_specific_info, frame_types);
|
|
}
|
|
int32_t InitEncode(const VideoCodec* config,
|
|
int32_t number_of_cores,
|
|
size_t max_payload_size) override {
|
|
return encoder_->InitEncode(config, number_of_cores, max_payload_size);
|
|
}
|
|
int32_t RegisterEncodeCompleteCallback(
|
|
EncodedImageCallback* callback) override {
|
|
return encoder_->RegisterEncodeCompleteCallback(callback);
|
|
}
|
|
int32_t Release() override { return encoder_->Release(); }
|
|
int32_t SetRateAllocation(const VideoBitrateAllocation& rate_allocation,
|
|
uint32_t framerate) override {
|
|
return encoder_->SetRateAllocation(rate_allocation, framerate);
|
|
}
|
|
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_
|