This reverts commit efb94d57eb88638c323d93dddc281390dada5021. Reason for revert: Investigate and fix build errors. Original change's description: > Revert "Revert "Replace VideoDecoder with VideoDecoderFactory in VideoReceiveStream config."" > > This reverts commit 7961dc2dbdb3391a003d63630d5107e258ff3e78. > > Reason for revert: WebRTC does not build > > Original change's description: > > Revert "Replace VideoDecoder with VideoDecoderFactory in VideoReceiveStream config." > > > > This reverts commit 529d0d9795b81dbed5e4231f15d3752a5fc0df32. > > > > Reason for revert: Seems to break perf tests, likely some breakage in video_quality_tests decoder configuration. > > > > Original change's description: > > > Replace VideoDecoder with VideoDecoderFactory in VideoReceiveStream config. > > > > > > Preparation for deleting EnableFrameRecordning, and also a step > > > towards landing of the new VideoStreamDecoder. > > > > > > Bug: webrtc:9106 > > > Change-Id: I50964ee458b08a702ec69b82a62e4995c57cee82 > > > Reviewed-on: https://webrtc-review.googlesource.com/97660 > > > Commit-Queue: Niels Moller <nisse@webrtc.org> > > > Reviewed-by: Rasmus Brandt <brandtr@webrtc.org> > > > Reviewed-by: Anders Carlsson <andersc@webrtc.org> > > > Reviewed-by: Sebastian Jansson <srte@webrtc.org> > > > Reviewed-by: Erik Språng <sprang@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#24861} > > > > TBR=brandtr@webrtc.org,nisse@webrtc.org,andersc@webrtc.org,sprang@webrtc.org,philipel@webrtc.org,srte@webrtc.org > > > > Change-Id: Id34e4a3452a7dbc06167a4df5bb4c2825ebd7bd0 > > No-Presubmit: true > > No-Tree-Checks: true > > No-Try: true > > Bug: webrtc:9106 > > Reviewed-on: https://webrtc-review.googlesource.com/102421 > > Reviewed-by: Niels Moller <nisse@webrtc.org> > > Commit-Queue: Niels Moller <nisse@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#24866} > > TBR=brandtr@webrtc.org,nisse@webrtc.org,andersc@webrtc.org,sprang@webrtc.org,philipel@webrtc.org,srte@webrtc.org > > Change-Id: I23a439e1ceef79109b1f966b80b2663203968269 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:9106 > Reviewed-on: https://webrtc-review.googlesource.com/102422 > Reviewed-by: Oleh Prypin <oprypin@webrtc.org> > Commit-Queue: Oleh Prypin <oprypin@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#24867} TBR=brandtr@webrtc.org,oprypin@webrtc.org,nisse@webrtc.org,andersc@webrtc.org,sprang@webrtc.org,philipel@webrtc.org,srte@webrtc.org Change-Id: I9dafbc070e7f39dcb0ddbd61cb620164258fe894 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:9106 Reviewed-on: https://webrtc-review.googlesource.com/102460 Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/master@{#24872}
104 lines
3.5 KiB
C++
104 lines
3.5 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_ENCODER_PROXY_FACTORY_H_
|
|
#define TEST_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 EncoderProxyFactory final : public VideoEncoderFactory {
|
|
public:
|
|
explicit EncoderProxyFactory(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);
|
|
}
|
|
VideoEncoder::ScalingSettings GetScalingSettings() const override {
|
|
return encoder_->GetScalingSettings();
|
|
}
|
|
int32_t RegisterEncodeCompleteCallback(
|
|
EncodedImageCallback* callback) override {
|
|
return encoder_->RegisterEncodeCompleteCallback(callback);
|
|
}
|
|
int32_t Release() override { return encoder_->Release(); }
|
|
int32_t SetChannelParameters(uint32_t packet_loss, int64_t rtt) override {
|
|
return encoder_->SetChannelParameters(packet_loss, rtt);
|
|
}
|
|
int32_t SetRateAllocation(const VideoBitrateAllocation& rate_allocation,
|
|
uint32_t framerate) override {
|
|
return encoder_->SetRateAllocation(rate_allocation, framerate);
|
|
}
|
|
const char* ImplementationName() const override {
|
|
return encoder_->ImplementationName();
|
|
}
|
|
|
|
VideoEncoder* const encoder_;
|
|
};
|
|
|
|
VideoEncoder* const encoder_;
|
|
CodecInfo codec_info_;
|
|
};
|
|
|
|
} // namespace test
|
|
} // namespace webrtc
|
|
|
|
#endif // TEST_ENCODER_PROXY_FACTORY_H_
|