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

Side by Side Diff: webrtc/modules/video_coding/jitter_buffer.h

Issue 2123913002: Remove old WebRTC-NewVideoJitterBuffer used for testing the NackModule. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 5 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 | webrtc/modules/video_coding/jitter_buffer.cc » ('j') | 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) 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 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 // Returns a list of the sequence numbers currently missing. 195 // Returns a list of the sequence numbers currently missing.
196 std::vector<uint16_t> GetNackList(bool* request_key_frame); 196 std::vector<uint16_t> GetNackList(bool* request_key_frame);
197 197
198 // Set decode error mode - Should not be changed in the middle of the 198 // Set decode error mode - Should not be changed in the middle of the
199 // session. Changes will not influence frames already in the buffer. 199 // session. Changes will not influence frames already in the buffer.
200 void SetDecodeErrorMode(VCMDecodeErrorMode error_mode); 200 void SetDecodeErrorMode(VCMDecodeErrorMode error_mode);
201 VCMDecodeErrorMode decode_error_mode() const { return decode_error_mode_; } 201 VCMDecodeErrorMode decode_error_mode() const { return decode_error_mode_; }
202 202
203 void RegisterStatsCallback(VCMReceiveStatisticsCallback* callback); 203 void RegisterStatsCallback(VCMReceiveStatisticsCallback* callback);
204 204
205 int64_t TimeUntilNextProcess();
206 void Process();
207
208 private: 205 private:
209 class SequenceNumberLessThan { 206 class SequenceNumberLessThan {
210 public: 207 public:
211 bool operator()(const uint16_t& sequence_number1, 208 bool operator()(const uint16_t& sequence_number1,
212 const uint16_t& sequence_number2) const { 209 const uint16_t& sequence_number2) const {
213 return IsNewerSequenceNumber(sequence_number2, sequence_number1); 210 return IsNewerSequenceNumber(sequence_number2, sequence_number1);
214 } 211 }
215 }; 212 };
216 typedef std::set<uint16_t, SequenceNumberLessThan> SequenceNumberSet; 213 typedef std::set<uint16_t, SequenceNumberLessThan> SequenceNumberSet;
217 214
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
369 int max_packet_age_to_nack_; // Measured in sequence numbers. 366 int max_packet_age_to_nack_; // Measured in sequence numbers.
370 int max_incomplete_time_ms_; 367 int max_incomplete_time_ms_;
371 368
372 VCMDecodeErrorMode decode_error_mode_; 369 VCMDecodeErrorMode decode_error_mode_;
373 // Estimated rolling average of packets per frame 370 // Estimated rolling average of packets per frame
374 float average_packets_per_frame_; 371 float average_packets_per_frame_;
375 // average_packets_per_frame converges fast if we have fewer than this many 372 // average_packets_per_frame converges fast if we have fewer than this many
376 // frames. 373 // frames.
377 int frame_counter_; 374 int frame_counter_;
378 375
379 std::unique_ptr<NackModule> nack_module_;
380
381 RTC_DISALLOW_COPY_AND_ASSIGN(VCMJitterBuffer); 376 RTC_DISALLOW_COPY_AND_ASSIGN(VCMJitterBuffer);
382 }; 377 };
383 } // namespace webrtc 378 } // namespace webrtc
384 379
385 #endif // WEBRTC_MODULES_VIDEO_CODING_JITTER_BUFFER_H_ 380 #endif // WEBRTC_MODULES_VIDEO_CODING_JITTER_BUFFER_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/video_coding/jitter_buffer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698