Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(59)

Side by Side Diff: webrtc/audio_receive_stream.h

Issue 1181653002: Base A/V synchronization on sync_labels. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « talk/media/webrtc/webrtcvoiceengine_unittest.cc ('k') | webrtc/video/audio_receive_stream.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 25 matching lines...) Expand all
36 // Synchronization source (stream identifier) to be received. 36 // Synchronization source (stream identifier) to be received.
37 uint32_t remote_ssrc = 0; 37 uint32_t remote_ssrc = 0;
38 38
39 // Sender SSRC used for sending RTCP (such as receiver reports). 39 // Sender SSRC used for sending RTCP (such as receiver reports).
40 uint32_t local_ssrc = 0; 40 uint32_t local_ssrc = 0;
41 41
42 // RTP header extensions used for the received stream. 42 // RTP header extensions used for the received stream.
43 std::vector<RtpExtension> extensions; 43 std::vector<RtpExtension> extensions;
44 } rtp; 44 } rtp;
45 45
46 // Underlying VoiceEngine handle, used to map AudioReceiveStream to
47 // lower-level components. Temporarily used while VoiceEngine channels are
48 // created outside of Call.
49 int voe_channel_id = -1;
50
51 // Identifier for an A/V synchronization group. Empty string to disable.
52 // TODO(pbos): Synchronize streams in a sync group, not just one video
53 // stream to one audio stream. Tracked by issue webrtc:4762.
54 std::string sync_group;
55
46 // Decoders for every payload that we can receive. Call owns the 56 // Decoders for every payload that we can receive. Call owns the
47 // AudioDecoder instances once the Config is submitted to 57 // AudioDecoder instances once the Config is submitted to
48 // Call::CreateReceiveStream(). 58 // Call::CreateReceiveStream().
49 // TODO(solenberg): Use unique_ptr<> once our std lib fully supports C++11. 59 // TODO(solenberg): Use unique_ptr<> once our std lib fully supports C++11.
50 std::map<uint8_t, AudioDecoder*> decoder_map; 60 std::map<uint8_t, AudioDecoder*> decoder_map;
51 }; 61 };
52 62
53 virtual Stats GetStats() const = 0; 63 virtual Stats GetStats() const = 0;
54 64
55 protected: 65 protected:
56 virtual ~AudioReceiveStream() {} 66 virtual ~AudioReceiveStream() {}
57 }; 67 };
58 } // namespace webrtc 68 } // namespace webrtc
59 69
60 #endif // WEBRTC_AUDIO_RECEIVE_STREAM_H_ 70 #endif // WEBRTC_AUDIO_RECEIVE_STREAM_H_
OLDNEW
« no previous file with comments | « talk/media/webrtc/webrtcvoiceengine_unittest.cc ('k') | webrtc/video/audio_receive_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698