commit fbdea257611c590d52de037e28ab830a869976c9
author pbos@webrtc.org <pbos@webrtc.org> Fri Oct 31 12:59:34 2014
committer pbos@webrtc.org <pbos@webrtc.org> Fri Oct 31 12:59:34 2014
tree e318a8ab222ebbf787398663c330cf88dfa0d92c
parent 4ef173b6c92f0708ac4f8dd27e4c709e7994c956

Configure A/V sync in WebRtcVideoEngine2.

Sets up A/V sync for the first video receive channel with the default
voice channel. This is only done when conference mode is disabled to
preserve existing behavior. Ideally we'd know which voice channel to
sync with here.

R=mflodman@webrtc.org, stefan@webrtc.org
BUG=1788

Review URL: https://webrtc-codereview.appspot.com/23249004

git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@7577 4adac7df-926f-26a2-2b94-8c16560cd09d

video/video_receive_stream.cc

diff --git a/video/video_receive_stream.cc b/video/video_receive_stream.cc
index 78dc64a..b182240 100644
--- a/video/video_receive_stream.cc
+++ b/video/video_receive_stream.cc
@@ -190,7 +190,7 @@
 
   render_->AddRenderCallback(channel_, this);
 
-  if (voice_engine) {
+  if (voice_engine && config_.audio_channel_id != -1) {
     video_engine_base_->SetVoiceEngine(voice_engine);
     video_engine_base_->ConnectAudioChannel(channel_, config_.audio_channel_id);
   }

video_receive_stream.h

diff --git a/video_receive_stream.h b/video_receive_stream.h
index 2db2a0c..5ab898c 100644
--- a/video_receive_stream.h
+++ b/video_receive_stream.h
@@ -85,7 +85,7 @@
     Config()
         : renderer(NULL),
           render_delay_ms(0),
-          audio_channel_id(0),
+          audio_channel_id(-1),
           pre_decode_callback(NULL),
           pre_render_callback(NULL),
           target_delay_ms(0) {}