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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/modules/video_coding/main/source/receiver_unittest.cc

Issue 1371043003: Unify FrameType and VideoFrameType. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 3 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 side-by-side diff with in-line comments
Download patch
« webrtc/modules/video_coding/main/source/generic_encoder.cc ('K') | « webrtc/modules/video_coding/main/source/packet.cc ('k') | webrtc/modules/video_coding/main/source/session_info.cc » ('j') | webrtc/modules/video_coding/main/source/session_info.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/video_coding/main/source/receiver_unittest.cc
diff --git a/webrtc/modules/video_coding/main/source/receiver_unittest.cc b/webrtc/modules/video_coding/main/source/receiver_unittest.cc
index eb5e4718ce7395d618372b70c90305021a7b38cf..1145be2b42b576692314f9cbaad4e6e72f5f3927 100644
--- a/webrtc/modules/video_coding/main/source/receiver_unittest.cc
+++ b/webrtc/modules/video_coding/main/source/receiver_unittest.cc
@@ -63,10 +63,8 @@ class TestVCMReceiver : public ::testing::Test {
int32_t InsertFrame(FrameType frame_type, bool complete) {
int num_of_packets = complete ? 1 : 2;
stream_generator_->GenerateFrame(
- frame_type,
- (frame_type != kFrameEmpty) ? num_of_packets : 0,
- (frame_type == kFrameEmpty) ? 1 : 0,
- clock_->TimeInMilliseconds());
+ frame_type, (frame_type != kSkipFrame) ? num_of_packets : 0,
+ (frame_type == kSkipFrame) ? 1 : 0, clock_->TimeInMilliseconds());
int32_t ret = InsertPacketAndPop(0);
if (!complete) {
// Drop the second packet.
« webrtc/modules/video_coding/main/source/generic_encoder.cc ('K') | « webrtc/modules/video_coding/main/source/packet.cc ('k') | webrtc/modules/video_coding/main/source/session_info.cc » ('j') | webrtc/modules/video_coding/main/source/session_info.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698