| 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 346 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 357 size_t payloadSize, | 357 size_t payloadSize, |
| 358 const WebRtcRTPHeader* rtpHeader) override; | 358 const WebRtcRTPHeader* rtpHeader) override; |
| 359 bool OnRecoveredPacket(const uint8_t* packet, | 359 bool OnRecoveredPacket(const uint8_t* packet, |
| 360 size_t packet_length) override; | 360 size_t packet_length) override; |
| 361 | 361 |
| 362 // From RtpFeedback in the RTP/RTCP module | 362 // From RtpFeedback in the RTP/RTCP module |
| 363 int32_t OnInitializeDecoder(int32_t id, | 363 int32_t OnInitializeDecoder(int32_t id, |
| 364 int8_t payloadType, | 364 int8_t payloadType, |
| 365 const char payloadName[RTP_PAYLOAD_NAME_SIZE], | 365 const char payloadName[RTP_PAYLOAD_NAME_SIZE], |
| 366 int frequency, | 366 int frequency, |
| 367 uint8_t channels, | 367 size_t channels, |
| 368 uint32_t rate) override; | 368 uint32_t rate) override; |
| 369 void OnIncomingSSRCChanged(int32_t id, uint32_t ssrc) override; | 369 void OnIncomingSSRCChanged(int32_t id, uint32_t ssrc) override; |
| 370 void OnIncomingCSRCChanged(int32_t id, uint32_t CSRC, bool added) override; | 370 void OnIncomingCSRCChanged(int32_t id, uint32_t CSRC, bool added) override; |
| 371 | 371 |
| 372 // From RtpAudioFeedback in the RTP/RTCP module | 372 // From RtpAudioFeedback in the RTP/RTCP module |
| 373 void OnPlayTelephoneEvent(int32_t id, | 373 void OnPlayTelephoneEvent(int32_t id, |
| 374 uint8_t event, | 374 uint8_t event, |
| 375 uint16_t lengthMs, | 375 uint16_t lengthMs, |
| 376 uint8_t volume) override; | 376 uint8_t volume) override; |
| 377 | 377 |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 426 { | 426 { |
| 427 return _outputAudioLevel.Level(); | 427 return _outputAudioLevel.Level(); |
| 428 } | 428 } |
| 429 uint32_t Demultiplex(const AudioFrame& audioFrame); | 429 uint32_t Demultiplex(const AudioFrame& audioFrame); |
| 430 // Demultiplex the data to the channel's |_audioFrame|. The difference | 430 // Demultiplex the data to the channel's |_audioFrame|. The difference |
| 431 // between this method and the overloaded method above is that |audio_data| | 431 // between this method and the overloaded method above is that |audio_data| |
| 432 // does not go through transmit_mixer and APM. | 432 // does not go through transmit_mixer and APM. |
| 433 void Demultiplex(const int16_t* audio_data, | 433 void Demultiplex(const int16_t* audio_data, |
| 434 int sample_rate, | 434 int sample_rate, |
| 435 size_t number_of_frames, | 435 size_t number_of_frames, |
| 436 int number_of_channels); | 436 size_t number_of_channels); |
| 437 uint32_t PrepareEncodeAndSend(int mixingFrequency); | 437 uint32_t PrepareEncodeAndSend(int mixingFrequency); |
| 438 uint32_t EncodeAndSend(); | 438 uint32_t EncodeAndSend(); |
| 439 | 439 |
| 440 // Associate to a send channel. | 440 // Associate to a send channel. |
| 441 // Used for obtaining RTT for a receive-only channel. | 441 // Used for obtaining RTT for a receive-only channel. |
| 442 void set_associate_send_channel(const ChannelOwner& channel) { | 442 void set_associate_send_channel(const ChannelOwner& channel) { |
| 443 assert(_channelId != channel.channel()->ChannelId()); | 443 assert(_channelId != channel.channel()->ChannelId()); |
| 444 CriticalSectionScoped lock(assoc_send_channel_lock_.get()); | 444 CriticalSectionScoped lock(assoc_send_channel_lock_.get()); |
| 445 associate_send_channel_ = channel; | 445 associate_send_channel_ = channel; |
| 446 } | 446 } |
| (...skipping 131 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 |