Base A/V synchronization on sync_labels.

webrtc/video/video_receive_stream.h

Index: webrtc/video/video_receive_stream.h
diff --git a/webrtc/video/video_receive_stream.h b/webrtc/video/video_receive_stream.h
index e9df849c0cb741e33dd583655a11bd87c023cf55..af341a9b11a2ed9c46215c1a517866f0d50fd8b3 100644
--- a/webrtc/video/video_receive_stream.h
+++ b/webrtc/video/video_receive_stream.h
@@ -57,11 +57,15 @@ class VideoReceiveStream : public webrtc::VideoReceiveStream,
   int RenderFrame(const uint32_t /*stream_id*/,
                   const VideoFrame& video_frame) override;
 
+  const Config& config() const { return config_; }
+
   void SignalNetworkState(Call::NetworkState state);
 
   bool DeliverRtcp(const uint8_t* packet, size_t length);
   bool DeliverRtp(const uint8_t* packet, size_t length);
 
+  void SetSyncChannel(VoiceEngine* voice_engine, int audio_channel_id);
+
  private:
   void SetRtcpMode(newapi::RtcpMode mode);
 
@@ -76,8 +80,6 @@ class VideoReceiveStream : public webrtc::VideoReceiveStream,
   ViEChannel* vie_channel_;
   rtc::scoped_ptr<IncomingVideoStream> incoming_video_stream_;
 
-  VoEVideoSync* voe_sync_interface_;
-
   rtc::scoped_ptr<ReceiveStatisticsProxy> stats_proxy_;
 };
 }  // namespace internal