| Index: webrtc/video/rtp_streams_synchronizer.h
|
| diff --git a/webrtc/video/rtp_streams_synchronizer.h b/webrtc/video/rtp_streams_synchronizer.h
|
| index bc24d6f8071762c390b3a2e42cbbcaba1ef5afc2..86de4c225f14568753d515cd1b391ce4797945d9 100644
|
| --- a/webrtc/video/rtp_streams_synchronizer.h
|
| +++ b/webrtc/video/rtp_streams_synchronizer.h
|
| @@ -25,8 +25,8 @@
|
| namespace webrtc {
|
|
|
| class Clock;
|
| +class Syncable;
|
| class VideoFrame;
|
| -class VoEVideoSync;
|
|
|
| namespace vcm {
|
| class VideoReceiver;
|
| @@ -37,8 +37,7 @@ class RtpStreamsSynchronizer : public Module {
|
| RtpStreamsSynchronizer(vcm::VideoReceiver* vcm,
|
| RtpStreamReceiver* rtp_stream_receiver);
|
|
|
| - void ConfigureSync(int voe_channel_id,
|
| - VoEVideoSync* voe_sync_interface);
|
| + void ConfigureSync(Syncable* syncable);
|
|
|
| // Implements Module.
|
| int64_t TimeUntilNextProcess() override;
|
| @@ -59,10 +58,7 @@ class RtpStreamsSynchronizer : public Module {
|
| RtpRtcp* const video_rtp_rtcp_;
|
|
|
| rtc::CriticalSection crit_;
|
| - int voe_channel_id_ GUARDED_BY(crit_);
|
| - VoEVideoSync* voe_sync_interface_ GUARDED_BY(crit_);
|
| - RtpReceiver* audio_rtp_receiver_ GUARDED_BY(crit_);
|
| - RtpRtcp* audio_rtp_rtcp_ GUARDED_BY(crit_);
|
| + Syncable* syncable_ GUARDED_BY(crit_);
|
| std::unique_ptr<StreamSynchronization> sync_ GUARDED_BY(crit_);
|
| StreamSynchronization::Measurements audio_measurement_ GUARDED_BY(crit_);
|
| StreamSynchronization::Measurements video_measurement_ GUARDED_BY(crit_);
|
|
|