| OLD | NEW |
| 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 |
| (...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 253 | 253 |
| 254 InsertFrame(pid, 0, ts, false); | 254 InsertFrame(pid, 0, ts, false); |
| 255 ExtractFrame(); | 255 ExtractFrame(); |
| 256 InsertFrame(pid, 1, ts, true); | 256 InsertFrame(pid, 1, ts, true); |
| 257 ExtractFrame(); | 257 ExtractFrame(); |
| 258 | 258 |
| 259 CheckFrame(0, pid, 0); | 259 CheckFrame(0, pid, 0); |
| 260 CheckFrame(1, pid, 1); | 260 CheckFrame(1, pid, 1); |
| 261 } | 261 } |
| 262 | 262 |
| 263 TEST_F(TestFrameBuffer2, SetPlayoutDelay) { |
| 264 const int kMinimalPlayoutDelayMs = 200; |
| 265 const int kMaximalPlayoutDelayMs = 1234; |
| 266 std::unique_ptr<FrameObjectFake> test_frame(new FrameObjectFake()); |
| 267 test_frame->SetPlayoutDelay(kMinimalPlayoutDelayMs, kMaximalPlayoutDelayMs); |
| 268 buffer_.InsertFrame(std::move(test_frame)); |
| 269 EXPECT_EQ(kMinimalPlayoutDelayMs, timing_.min_playout_delay()); |
| 270 EXPECT_EQ(kMaximalPlayoutDelayMs, timing_.max_playout_delay()); |
| 271 } |
| 272 |
| 263 // Flaky test, see bugs.webrtc.org/7068. | 273 // Flaky test, see bugs.webrtc.org/7068. |
| 264 TEST_F(TestFrameBuffer2, DISABLED_OneUnorderedSuperFrame) { | 274 TEST_F(TestFrameBuffer2, DISABLED_OneUnorderedSuperFrame) { |
| 265 uint16_t pid = Rand(); | 275 uint16_t pid = Rand(); |
| 266 uint32_t ts = Rand(); | 276 uint32_t ts = Rand(); |
| 267 | 277 |
| 268 ExtractFrame(50); | 278 ExtractFrame(50); |
| 269 InsertFrame(pid, 1, ts, true); | 279 InsertFrame(pid, 1, ts, true); |
| 270 InsertFrame(pid, 0, ts, false); | 280 InsertFrame(pid, 0, ts, false); |
| 271 ExtractFrame(); | 281 ExtractFrame(); |
| 272 | 282 |
| (...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 517 } | 527 } |
| 518 | 528 |
| 519 TEST_F(TestFrameBuffer2, DuplicateFrames) { | 529 TEST_F(TestFrameBuffer2, DuplicateFrames) { |
| 520 EXPECT_EQ(22256, InsertFrame(22256, 0, 1, false)); | 530 EXPECT_EQ(22256, InsertFrame(22256, 0, 1, false)); |
| 521 ExtractFrame(); | 531 ExtractFrame(); |
| 522 EXPECT_EQ(22256, InsertFrame(22256, 0, 1, false)); | 532 EXPECT_EQ(22256, InsertFrame(22256, 0, 1, false)); |
| 523 } | 533 } |
| 524 | 534 |
| 525 } // namespace video_coding | 535 } // namespace video_coding |
| 526 } // namespace webrtc | 536 } // namespace webrtc |
| OLD | NEW |