diff options
| author | pbos <pbos@webrtc.org> | 2015-07-15 08:02:58 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-15 15:03:04 +0000 |
| commit | 8fc7fa798f7a36955f1b933980401afad2aff592 (patch) | |
| tree | 805c4ce0733d7c1335e45672fad7f3c99681add3 /webrtc/video_receive_stream.h | |
| parent | 9c261f2d13793fbb5a0d07b26bec4154bc38342b (diff) | |
| download | webrtc-8fc7fa798f7a36955f1b933980401afad2aff592.tar.gz | |
Base A/V synchronization on sync_labels.
Groups of streams that should be synchronized are signalled through
SDP. These should be used rather than synchronizing the first-added
video stream to the first-added audio stream implicitly.
BUG=webrtc:4667
R=hta@webrtc.org, solenberg@webrtc.org, stefan@webrtc.org
TBR=mflodman@webrtc.org
Review URL: https://codereview.webrtc.org/1181653002
Cr-Commit-Position: refs/heads/master@{#9586}
Diffstat (limited to 'webrtc/video_receive_stream.h')
| -rw-r--r-- | webrtc/video_receive_stream.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/webrtc/video_receive_stream.h b/webrtc/video_receive_stream.h index a8003c1aa9..11033812d5 100644 --- a/webrtc/video_receive_stream.h +++ b/webrtc/video_receive_stream.h @@ -145,10 +145,10 @@ class VideoReceiveStream { // Only valid if 'renderer' is set. int render_delay_ms = 10; - // Audio channel corresponding to this video stream, used for audio/video - // synchronization. 'audio_channel_id' is ignored if no VoiceEngine is set - // when creating the VideoEngine instance. '-1' disables a/v sync. - int audio_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. + std::string sync_group; // Called for each incoming video frame, i.e. in encoded state. E.g. used // when |