OLD | NEW |
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 |
11 #ifndef WEBRTC_AUDIO_SEND_STREAM_H_ | 11 #ifndef WEBRTC_AUDIO_SEND_STREAM_H_ |
12 #define WEBRTC_AUDIO_SEND_STREAM_H_ | 12 #define WEBRTC_AUDIO_SEND_STREAM_H_ |
13 | 13 |
| 14 #include <memory> |
14 #include <string> | 15 #include <string> |
15 #include <vector> | 16 #include <vector> |
16 | 17 |
17 #include "webrtc/base/scoped_ptr.h" | 18 #include "webrtc/base/scoped_ptr.h" |
18 #include "webrtc/config.h" | 19 #include "webrtc/config.h" |
19 #include "webrtc/modules/audio_coding/codecs/audio_encoder.h" | 20 #include "webrtc/modules/audio_coding/codecs/audio_encoder.h" |
20 #include "webrtc/stream.h" | 21 #include "webrtc/stream.h" |
21 #include "webrtc/transport.h" | 22 #include "webrtc/transport.h" |
22 #include "webrtc/typedefs.h" | 23 #include "webrtc/typedefs.h" |
23 | 24 |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
77 | 78 |
78 // Underlying VoiceEngine handle, used to map AudioSendStream to lower-level | 79 // Underlying VoiceEngine handle, used to map AudioSendStream to lower-level |
79 // components. | 80 // components. |
80 // TODO(solenberg): Remove when VoiceEngine channels are created outside | 81 // TODO(solenberg): Remove when VoiceEngine channels are created outside |
81 // of Call. | 82 // of Call. |
82 int voe_channel_id = -1; | 83 int voe_channel_id = -1; |
83 | 84 |
84 // Ownership of the encoder object is transferred to Call when the config is | 85 // Ownership of the encoder object is transferred to Call when the config is |
85 // passed to Call::CreateAudioSendStream(). | 86 // passed to Call::CreateAudioSendStream(). |
86 // TODO(solenberg): Implement, once we configure codecs through the new API. | 87 // TODO(solenberg): Implement, once we configure codecs through the new API. |
87 // rtc::scoped_ptr<AudioEncoder> encoder; | 88 // std::unique_ptr<AudioEncoder> encoder; |
88 int cng_payload_type = -1; // pt, or -1 to disable Comfort Noise Generator. | 89 int cng_payload_type = -1; // pt, or -1 to disable Comfort Noise Generator. |
89 int red_payload_type = -1; // pt, or -1 to disable REDundant coding. | 90 int red_payload_type = -1; // pt, or -1 to disable REDundant coding. |
90 }; | 91 }; |
91 | 92 |
92 // TODO(solenberg): Make payload_type a config property instead. | 93 // TODO(solenberg): Make payload_type a config property instead. |
93 virtual bool SendTelephoneEvent(int payload_type, int event, | 94 virtual bool SendTelephoneEvent(int payload_type, int event, |
94 int duration_ms) = 0; | 95 int duration_ms) = 0; |
95 virtual Stats GetStats() const = 0; | 96 virtual Stats GetStats() const = 0; |
96 }; | 97 }; |
97 } // namespace webrtc | 98 } // namespace webrtc |
98 | 99 |
99 #endif // WEBRTC_AUDIO_SEND_STREAM_H_ | 100 #endif // WEBRTC_AUDIO_SEND_STREAM_H_ |
OLD | NEW |