| 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 PlayoutDelay kPlayoutDelayMs = {123, 321}; |
| 265 std::unique_ptr<FrameObjectFake> test_frame(new FrameObjectFake()); |
| 266 test_frame->SetPlayoutDelay(kPlayoutDelayMs); |
| 267 buffer_.InsertFrame(std::move(test_frame)); |
| 268 EXPECT_EQ(kPlayoutDelayMs.min_ms, timing_.min_playout_delay()); |
| 269 EXPECT_EQ(kPlayoutDelayMs.max_ms, timing_.max_playout_delay()); |
| 270 } |
| 271 |
| 263 // Flaky test, see bugs.webrtc.org/7068. | 272 // Flaky test, see bugs.webrtc.org/7068. |
| 264 TEST_F(TestFrameBuffer2, DISABLED_OneUnorderedSuperFrame) { | 273 TEST_F(TestFrameBuffer2, DISABLED_OneUnorderedSuperFrame) { |
| 265 uint16_t pid = Rand(); | 274 uint16_t pid = Rand(); |
| 266 uint32_t ts = Rand(); | 275 uint32_t ts = Rand(); |
| 267 | 276 |
| 268 ExtractFrame(50); | 277 ExtractFrame(50); |
| 269 InsertFrame(pid, 1, ts, true); | 278 InsertFrame(pid, 1, ts, true); |
| 270 InsertFrame(pid, 0, ts, false); | 279 InsertFrame(pid, 0, ts, false); |
| 271 ExtractFrame(); | 280 ExtractFrame(); |
| 272 | 281 |
| (...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 511 EXPECT_EQ(29806, InsertFrame(29806, 0, 1, false, 29805)); | 520 EXPECT_EQ(29806, InsertFrame(29806, 0, 1, false, 29805)); |
| 512 ExtractFrame(); | 521 ExtractFrame(); |
| 513 EXPECT_EQ(33819, InsertFrame(33819, 0, 1, false)); | 522 EXPECT_EQ(33819, InsertFrame(33819, 0, 1, false)); |
| 514 ExtractFrame(); | 523 ExtractFrame(); |
| 515 EXPECT_EQ(41248, InsertFrame(41248, 0, 1, false)); | 524 EXPECT_EQ(41248, InsertFrame(41248, 0, 1, false)); |
| 516 ExtractFrame(); | 525 ExtractFrame(); |
| 517 } | 526 } |
| 518 | 527 |
| 519 } // namespace video_coding | 528 } // namespace video_coding |
| 520 } // namespace webrtc | 529 } // namespace webrtc |
| OLD | NEW |