Experiment for the nack module.

webrtc/modules/video_coding/jitter_buffer.h

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #ifndef WEBRTC_MODULES_VIDEO_CODING_JITTER_BUFFER_H_
 #define WEBRTC_MODULES_VIDEO_CODING_JITTER_BUFFER_H_
 
 #include <list>
 #include <map>
 #include <memory>
 #include <set>
 #include <vector>
 
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/base/thread_annotations.h"
 #include "webrtc/modules/include/module_common_types.h"
+#include "webrtc/modules/utility/include/process_thread.h"
 #include "webrtc/modules/video_coding/include/video_coding.h"
 #include "webrtc/modules/video_coding/include/video_coding_defines.h"
 #include "webrtc/modules/video_coding/decoding_state.h"
 #include "webrtc/modules/video_coding/inter_frame_delay.h"
 #include "webrtc/modules/video_coding/jitter_buffer_common.h"
 #include "webrtc/modules/video_coding/jitter_estimator.h"
+#include "webrtc/modules/video_coding/nack_module.h"
 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
 
 enum VCMNackMode { kNack, kNoNack };
 
 // forward declarations
 class Clock;
 class EventFactory;
@@ skipping 58 matching lines @@
   // Advances the oldest SS data to handle timestamp wrap in cases where SS data
   // are received very seldom (e.g. only once in beginning, second when
   // IsNewerTimestamp is not true).
   void AdvanceFront(uint32_t timestamp);
 
   SsMap ss_map_;
 };
 
 class VCMJitterBuffer {
  public:
-  VCMJitterBuffer(Clock* clock, std::unique_ptr<EventWrapper> event);
+  VCMJitterBuffer(Clock* clock,
+                  std::unique_ptr<EventWrapper> event,
+                  NackSender* nack_sender = nullptr,
+                  KeyFrameRequestSender* keyframe_request_sender = nullptr);
 
   ~VCMJitterBuffer();
 
   // Initializes and starts jitter buffer.
   void Start();
 
   // Signals all internal events and stops the jitter buffer.
   void Stop();
 
   // Returns true if the jitter buffer is running.
@@ skipping 88 matching lines @@
   void SetDecodeErrorMode(VCMDecodeErrorMode error_mode);
   int64_t LastDecodedTimestamp() const;
   VCMDecodeErrorMode decode_error_mode() const { return decode_error_mode_; }
 
   // Used to compute time of complete continuous frames. Returns the timestamps
   // corresponding to the start and end of the continuous complete buffer.
   void RenderBufferSize(uint32_t* timestamp_start, uint32_t* timestamp_end);
 
   void RegisterStatsCallback(VCMReceiveStatisticsCallback* callback);
 
+  int64_t TimeUntilNextProcess();
+  void Process();
+
  private:
   class SequenceNumberLessThan {
    public:
     bool operator()(const uint16_t& sequence_number1,
                     const uint16_t& sequence_number2) const {
       return IsNewerSequenceNumber(sequence_number2, sequence_number1);
     }
   };
   typedef std::set<uint16_t, SequenceNumberLessThan> SequenceNumberSet;
 
@@ skipping 150 matching lines @@
   size_t max_nack_list_size_;
   int max_packet_age_to_nack_;  // Measured in sequence numbers.
   int max_incomplete_time_ms_;
 
   VCMDecodeErrorMode decode_error_mode_;
   // Estimated rolling average of packets per frame
   float average_packets_per_frame_;
   // average_packets_per_frame converges fast if we have fewer than this many
   // frames.
   int frame_counter_;
+
+  std::unique_ptr<NackModule> nack_module_;
+
   RTC_DISALLOW_COPY_AND_ASSIGN(VCMJitterBuffer);
 };
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_VIDEO_CODING_JITTER_BUFFER_H_