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 const PacketOptions& packet_options) override; | 372 const PacketOptions& packet_options) override; |
373 bool SendRtcp(const uint8_t* data, size_t len) override; | 373 bool SendRtcp(const uint8_t* data, size_t len) override; |
374 | 374 |
375 // From MixerParticipant | 375 // From MixerParticipant |
376 MixerParticipant::AudioFrameInfo GetAudioFrameWithMuted( | 376 MixerParticipant::AudioFrameInfo GetAudioFrameWithMuted( |
377 int32_t id, | 377 int32_t id, |
378 AudioFrame* audioFrame) override; | 378 AudioFrame* audioFrame) override; |
379 int32_t NeededFrequency(int32_t id) const override; | 379 int32_t NeededFrequency(int32_t id) const override; |
380 | 380 |
381 // From AudioMixer::Source. | 381 // From AudioMixer::Source. |
382 AudioMixer::Source::AudioFrameWithInfo GetAudioFrameWithInfo( | 382 AudioMixer::Source::AudioFrameInfo GetAudioFrameWithInfo( |
383 int sample_rate_hz); | 383 int sample_rate_hz, |
| 384 AudioFrame* audio_frame); |
384 | 385 |
385 // From FileCallback | 386 // From FileCallback |
386 void PlayNotification(int32_t id, uint32_t durationMs) override; | 387 void PlayNotification(int32_t id, uint32_t durationMs) override; |
387 void RecordNotification(int32_t id, uint32_t durationMs) override; | 388 void RecordNotification(int32_t id, uint32_t durationMs) override; |
388 void PlayFileEnded(int32_t id) override; | 389 void PlayFileEnded(int32_t id) override; |
389 void RecordFileEnded(int32_t id) override; | 390 void RecordFileEnded(int32_t id) override; |
390 | 391 |
391 uint32_t InstanceId() const { return _instanceId; } | 392 uint32_t InstanceId() const { return _instanceId; } |
392 int32_t ChannelId() const { return _channelId; } | 393 int32_t ChannelId() const { return _channelId; } |
393 bool Playing() const { return channel_state_.Get().playing; } | 394 bool Playing() const { return channel_state_.Get().playing; } |
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
468 std::unique_ptr<RtpReceiver> rtp_receiver_; | 469 std::unique_ptr<RtpReceiver> rtp_receiver_; |
469 TelephoneEventHandler* telephone_event_handler_; | 470 TelephoneEventHandler* telephone_event_handler_; |
470 std::unique_ptr<RtpRtcp> _rtpRtcpModule; | 471 std::unique_ptr<RtpRtcp> _rtpRtcpModule; |
471 std::unique_ptr<AudioCodingModule> audio_coding_; | 472 std::unique_ptr<AudioCodingModule> audio_coding_; |
472 acm2::CodecManager codec_manager_; | 473 acm2::CodecManager codec_manager_; |
473 acm2::RentACodec rent_a_codec_; | 474 acm2::RentACodec rent_a_codec_; |
474 std::unique_ptr<AudioSinkInterface> audio_sink_; | 475 std::unique_ptr<AudioSinkInterface> audio_sink_; |
475 AudioLevel _outputAudioLevel; | 476 AudioLevel _outputAudioLevel; |
476 bool _externalTransport; | 477 bool _externalTransport; |
477 AudioFrame _audioFrame; | 478 AudioFrame _audioFrame; |
478 AudioFrame mix_audio_frame_; | |
479 // Downsamples to the codec rate if necessary. | 479 // Downsamples to the codec rate if necessary. |
480 PushResampler<int16_t> input_resampler_; | 480 PushResampler<int16_t> input_resampler_; |
481 std::unique_ptr<FilePlayer> input_file_player_; | 481 std::unique_ptr<FilePlayer> input_file_player_; |
482 std::unique_ptr<FilePlayer> output_file_player_; | 482 std::unique_ptr<FilePlayer> output_file_player_; |
483 std::unique_ptr<FileRecorder> output_file_recorder_; | 483 std::unique_ptr<FileRecorder> output_file_recorder_; |
484 int _inputFilePlayerId; | 484 int _inputFilePlayerId; |
485 int _outputFilePlayerId; | 485 int _outputFilePlayerId; |
486 int _outputFileRecorderId; | 486 int _outputFileRecorderId; |
487 bool _outputFileRecording; | 487 bool _outputFileRecording; |
488 bool _outputExternalMedia; | 488 bool _outputExternalMedia; |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
554 std::unique_ptr<RateLimiter> retransmission_rate_limiter_; | 554 std::unique_ptr<RateLimiter> retransmission_rate_limiter_; |
555 | 555 |
556 // TODO(ossu): Remove once GetAudioDecoderFactory() is no longer needed. | 556 // TODO(ossu): Remove once GetAudioDecoderFactory() is no longer needed. |
557 rtc::scoped_refptr<AudioDecoderFactory> decoder_factory_; | 557 rtc::scoped_refptr<AudioDecoderFactory> decoder_factory_; |
558 }; | 558 }; |
559 | 559 |
560 } // namespace voe | 560 } // namespace voe |
561 } // namespace webrtc | 561 } // namespace webrtc |
562 | 562 |
563 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_ | 563 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_ |
OLD | NEW |