efb94d57eb
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}
82 lines
2.7 KiB
C++
82 lines
2.7 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_DECODER_PROXY_FACTORY_H_
|
|
#define TEST_VIDEO_DECODER_PROXY_FACTORY_H_
|
|
|
|
#include <memory>
|
|
#include <vector>
|
|
|
|
#include "absl/memory/memory.h"
|
|
#include "api/video_codecs/video_decoder.h"
|
|
#include "api/video_codecs/video_decoder_factory.h"
|
|
|
|
namespace webrtc {
|
|
namespace test {
|
|
|
|
// An decoder factory with a single underlying VideoDecoder object, intended for
|
|
// test purposes. Each call to CreateVideoDecoder returns a proxy for the same
|
|
// decoder, typically an instance of FakeDecoder or MockEncoder.
|
|
class VideoDecoderProxyFactory final : public VideoDecoderFactory {
|
|
public:
|
|
explicit VideoDecoderProxyFactory(VideoDecoder* decoder)
|
|
: decoder_(decoder) {}
|
|
|
|
// Unused by tests.
|
|
std::vector<SdpVideoFormat> GetSupportedFormats() const override {
|
|
RTC_NOTREACHED();
|
|
return {};
|
|
}
|
|
|
|
std::unique_ptr<VideoDecoder> CreateVideoDecoder(
|
|
const SdpVideoFormat& format) override {
|
|
return absl::make_unique<DecoderProxy>(decoder_);
|
|
}
|
|
|
|
private:
|
|
// Wrapper class, since CreateVideoDecoder needs to surrender
|
|
// ownership to the object it returns.
|
|
class DecoderProxy final : public VideoDecoder {
|
|
public:
|
|
explicit DecoderProxy(VideoDecoder* decoder) : decoder_(decoder) {}
|
|
|
|
private:
|
|
int32_t Decode(const EncodedImage& input_image,
|
|
bool missing_frames,
|
|
const CodecSpecificInfo* codec_specific_info,
|
|
int64_t render_time_ms) override {
|
|
return decoder_->Decode(input_image, missing_frames, codec_specific_info,
|
|
render_time_ms);
|
|
}
|
|
int32_t InitDecode(const VideoCodec* config,
|
|
int32_t number_of_cores) override {
|
|
return decoder_->InitDecode(config, number_of_cores);
|
|
}
|
|
int32_t RegisterDecodeCompleteCallback(
|
|
DecodedImageCallback* callback) override {
|
|
return decoder_->RegisterDecodeCompleteCallback(callback);
|
|
}
|
|
int32_t Release() override { return decoder_->Release(); }
|
|
bool PrefersLateDecoding() const { return decoder_->PrefersLateDecoding(); }
|
|
const char* ImplementationName() const override {
|
|
return decoder_->ImplementationName();
|
|
}
|
|
|
|
VideoDecoder* const decoder_;
|
|
};
|
|
|
|
VideoDecoder* const decoder_;
|
|
};
|
|
|
|
} // namespace test
|
|
} // namespace webrtc
|
|
|
|
#endif // TEST_VIDEO_DECODER_PROXY_FACTORY_H_
|