mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-18 08:07:56 +01:00
317a1f09ed
WebRTC is now using C++14 so there is no need to use the Abseil version of std::make_unique. This CL has been created with the following steps: git grep -l absl::make_unique | sort | uniq > /tmp/make_unique.txt git grep -l absl::WrapUnique | sort | uniq > /tmp/wrap_unique.txt git grep -l "#include <memory>" | sort | uniq > /tmp/memory.txt diff --new-line-format="" --unchanged-line-format="" \ /tmp/make_unique.txt /tmp/wrap_unique.txt | sort | \ uniq > /tmp/only_make_unique.txt diff --new-line-format="" --unchanged-line-format="" \ /tmp/only_make_unique.txt /tmp/memory.txt | \ xargs grep -l "absl/memory" > /tmp/add-memory.txt git grep -l "\babsl::make_unique\b" | \ xargs sed -i "s/\babsl::make_unique\b/std::make_unique/g" git checkout PRESUBMIT.py abseil-in-webrtc.md cat /tmp/add-memory.txt | \ xargs sed -i \ 's/#include "absl\/memory\/memory.h"/#include <memory>/g' git cl format # Manual fix order of the new inserted #include <memory> cat /tmp/only_make_unique | xargs grep -l "#include <memory>" | \ xargs sed -i '/#include "absl\/memory\/memory.h"/d' git ls-files | grep BUILD.gn | \ xargs sed -i '/\/\/third_party\/abseil-cpp\/absl\/memory/d' python tools_webrtc/gn_check_autofix.py \ -m tryserver.webrtc -b linux_rel # Repead the gn_check_autofix step for other platforms git ls-files | grep BUILD.gn | \ xargs sed -i 's/absl\/memory:memory/absl\/memory/g' git cl format Bug: webrtc:10945 Change-Id: I3fe28ea80f4dd3ba3cf28effd151d5e1f19aff89 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/153221 Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Alessio Bazzica <alessiob@webrtc.org> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Cr-Commit-Position: refs/heads/master@{#29209}
78 lines
2.5 KiB
C++
78 lines
2.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_VIDEO_DECODER_PROXY_FACTORY_H_
|
|
#define TEST_VIDEO_DECODER_PROXY_FACTORY_H_
|
|
|
|
#include <memory>
|
|
#include <vector>
|
|
|
|
#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 std::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,
|
|
int64_t render_time_ms) override {
|
|
return decoder_->Decode(input_image, missing_frames, 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_
|