mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 13:50:40 +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}
79 lines
2.4 KiB
C++
79 lines
2.4 KiB
C++
/*
|
|
* Copyright (c) 2015 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.
|
|
*/
|
|
|
|
#include "modules/audio_processing/test/protobuf_utils.h"
|
|
|
|
#include <memory>
|
|
|
|
#include "rtc_base/system/arch.h"
|
|
|
|
namespace {
|
|
// Allocates new memory in the memory owned by the unique_ptr to fit the raw
|
|
// message and returns the number of bytes read when having a string stream as
|
|
// input.
|
|
size_t ReadMessageBytesFromString(std::stringstream* input,
|
|
std::unique_ptr<uint8_t[]>* bytes) {
|
|
int32_t size = 0;
|
|
input->read(reinterpret_cast<char*>(&size), sizeof(int32_t));
|
|
int32_t size_read = input->gcount();
|
|
if (size_read != sizeof(int32_t))
|
|
return 0;
|
|
if (size <= 0)
|
|
return 0;
|
|
|
|
*bytes = std::make_unique<uint8_t[]>(size);
|
|
input->read(reinterpret_cast<char*>(bytes->get()),
|
|
size * sizeof((*bytes)[0]));
|
|
size_read = input->gcount();
|
|
return size_read == size ? size : 0;
|
|
}
|
|
} // namespace
|
|
|
|
namespace webrtc {
|
|
|
|
size_t ReadMessageBytesFromFile(FILE* file, std::unique_ptr<uint8_t[]>* bytes) {
|
|
// The "wire format" for the size is little-endian. Assume we're running on
|
|
// a little-endian machine.
|
|
#ifndef WEBRTC_ARCH_LITTLE_ENDIAN
|
|
#error "Need to convert messsage from little-endian."
|
|
#endif
|
|
int32_t size = 0;
|
|
if (fread(&size, sizeof(size), 1, file) != 1)
|
|
return 0;
|
|
if (size <= 0)
|
|
return 0;
|
|
|
|
*bytes = std::make_unique<uint8_t[]>(size);
|
|
return fread(bytes->get(), sizeof((*bytes)[0]), size, file);
|
|
}
|
|
|
|
// Returns true on success, false on error or end-of-file.
|
|
bool ReadMessageFromFile(FILE* file, MessageLite* msg) {
|
|
std::unique_ptr<uint8_t[]> bytes;
|
|
size_t size = ReadMessageBytesFromFile(file, &bytes);
|
|
if (!size)
|
|
return false;
|
|
|
|
msg->Clear();
|
|
return msg->ParseFromArray(bytes.get(), size);
|
|
}
|
|
|
|
// Returns true on success, false on error or end of string stream.
|
|
bool ReadMessageFromString(std::stringstream* input, MessageLite* msg) {
|
|
std::unique_ptr<uint8_t[]> bytes;
|
|
size_t size = ReadMessageBytesFromString(input, &bytes);
|
|
if (!size)
|
|
return false;
|
|
|
|
msg->Clear();
|
|
return msg->ParseFromArray(bytes.get(), size);
|
|
}
|
|
|
|
} // namespace webrtc
|