Update to current webrtc library
This is from the upstream library commit id 3326535126e435f1ba647885ce43a8f0f3d317eb, corresponding to Chromium 88.0.4290.1.
This commit is contained in:
@ -8,11 +8,11 @@
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
#include "webrtc/modules/audio_processing/transient/file_utils.h"
|
||||
#include "modules/audio_processing/transient/file_utils.h"
|
||||
|
||||
#include "webrtc/base/scoped_ptr.h"
|
||||
#include "webrtc/system_wrappers/include/file_wrapper.h"
|
||||
#include "webrtc/typedefs.h"
|
||||
#include <memory>
|
||||
|
||||
#include "rtc_base/system/file_wrapper.h"
|
||||
|
||||
namespace webrtc {
|
||||
|
||||
@ -79,11 +79,11 @@ int ConvertDoubleToByteArray(double value, uint8_t out_bytes[8]) {
|
||||
size_t ReadInt16BufferFromFile(FileWrapper* file,
|
||||
size_t length,
|
||||
int16_t* buffer) {
|
||||
if (!file || !file->Open() || !buffer || length <= 0) {
|
||||
if (!file || !file->is_open() || !buffer || length <= 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
rtc::scoped_ptr<uint8_t[]> byte_array(new uint8_t[2]);
|
||||
std::unique_ptr<uint8_t[]> byte_array(new uint8_t[2]);
|
||||
|
||||
size_t int16s_read = 0;
|
||||
|
||||
@ -105,11 +105,11 @@ size_t ReadInt16BufferFromFile(FileWrapper* file,
|
||||
size_t ReadInt16FromFileToFloatBuffer(FileWrapper* file,
|
||||
size_t length,
|
||||
float* buffer) {
|
||||
if (!file || !file->Open() || !buffer || length <= 0) {
|
||||
if (!file || !file->is_open() || !buffer || length <= 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
rtc::scoped_ptr<int16_t[]> buffer16(new int16_t[length]);
|
||||
std::unique_ptr<int16_t[]> buffer16(new int16_t[length]);
|
||||
|
||||
size_t int16s_read = ReadInt16BufferFromFile(file, length, buffer16.get());
|
||||
|
||||
@ -123,11 +123,11 @@ size_t ReadInt16FromFileToFloatBuffer(FileWrapper* file,
|
||||
size_t ReadInt16FromFileToDoubleBuffer(FileWrapper* file,
|
||||
size_t length,
|
||||
double* buffer) {
|
||||
if (!file || !file->Open() || !buffer || length <= 0) {
|
||||
if (!file || !file->is_open() || !buffer || length <= 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
rtc::scoped_ptr<int16_t[]> buffer16(new int16_t[length]);
|
||||
std::unique_ptr<int16_t[]> buffer16(new int16_t[length]);
|
||||
|
||||
size_t int16s_read = ReadInt16BufferFromFile(file, length, buffer16.get());
|
||||
|
||||
@ -141,11 +141,11 @@ size_t ReadInt16FromFileToDoubleBuffer(FileWrapper* file,
|
||||
size_t ReadFloatBufferFromFile(FileWrapper* file,
|
||||
size_t length,
|
||||
float* buffer) {
|
||||
if (!file || !file->Open() || !buffer || length <= 0) {
|
||||
if (!file || !file->is_open() || !buffer || length <= 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
rtc::scoped_ptr<uint8_t[]> byte_array(new uint8_t[4]);
|
||||
std::unique_ptr<uint8_t[]> byte_array(new uint8_t[4]);
|
||||
|
||||
size_t floats_read = 0;
|
||||
|
||||
@ -164,11 +164,11 @@ size_t ReadFloatBufferFromFile(FileWrapper* file,
|
||||
size_t ReadDoubleBufferFromFile(FileWrapper* file,
|
||||
size_t length,
|
||||
double* buffer) {
|
||||
if (!file || !file->Open() || !buffer || length <= 0) {
|
||||
if (!file || !file->is_open() || !buffer || length <= 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
rtc::scoped_ptr<uint8_t[]> byte_array(new uint8_t[8]);
|
||||
std::unique_ptr<uint8_t[]> byte_array(new uint8_t[8]);
|
||||
|
||||
size_t doubles_read = 0;
|
||||
|
||||
@ -187,11 +187,11 @@ size_t ReadDoubleBufferFromFile(FileWrapper* file,
|
||||
size_t WriteInt16BufferToFile(FileWrapper* file,
|
||||
size_t length,
|
||||
const int16_t* buffer) {
|
||||
if (!file || !file->Open() || !buffer || length <= 0) {
|
||||
if (!file || !file->is_open() || !buffer || length <= 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
rtc::scoped_ptr<uint8_t[]> byte_array(new uint8_t[2]);
|
||||
std::unique_ptr<uint8_t[]> byte_array(new uint8_t[2]);
|
||||
|
||||
size_t int16s_written = 0;
|
||||
|
||||
@ -211,11 +211,11 @@ size_t WriteInt16BufferToFile(FileWrapper* file,
|
||||
size_t WriteFloatBufferToFile(FileWrapper* file,
|
||||
size_t length,
|
||||
const float* buffer) {
|
||||
if (!file || !file->Open() || !buffer || length <= 0) {
|
||||
if (!file || !file->is_open() || !buffer || length <= 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
rtc::scoped_ptr<uint8_t[]> byte_array(new uint8_t[4]);
|
||||
std::unique_ptr<uint8_t[]> byte_array(new uint8_t[4]);
|
||||
|
||||
size_t floats_written = 0;
|
||||
|
||||
@ -234,11 +234,11 @@ size_t WriteFloatBufferToFile(FileWrapper* file,
|
||||
size_t WriteDoubleBufferToFile(FileWrapper* file,
|
||||
size_t length,
|
||||
const double* buffer) {
|
||||
if (!file || !file->Open() || !buffer || length <= 0) {
|
||||
if (!file || !file->is_open() || !buffer || length <= 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
rtc::scoped_ptr<uint8_t[]> byte_array(new uint8_t[8]);
|
||||
std::unique_ptr<uint8_t[]> byte_array(new uint8_t[8]);
|
||||
|
||||
size_t doubles_written = 0;
|
||||
|
||||
|
Reference in New Issue
Block a user