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

Side by Side Diff: webrtc/modules/video_coding/video_coding_robustness_unittest.cc

Issue 1736663004: Revert of Remove ignored return code from modules. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 10 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 InsertPacket(3000, 4, false, false, kVideoFrameDelta); 106 InsertPacket(3000, 4, false, false, kVideoFrameDelta);
107 InsertPacket(3000, 5, false, true, kVideoFrameDelta); 107 InsertPacket(3000, 5, false, true, kVideoFrameDelta);
108 clock_->AdvanceTimeMilliseconds(1000 / 30); 108 clock_->AdvanceTimeMilliseconds(1000 / 30);
109 109
110 ASSERT_EQ(VCM_OK, vcm_->Decode(0)); 110 ASSERT_EQ(VCM_OK, vcm_->Decode(0));
111 ASSERT_EQ(VCM_OK, vcm_->Decode(0)); 111 ASSERT_EQ(VCM_OK, vcm_->Decode(0));
112 ASSERT_EQ(VCM_FRAME_NOT_READY, vcm_->Decode(0)); 112 ASSERT_EQ(VCM_FRAME_NOT_READY, vcm_->Decode(0));
113 113
114 clock_->AdvanceTimeMilliseconds(10); 114 clock_->AdvanceTimeMilliseconds(10);
115 115
116 vcm_->Process(); 116 ASSERT_EQ(VCM_OK, vcm_->Process());
117 117
118 ASSERT_EQ(VCM_FRAME_NOT_READY, vcm_->Decode(0)); 118 ASSERT_EQ(VCM_FRAME_NOT_READY, vcm_->Decode(0));
119 119
120 InsertPacket(6000, 8, false, true, kVideoFrameDelta); 120 InsertPacket(6000, 8, false, true, kVideoFrameDelta);
121 clock_->AdvanceTimeMilliseconds(10); 121 clock_->AdvanceTimeMilliseconds(10);
122 vcm_->Process(); 122 ASSERT_EQ(VCM_OK, vcm_->Process());
123 123
124 ASSERT_EQ(VCM_FRAME_NOT_READY, vcm_->Decode(0)); 124 ASSERT_EQ(VCM_FRAME_NOT_READY, vcm_->Decode(0));
125 125
126 InsertPacket(6000, 6, true, false, kVideoFrameDelta); 126 InsertPacket(6000, 6, true, false, kVideoFrameDelta);
127 InsertPacket(6000, 7, false, false, kVideoFrameDelta); 127 InsertPacket(6000, 7, false, false, kVideoFrameDelta);
128 clock_->AdvanceTimeMilliseconds(10); 128 clock_->AdvanceTimeMilliseconds(10);
129 vcm_->Process(); 129 ASSERT_EQ(VCM_OK, vcm_->Process());
130 130
131 ASSERT_EQ(VCM_OK, vcm_->Decode(0)); 131 ASSERT_EQ(VCM_OK, vcm_->Decode(0));
132 } 132 }
133 133
134 TEST_F(VCMRobustnessTest, TestHardNackNoneDecoded) { 134 TEST_F(VCMRobustnessTest, TestHardNackNoneDecoded) {
135 EXPECT_CALL(request_callback_, ResendPackets(_, _)).Times(0); 135 EXPECT_CALL(request_callback_, ResendPackets(_, _)).Times(0);
136 EXPECT_CALL(frame_type_callback_, RequestKeyFrame()).Times(1); 136 EXPECT_CALL(frame_type_callback_, RequestKeyFrame()).Times(1);
137 137
138 ASSERT_EQ(VCM_OK, vcm_->SetReceiverRobustnessMode( 138 ASSERT_EQ(VCM_OK, vcm_->SetReceiverRobustnessMode(
139 VideoCodingModule::kHardNack, kNoErrors)); 139 VideoCodingModule::kHardNack, kNoErrors));
140 140
141 InsertPacket(3000, 3, true, false, kVideoFrameDelta); 141 InsertPacket(3000, 3, true, false, kVideoFrameDelta);
142 InsertPacket(3000, 4, false, false, kVideoFrameDelta); 142 InsertPacket(3000, 4, false, false, kVideoFrameDelta);
143 InsertPacket(3000, 5, false, true, kVideoFrameDelta); 143 InsertPacket(3000, 5, false, true, kVideoFrameDelta);
144 144
145 EXPECT_EQ(VCM_FRAME_NOT_READY, vcm_->Decode(0)); 145 EXPECT_EQ(VCM_FRAME_NOT_READY, vcm_->Decode(0));
146 vcm_->Process(); 146 ASSERT_EQ(VCM_OK, vcm_->Process());
147 147
148 clock_->AdvanceTimeMilliseconds(10); 148 clock_->AdvanceTimeMilliseconds(10);
149 149
150 EXPECT_EQ(VCM_FRAME_NOT_READY, vcm_->Decode(0)); 150 EXPECT_EQ(VCM_FRAME_NOT_READY, vcm_->Decode(0));
151 vcm_->Process(); 151 ASSERT_EQ(VCM_OK, vcm_->Process());
152 } 152 }
153 153
154 TEST_F(VCMRobustnessTest, TestModeNoneWithErrors) { 154 TEST_F(VCMRobustnessTest, TestModeNoneWithErrors) {
155 EXPECT_CALL(decoder_, InitDecode(_, _)).Times(1); 155 EXPECT_CALL(decoder_, InitDecode(_, _)).Times(1);
156 EXPECT_CALL(decoder_, Release()).Times(1); 156 EXPECT_CALL(decoder_, Release()).Times(1);
157 Sequence s1; 157 Sequence s1;
158 EXPECT_CALL(request_callback_, ResendPackets(_, 1)) 158 EXPECT_CALL(request_callback_, ResendPackets(_, 1))
159 .With(Args<0, 1>(ElementsAre(4))) 159 .With(Args<0, 1>(ElementsAre(4)))
160 .Times(0); 160 .Times(0);
161 161
(...skipping 26 matching lines...) Expand all
188 .Times(1) 188 .Times(1)
189 .InSequence(s1); 189 .InSequence(s1);
190 190
191 ASSERT_EQ(VCM_OK, vcm_->SetReceiverRobustnessMode(VideoCodingModule::kNone, 191 ASSERT_EQ(VCM_OK, vcm_->SetReceiverRobustnessMode(VideoCodingModule::kNone,
192 kWithErrors)); 192 kWithErrors));
193 193
194 InsertPacket(0, 0, true, false, kVideoFrameKey); 194 InsertPacket(0, 0, true, false, kVideoFrameKey);
195 InsertPacket(0, 1, false, false, kVideoFrameKey); 195 InsertPacket(0, 1, false, false, kVideoFrameKey);
196 InsertPacket(0, 2, false, true, kVideoFrameKey); 196 InsertPacket(0, 2, false, true, kVideoFrameKey);
197 EXPECT_EQ(VCM_OK, vcm_->Decode(33)); // Decode timestamp 0. 197 EXPECT_EQ(VCM_OK, vcm_->Decode(33)); // Decode timestamp 0.
198 vcm_->Process(); 198 EXPECT_EQ(VCM_OK, vcm_->Process()); // Expect no NACK list.
199 199
200 clock_->AdvanceTimeMilliseconds(33); 200 clock_->AdvanceTimeMilliseconds(33);
201 InsertPacket(3000, 3, true, false, kVideoFrameDelta); 201 InsertPacket(3000, 3, true, false, kVideoFrameDelta);
202 // Packet 4 missing 202 // Packet 4 missing
203 InsertPacket(3000, 5, false, true, kVideoFrameDelta); 203 InsertPacket(3000, 5, false, true, kVideoFrameDelta);
204 EXPECT_EQ(VCM_FRAME_NOT_READY, vcm_->Decode(0)); 204 EXPECT_EQ(VCM_FRAME_NOT_READY, vcm_->Decode(0));
205 vcm_->Process(); 205 EXPECT_EQ(VCM_OK, vcm_->Process()); // Expect no NACK list.
206 206
207 clock_->AdvanceTimeMilliseconds(33); 207 clock_->AdvanceTimeMilliseconds(33);
208 InsertPacket(6000, 6, true, false, kVideoFrameDelta); 208 InsertPacket(6000, 6, true, false, kVideoFrameDelta);
209 InsertPacket(6000, 7, false, false, kVideoFrameDelta); 209 InsertPacket(6000, 7, false, false, kVideoFrameDelta);
210 InsertPacket(6000, 8, false, true, kVideoFrameDelta); 210 InsertPacket(6000, 8, false, true, kVideoFrameDelta);
211 EXPECT_EQ(VCM_OK, vcm_->Decode(0)); // Decode timestamp 3000 incomplete. 211 EXPECT_EQ(VCM_OK, vcm_->Decode(0)); // Decode timestamp 3000 incomplete.
212 vcm_->Process(); 212 EXPECT_EQ(VCM_OK, vcm_->Process()); // Expect no NACK list.
213 213
214 clock_->AdvanceTimeMilliseconds(10); 214 clock_->AdvanceTimeMilliseconds(10);
215 EXPECT_EQ(VCM_OK, vcm_->Decode(23)); // Decode timestamp 6000 complete. 215 EXPECT_EQ(VCM_OK, vcm_->Decode(23)); // Decode timestamp 6000 complete.
216 vcm_->Process(); 216 EXPECT_EQ(VCM_OK, vcm_->Process()); // Expect no NACK list.
217 217
218 clock_->AdvanceTimeMilliseconds(23); 218 clock_->AdvanceTimeMilliseconds(23);
219 InsertPacket(3000, 4, false, false, kVideoFrameDelta); 219 InsertPacket(3000, 4, false, false, kVideoFrameDelta);
220 220
221 InsertPacket(9000, 9, true, false, kVideoFrameDelta); 221 InsertPacket(9000, 9, true, false, kVideoFrameDelta);
222 InsertPacket(9000, 10, false, false, kVideoFrameDelta); 222 InsertPacket(9000, 10, false, false, kVideoFrameDelta);
223 InsertPacket(9000, 11, false, true, kVideoFrameDelta); 223 InsertPacket(9000, 11, false, true, kVideoFrameDelta);
224 EXPECT_EQ(VCM_OK, vcm_->Decode(33)); // Decode timestamp 9000 complete. 224 EXPECT_EQ(VCM_OK, vcm_->Decode(33)); // Decode timestamp 9000 complete.
225 } 225 }
226 } // namespace webrtc 226 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/video_coding/video_coding_impl.cc ('k') | webrtc/modules/video_coding/video_receiver.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698