mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 05:40:42 +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}
99 lines
3.2 KiB
C++
99 lines
3.2 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_AUDIO_DECODER_PROXY_FACTORY_H_
|
|
#define TEST_AUDIO_DECODER_PROXY_FACTORY_H_
|
|
|
|
#include <memory>
|
|
#include <utility>
|
|
#include <vector>
|
|
|
|
#include "api/audio_codecs/audio_decoder.h"
|
|
#include "api/audio_codecs/audio_decoder_factory.h"
|
|
|
|
namespace webrtc {
|
|
namespace test {
|
|
|
|
// An decoder factory with a single underlying AudioDecoder object, intended for
|
|
// test purposes. Each call to MakeAudioDecoder returns a proxy for the same
|
|
// decoder, typically a mock or fake decoder.
|
|
class AudioDecoderProxyFactory : public AudioDecoderFactory {
|
|
public:
|
|
explicit AudioDecoderProxyFactory(AudioDecoder* decoder)
|
|
: decoder_(decoder) {}
|
|
|
|
// Unused by tests.
|
|
std::vector<AudioCodecSpec> GetSupportedDecoders() override {
|
|
RTC_NOTREACHED();
|
|
return {};
|
|
}
|
|
|
|
bool IsSupportedDecoder(const SdpAudioFormat& format) override {
|
|
return true;
|
|
}
|
|
|
|
std::unique_ptr<AudioDecoder> MakeAudioDecoder(
|
|
const SdpAudioFormat& /* format */,
|
|
absl::optional<AudioCodecPairId> /* codec_pair_id */) override {
|
|
return std::make_unique<DecoderProxy>(decoder_);
|
|
}
|
|
|
|
private:
|
|
// Wrapper class, since CreateAudioDecoder needs to surrender
|
|
// ownership to the object it returns.
|
|
class DecoderProxy final : public AudioDecoder {
|
|
public:
|
|
explicit DecoderProxy(AudioDecoder* decoder) : decoder_(decoder) {}
|
|
|
|
private:
|
|
std::vector<ParseResult> ParsePayload(rtc::Buffer&& payload,
|
|
uint32_t timestamp) override {
|
|
return decoder_->ParsePayload(std::move(payload), timestamp);
|
|
}
|
|
|
|
bool HasDecodePlc() const override { return decoder_->HasDecodePlc(); }
|
|
|
|
int ErrorCode() override { return decoder_->ErrorCode(); }
|
|
|
|
void Reset() override { decoder_->Reset(); }
|
|
|
|
int SampleRateHz() const override { return decoder_->SampleRateHz(); }
|
|
|
|
size_t Channels() const override { return decoder_->Channels(); }
|
|
|
|
int DecodeInternal(const uint8_t* encoded,
|
|
size_t encoded_len,
|
|
int sample_rate_hz,
|
|
int16_t* decoded,
|
|
SpeechType* speech_type) override {
|
|
// Needed for tests of NetEqImpl::DecodeCng, which calls the deprecated
|
|
// Decode method.
|
|
size_t max_decoded_bytes =
|
|
decoder_->PacketDuration(encoded, encoded_len) *
|
|
decoder_->Channels() * sizeof(int16_t);
|
|
return decoder_->Decode(encoded, encoded_len, sample_rate_hz,
|
|
max_decoded_bytes, decoded, speech_type);
|
|
}
|
|
|
|
void GeneratePlc(size_t requested_samples_per_channel,
|
|
rtc::BufferT<int16_t>* concealment_audio) override {
|
|
decoder_->GeneratePlc(requested_samples_per_channel, concealment_audio);
|
|
}
|
|
|
|
AudioDecoder* const decoder_;
|
|
};
|
|
|
|
AudioDecoder* const decoder_;
|
|
};
|
|
|
|
} // namespace test
|
|
} // namespace webrtc
|
|
|
|
#endif // TEST_AUDIO_DECODER_PROXY_FACTORY_H_
|