zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix VideoFileWriterTest flakiness by using unique file path.

Browse Source 
Both reference and tested videos were created
via a file whose path was fixed.
So, when tests were launched in parallel, race conditions ensued.
This CL creates an unique temporary filename for each video.

Bug: webrtc:10156
Change-Id: Ie3abf85abdfa95735cb86880bbd6a59393e609c1
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/127883
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Reviewed-by: Paulina Hensman <phensman@webrtc.org>
Commit-Queue: Yves Gerey <yvesg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27219}
This commit is contained in:
Yves Gerey
2019-03-21 11:22:42 +01:00
committed by Commit Bot
parent d2a637858a
commit 3cb5e5bea2
3 changed files with 86 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
rtc_tools/video_file_writer.cc
View File

@ -20,17 +20,19 @@
namespace webrtc {
namespace test {
namespace {
void WriteVideoToFile(const rtc::scoped_refptr<Video>& video,
const std::string& file_name,
int fps) {
int fps,
bool isY4m) {
RTC_CHECK(video);
FILE* output_file = fopen(file_name.c_str(), "wb");
if (output_file == nullptr) {
RTC_LOG(LS_ERROR) << "Could not open file for writing: " << file_name;
return;
}
bool isY4m = absl::EndsWith(file_name, ".y4m");
if (isY4m) {
fprintf(output_file, "YUV4MPEG2 W%d H%d F%d:1 C420\n", video->width(),
video->height(), fps);
@ -41,6 +43,8 @@ void WriteVideoToFile(const rtc::scoped_refptr<Video>& video,
fwrite(frame.c_str(), 1, 6, output_file);
}
rtc::scoped_refptr<I420BufferInterface> buffer = video->GetFrame(i);
RTC_CHECK(buffer) << "Frame: " << i
<< "\nWhile trying to create: " << file_name;
const uint8_t* data_y = buffer->DataY();
int stride = buffer->StrideY();
for (int i = 0; i < video->height(); ++i) {
@ -63,5 +67,26 @@ void WriteVideoToFile(const rtc::scoped_refptr<Video>& video,
fclose(output_file);
}
} // Anonymous namespace
void WriteVideoToFile(const rtc::scoped_refptr<Video>& video,
const std::string& file_name,
int fps) {
WriteVideoToFile(video, file_name, fps,
/*isY4m=*/absl::EndsWith(file_name, ".y4m"));
}
void WriteY4mVideoToFile(const rtc::scoped_refptr<Video>& video,
const std::string& file_name,
int fps) {
WriteVideoToFile(video, file_name, fps, /*isY4m=*/true);
}
void WriteYuvVideoToFile(const rtc::scoped_refptr<Video>& video,
const std::string& file_name,
int fps) {
WriteVideoToFile(video, file_name, fps, /*isY4m=*/false);
}
} // namespace test
} // namespace webrtc