Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(179)

Side by Side Diff: webrtc/modules/video_coding/utility/ivf_file_writer_unittest.cc

Issue 2190533004: Use a better method to generate a random ID in IvfFileWriterTest. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Reverting last patchset (was meant for another CL) Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include "webrtc/modules/video_coding/utility/ivf_file_writer.h" 11 #include "webrtc/modules/video_coding/utility/ivf_file_writer.h"
12 12
13 #include <memory> 13 #include <memory>
14 14
15 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
16 #include "webrtc/base/helpers.h"
16 #include "webrtc/base/logging.h" 17 #include "webrtc/base/logging.h"
17 #include "webrtc/base/thread.h" 18 #include "webrtc/base/thread.h"
18 #include "webrtc/base/timeutils.h" 19 #include "webrtc/base/timeutils.h"
19 #include "webrtc/modules/rtp_rtcp/source/byte_io.h" 20 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
20 #include "webrtc/test/testsupport/fileutils.h" 21 #include "webrtc/test/testsupport/fileutils.h"
21 22
22 namespace webrtc { 23 namespace webrtc {
23 24
24 namespace { 25 namespace {
25 static const int kHeaderSize = 32; 26 static const int kHeaderSize = 32;
26 static const int kFrameHeaderSize = 12; 27 static const int kFrameHeaderSize = 12;
27 static uint8_t dummy_payload[4] = {0, 1, 2, 3}; 28 static uint8_t dummy_payload[4] = {0, 1, 2, 3};
28 static const int kMaxFileRetries = 5; 29 static const int kMaxFileRetries = 5;
29 } // namespace 30 } // namespace
30 31
31 class IvfFileWriterTest : public ::testing::Test { 32 class IvfFileWriterTest : public ::testing::Test {
32 protected: 33 protected:
33 void SetUp() override { 34 void SetUp() override {
34 const int64_t start_id = 35 const uint64_t start_id = rtc::CreateRandomId64();
35 reinterpret_cast<int64_t>(this) ^ rtc::TimeMicros(); 36 uint64_t id = start_id;
36 int64_t id = start_id;
37 do { 37 do {
38 std::ostringstream oss; 38 std::ostringstream oss;
39 oss << test::OutputPath() << "ivf_test_file_" << id++ << ".ivf"; 39 oss << test::OutputPath() << "ivf_test_file_" << id++ << ".ivf";
40 file_name_ = oss.str(); 40 file_name_ = oss.str();
41 } while (id < start_id + 100 && FileExists(false)); 41 } while ((id - start_id) < 100u && FileExists(false));
42 ASSERT_LT(id, start_id + 100); 42 ASSERT_LT(id - start_id, 100u);
43 } 43 }
44 44
45 bool WriteDummyTestFrames(int width, 45 bool WriteDummyTestFrames(int width,
46 int height, 46 int height,
47 int num_frames, 47 int num_frames,
48 bool use_capture_tims_ms) { 48 bool use_capture_tims_ms) {
49 EncodedImage frame; 49 EncodedImage frame;
50 frame._buffer = dummy_payload; 50 frame._buffer = dummy_payload;
51 frame._encodedWidth = width; 51 frame._encodedWidth = width;
52 frame._encodedHeight = height; 52 frame._encodedHeight = height;
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 const uint8_t fourcc[4] = {'H', '2', '6', '4'}; 194 const uint8_t fourcc[4] = {'H', '2', '6', '4'};
195 RunBasicFileStructureTest(kVideoCodecH264, fourcc, false); 195 RunBasicFileStructureTest(kVideoCodecH264, fourcc, false);
196 } 196 }
197 197
198 TEST_F(IvfFileWriterTest, WritesBasicH264FileMsTimestamp) { 198 TEST_F(IvfFileWriterTest, WritesBasicH264FileMsTimestamp) {
199 const uint8_t fourcc[4] = {'H', '2', '6', '4'}; 199 const uint8_t fourcc[4] = {'H', '2', '6', '4'};
200 RunBasicFileStructureTest(kVideoCodecH264, fourcc, true); 200 RunBasicFileStructureTest(kVideoCodecH264, fourcc, true);
201 } 201 }
202 202
203 } // namespace webrtc 203 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698