d00aad5eb2
Reason for revert:
I will try to reland next week because it is causing some problems.
Original issue's description:
> To accommodate some downstream WebRTC users we need to loosen
> the coupling between our code and the //third_party/protobuf.
>
> This includes using typedefs to define strings instead of
> assuming std::string.
>
> After this refactoring it will be possible to link with other
> protobuf implementations than the current one.
>
> We moved the PRESUBMIT check to another CL [1]. The goal of this
> presubmit is to avoid the direct usage of google::protobuf outside
> of the webrtc/base/protobuf_utils.h header file.
>
> [1] - https://codereview.webrtc.org/2753823003/
>
> BUG=webrtc:7340
> NOTRY=True
>
> Review-Url: https://codereview.webrtc.org/2747863003
> Cr-Commit-Position: refs/heads/master@{#17466}
> Committed: 16ab93b952
TBR=kjellander@webrtc.org,henrik.lundin@webrtc.org,kwiberg@webrtc.org,michaelt@webrtc.org,peah@webrtc.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=webrtc:7340
Review-Url: https://codereview.webrtc.org/2786363002
Cr-Commit-Position: refs/heads/master@{#17483}
44 lines
1.3 KiB
C++
44 lines
1.3 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 "webrtc/modules/audio_processing/test/protobuf_utils.h"
|
|
#include "webrtc/typedefs.h"
|
|
|
|
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->reset(new 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, ::google::protobuf::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);
|
|
}
|
|
|
|
} // namespace webrtc
|