admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow null FILE* to AecDumpFactory::Create

Browse Source 
Also add Create method with a FileWrapper argument, extracted from cl
https://webrtc-review.googlesource.com/c/src/+/140283

Bug: webrtc:6463
Change-Id: If86f17d5fda964df0b5874bd5a15fcaed899dd4e
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/140946
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Alex Loiko <aleloi@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28211}
This commit is contained in:
Niels Möller 2019-06-10 11:55:59 +02:00 committed by Commit Bot
parent 8169db6df2
commit 646e096e03
5 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/audio_processing/aec_dump/BUILD.gn
View File

@ -17,6 +17,7 @@ rtc_source_set("aec_dump") {
deps = [
"../",
"../../../rtc_base:rtc_base_approved",
"../../../rtc_base/system:file_wrapper",
"../../../rtc_base/system:rtc_export",
]
}

5
modules/audio_processing/aec_dump/aec_dump_factory.h
View File

@ -16,6 +16,7 @@
#include "modules/audio_processing/include/aec_dump.h"
#include "rtc_base/platform_file.h"
#include "rtc_base/system/file_wrapper.h"
#include "rtc_base/system/rtc_export.h"
namespace rtc {
@ -32,6 +33,10 @@ class RTC_EXPORT AecDumpFactory {
// responsibility for |handle| and closes it in the destructor. A
// non-null return value indicates that the file has been
// sucessfully opened.
static std::unique_ptr<AecDump> Create(webrtc::FileWrapper&& file,
int64_t max_log_size_bytes,
rtc::TaskQueue* worker_queue);
// TODO(webrtc:6463): Deprecated. Delete, together with the PlatformFile type.
static std::unique_ptr<AecDump> Create(rtc::PlatformFile file,
int64_t max_log_size_bytes,
rtc::TaskQueue* worker_queue);

28
modules/audio_processing/aec_dump/aec_dump_impl.cc
View File

@ -216,36 +216,34 @@ std::unique_ptr<WriteToFileTask> AecDumpImpl::CreateWriteToFileTask() {
&num_bytes_left_for_log_);
}
std::unique_ptr<AecDump> AecDumpFactory::Create(rtc::PlatformFile file,
std::unique_ptr<AecDump> AecDumpFactory::Create(webrtc::FileWrapper&& file,
int64_t max_log_size_bytes,
rtc::TaskQueue* worker_queue) {
RTC_DCHECK(worker_queue);
FILE* handle = rtc::FdopenPlatformFileForWriting(file);
if (!handle) {
if (!file.is_open())
return nullptr;
}
return absl::make_unique<AecDumpImpl>(FileWrapper(handle), max_log_size_bytes,
return absl::make_unique<AecDumpImpl>(std::move(file), max_log_size_bytes,
worker_queue);
}
std::unique_ptr<AecDump> AecDumpFactory::Create(rtc::PlatformFile file,
int64_t max_log_size_bytes,
rtc::TaskQueue* worker_queue) {
return Create(FileWrapper(rtc::FdopenPlatformFileForWriting(file)),
max_log_size_bytes, worker_queue);
}
std::unique_ptr<AecDump> AecDumpFactory::Create(std::string file_name,
int64_t max_log_size_bytes,
rtc::TaskQueue* worker_queue) {
RTC_DCHECK(worker_queue);
FileWrapper debug_file = FileWrapper::OpenWriteOnly(file_name.c_str());
if (!debug_file.is_open()) {
return nullptr;
}
return absl::make_unique<AecDumpImpl>(std::move(debug_file),
return Create(FileWrapper::OpenWriteOnly(file_name.c_str()),
max_log_size_bytes, worker_queue);
}
std::unique_ptr<AecDump> AecDumpFactory::Create(FILE* handle,
int64_t max_log_size_bytes,
rtc::TaskQueue* worker_queue) {
RTC_DCHECK(worker_queue);
RTC_DCHECK(handle);
return absl::make_unique<AecDumpImpl>(FileWrapper(handle), max_log_size_bytes,
worker_queue);
return Create(FileWrapper(handle), max_log_size_bytes, worker_queue);
}
} // namespace webrtc

6
modules/audio_processing/aec_dump/null_aec_dump_factory.cc
View File

@ -13,6 +13,12 @@
namespace webrtc {
std::unique_ptr<AecDump> AecDumpFactory::Create(webrtc::FileWrapper&& file,
int64_t max_log_size_bytes,
rtc::TaskQueue* worker_queue) {
return nullptr;
}
std::unique_ptr<AecDump> AecDumpFactory::Create(rtc::PlatformFile file,
int64_t max_log_size_bytes,
rtc::TaskQueue* worker_queue) {

3
rtc_base/system/file_wrapper.h
View File

@ -44,7 +44,8 @@ class FileWrapper final {
FileWrapper() = default;
// Takes over ownership of |file|, closing it on destruction.
// Takes over ownership of |file|, closing it on destruction. Calling with
// null |file| is allowed, and results in a FileWrapper with is_open() false.
explicit FileWrapper(FILE* file) : file_(file) {}
~FileWrapper() { Close(); }