| 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> |
| 18 |
| 17 #include "webrtc/base/criticalsection.h" | 19 #include "webrtc/base/criticalsection.h" |
| 18 #include "webrtc/base/scoped_ptr.h" | |
| 19 #include "webrtc/modules/include/module.h" | 20 #include "webrtc/modules/include/module.h" |
| 20 #include "webrtc/system_wrappers/include/tick_util.h" | 21 #include "webrtc/system_wrappers/include/tick_util.h" |
| 21 #include "webrtc/video/stream_synchronization.h" | 22 #include "webrtc/video/stream_synchronization.h" |
| 22 #include "webrtc/voice_engine/include/voe_video_sync.h" | 23 #include "webrtc/voice_engine/include/voe_video_sync.h" |
| 23 | 24 |
| 24 namespace webrtc { | 25 namespace webrtc { |
| 25 | 26 |
| 26 class RtpRtcp; | 27 class RtpRtcp; |
| 27 class VideoCodingModule; | 28 class VideoCodingModule; |
| 28 class ViEChannel; | 29 class ViEChannel; |
| (...skipping 14 matching lines...) Expand all Loading... |
| 43 void Process() override; | 44 void Process() override; |
| 44 | 45 |
| 45 private: | 46 private: |
| 46 rtc::CriticalSection data_cs_; | 47 rtc::CriticalSection data_cs_; |
| 47 VideoCodingModule* const vcm_; | 48 VideoCodingModule* const vcm_; |
| 48 RtpReceiver* video_receiver_; | 49 RtpReceiver* video_receiver_; |
| 49 RtpRtcp* video_rtp_rtcp_; | 50 RtpRtcp* video_rtp_rtcp_; |
| 50 int voe_channel_id_; | 51 int voe_channel_id_; |
| 51 VoEVideoSync* voe_sync_interface_; | 52 VoEVideoSync* voe_sync_interface_; |
| 52 TickTime last_sync_time_; | 53 TickTime last_sync_time_; |
| 53 rtc::scoped_ptr<StreamSynchronization> sync_; | 54 std::unique_ptr<StreamSynchronization> sync_; |
| 54 StreamSynchronization::Measurements audio_measurement_; | 55 StreamSynchronization::Measurements audio_measurement_; |
| 55 StreamSynchronization::Measurements video_measurement_; | 56 StreamSynchronization::Measurements video_measurement_; |
| 56 }; | 57 }; |
| 57 | 58 |
| 58 } // namespace webrtc | 59 } // namespace webrtc |
| 59 | 60 |
| 60 #endif // WEBRTC_VIDEO_VIE_SYNC_MODULE_H_ | 61 #endif // WEBRTC_VIDEO_VIE_SYNC_MODULE_H_ |
| OLD | NEW |