OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 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 361 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
372 void OnPlayTelephoneEvent(int32_t id, | 372 void OnPlayTelephoneEvent(int32_t id, |
373 uint8_t event, | 373 uint8_t event, |
374 uint16_t lengthMs, | 374 uint16_t lengthMs, |
375 uint8_t volume) override; | 375 uint8_t volume) override; |
376 | 376 |
377 // From Transport (called by the RTP/RTCP module) | 377 // From Transport (called by the RTP/RTCP module) |
378 int SendPacket(int /*channel*/, const void* data, size_t len) override; | 378 int SendPacket(int /*channel*/, const void* data, size_t len) override; |
379 int SendRTCPPacket(int /*channel*/, const void* data, size_t len) override; | 379 int SendRTCPPacket(int /*channel*/, const void* data, size_t len) override; |
380 | 380 |
381 // From MixerParticipant | 381 // From MixerParticipant |
382 int32_t GetAudioFrame(int32_t id, AudioFrame& audioFrame) override; | 382 int32_t GetAudioFrame(int32_t id, AudioFrame* audioFrame) override; |
383 int32_t NeededFrequency(int32_t id) override; | 383 int32_t NeededFrequency(int32_t id) const override; |
384 | 384 |
385 // From FileCallback | 385 // From FileCallback |
386 void PlayNotification(int32_t id, uint32_t durationMs) override; | 386 void PlayNotification(int32_t id, uint32_t durationMs) override; |
387 void RecordNotification(int32_t id, uint32_t durationMs) override; | 387 void RecordNotification(int32_t id, uint32_t durationMs) override; |
388 void PlayFileEnded(int32_t id) override; | 388 void PlayFileEnded(int32_t id) override; |
389 void RecordFileEnded(int32_t id) override; | 389 void RecordFileEnded(int32_t id) override; |
390 | 390 |
391 uint32_t InstanceId() const | 391 uint32_t InstanceId() const |
392 { | 392 { |
393 return _instanceId; | 393 return _instanceId; |
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
578 rtc::scoped_ptr<NetworkPredictor> network_predictor_; | 578 rtc::scoped_ptr<NetworkPredictor> network_predictor_; |
579 // An associated send channel. | 579 // An associated send channel. |
580 rtc::scoped_ptr<CriticalSectionWrapper> assoc_send_channel_lock_; | 580 rtc::scoped_ptr<CriticalSectionWrapper> assoc_send_channel_lock_; |
581 ChannelOwner associate_send_channel_ GUARDED_BY(assoc_send_channel_lock_); | 581 ChannelOwner associate_send_channel_ GUARDED_BY(assoc_send_channel_lock_); |
582 }; | 582 }; |
583 | 583 |
584 } // namespace voe | 584 } // namespace voe |
585 } // namespace webrtc | 585 } // namespace webrtc |
586 | 586 |
587 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_ | 587 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_ |
OLD | NEW |