| OLD | NEW | 
|   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  | 
|  11 // ViESyncModule is responsible for synchronization audio and video for a given |  11 // ViESyncModule is responsible for synchronization audio and video for a given | 
|  12 // VoE and ViE channel couple. |  12 // VoE and ViE channel couple. | 
|  13  |  13  | 
|  14 #ifndef WEBRTC_VIDEO_VIE_SYNC_MODULE_H_ |  14 #ifndef WEBRTC_VIDEO_VIE_SYNC_MODULE_H_ | 
|  15 #define WEBRTC_VIDEO_VIE_SYNC_MODULE_H_ |  15 #define WEBRTC_VIDEO_VIE_SYNC_MODULE_H_ | 
|  16  |  16  | 
|  17 #include <memory> |  17 #include <memory> | 
|  18  |  18  | 
|  19 #include "webrtc/base/criticalsection.h" |  19 #include "webrtc/base/criticalsection.h" | 
|  20 #include "webrtc/modules/include/module.h" |  20 #include "webrtc/modules/include/module.h" | 
|  21 #include "webrtc/system_wrappers/include/tick_util.h" |  | 
|  22 #include "webrtc/video/stream_synchronization.h" |  21 #include "webrtc/video/stream_synchronization.h" | 
|  23 #include "webrtc/voice_engine/include/voe_video_sync.h" |  22 #include "webrtc/voice_engine/include/voe_video_sync.h" | 
|  24  |  23  | 
|  25 namespace webrtc { |  24 namespace webrtc { | 
|  26  |  25  | 
|  27 class Clock; |  26 class Clock; | 
|  28 class RtpRtcp; |  27 class RtpRtcp; | 
|  29 class VideoFrame; |  28 class VideoFrame; | 
|  30 class ViEChannel; |  29 class ViEChannel; | 
|  31 class VoEVideoSync; |  30 class VoEVideoSync; | 
| (...skipping 22 matching lines...) Expand all  Loading... | 
|  54                                int64_t* stream_offset_ms) const; |  53                                int64_t* stream_offset_ms) const; | 
|  55  |  54  | 
|  56  private: |  55  private: | 
|  57   rtc::CriticalSection data_cs_; |  56   rtc::CriticalSection data_cs_; | 
|  58   vcm::VideoReceiver* const video_receiver_; |  57   vcm::VideoReceiver* const video_receiver_; | 
|  59   Clock* const clock_; |  58   Clock* const clock_; | 
|  60   RtpReceiver* rtp_receiver_; |  59   RtpReceiver* rtp_receiver_; | 
|  61   RtpRtcp* video_rtp_rtcp_; |  60   RtpRtcp* video_rtp_rtcp_; | 
|  62   int voe_channel_id_; |  61   int voe_channel_id_; | 
|  63   VoEVideoSync* voe_sync_interface_; |  62   VoEVideoSync* voe_sync_interface_; | 
|  64   TickTime last_sync_time_; |  63   int64_t last_sync_time_; | 
|  65   std::unique_ptr<StreamSynchronization> sync_; |  64   std::unique_ptr<StreamSynchronization> sync_; | 
|  66   StreamSynchronization::Measurements audio_measurement_; |  65   StreamSynchronization::Measurements audio_measurement_; | 
|  67   StreamSynchronization::Measurements video_measurement_; |  66   StreamSynchronization::Measurements video_measurement_; | 
|  68 }; |  67 }; | 
|  69  |  68  | 
|  70 }  // namespace webrtc |  69 }  // namespace webrtc | 
|  71  |  70  | 
|  72 #endif  // WEBRTC_VIDEO_VIE_SYNC_MODULE_H_ |  71 #endif  // WEBRTC_VIDEO_VIE_SYNC_MODULE_H_ | 
| OLD | NEW |