Base A/V synchronization on sync_labels.

webrtc/audio_receive_stream.h

Index: webrtc/audio_receive_stream.h
diff --git a/webrtc/audio_receive_stream.h b/webrtc/audio_receive_stream.h
index c68d2647f20beb2142877558686764783f4b6571..64f760f98f9985603088775df9f693bc219eea01 100644
--- a/webrtc/audio_receive_stream.h
+++ b/webrtc/audio_receive_stream.h
@@ -43,6 +43,16 @@ class AudioReceiveStream {
       std::vector<RtpExtension> extensions;
     } rtp;
 
+    // Underlying VoiceEngine handle, used to map AudioReceiveStream to
+    // lower-level components. Temporarily used while VoiceEngine channels are
+    // created outside of Call.
+    int voe_channel_id = -1;
+
+    // Identifier for an A/V synchronization group. Empty string to disable.
+    // TODO(pbos): Synchronize streams in a sync group, not just video streams
+    // to one of the audio streams. Tracked by issue webrtc:4762.

[stefan-webrtc, 2015/06/22 14:19:42]

"...not just one video stream to one of the audio streams.", right? We can't
sync two video streams to one audio stream AFAIK.

[pbos-webrtc, 2015/06/24 09:46:09]

Correct, done.

+    std::string sync_group;
+
     // Decoders for every payload that we can receive. Call owns the
     // AudioDecoder instances once the Config is submitted to
     // Call::CreateReceiveStream().