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

Side by Side Diff: webrtc/voice_engine/channel.h

Issue 1986093002: Propagate muted info from VoE Channel to AudioConferenceMixer (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@mixer-mod-3
Patch Set: Created 4 years, 7 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
OLDNEW
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 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
387 void OnIncomingSSRCChanged(uint32_t ssrc) override; 387 void OnIncomingSSRCChanged(uint32_t ssrc) override;
388 void OnIncomingCSRCChanged(uint32_t CSRC, bool added) override; 388 void OnIncomingCSRCChanged(uint32_t CSRC, bool added) override;
389 389
390 // From Transport (called by the RTP/RTCP module) 390 // From Transport (called by the RTP/RTCP module)
391 bool SendRtp(const uint8_t* data, 391 bool SendRtp(const uint8_t* data,
392 size_t len, 392 size_t len,
393 const PacketOptions& packet_options) override; 393 const PacketOptions& packet_options) override;
394 bool SendRtcp(const uint8_t* data, size_t len) override; 394 bool SendRtcp(const uint8_t* data, size_t len) override;
395 395
396 // From MixerParticipant 396 // From MixerParticipant
397 int32_t GetAudioFrame(int32_t id, AudioFrame* audioFrame) override; 397 int32_t GetAudioFrame(int32_t id,
398 AudioFrame* audioFrame) override;
399 int32_t GetAudioFrameWithMuted(int32_t id,
400 AudioFrame* audioFrame,
401 bool* muted) override;
398 int32_t NeededFrequency(int32_t id) const override; 402 int32_t NeededFrequency(int32_t id) const override;
399 403
400 // From FileCallback 404 // From FileCallback
401 void PlayNotification(int32_t id, uint32_t durationMs) override; 405 void PlayNotification(int32_t id, uint32_t durationMs) override;
402 void RecordNotification(int32_t id, uint32_t durationMs) override; 406 void RecordNotification(int32_t id, uint32_t durationMs) override;
403 void PlayFileEnded(int32_t id) override; 407 void PlayFileEnded(int32_t id) override;
404 void RecordFileEnded(int32_t id) override; 408 void RecordFileEnded(int32_t id) override;
405 409
406 uint32_t InstanceId() const { return _instanceId; } 410 uint32_t InstanceId() const { return _instanceId; }
407 int32_t ChannelId() const { return _channelId; } 411 int32_t ChannelId() const { return _channelId; }
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
573 PacketRouter* packet_router_ = nullptr; 577 PacketRouter* packet_router_ = nullptr;
574 std::unique_ptr<TransportFeedbackProxy> feedback_observer_proxy_; 578 std::unique_ptr<TransportFeedbackProxy> feedback_observer_proxy_;
575 std::unique_ptr<TransportSequenceNumberProxy> seq_num_allocator_proxy_; 579 std::unique_ptr<TransportSequenceNumberProxy> seq_num_allocator_proxy_;
576 std::unique_ptr<RtpPacketSenderProxy> rtp_packet_sender_proxy_; 580 std::unique_ptr<RtpPacketSenderProxy> rtp_packet_sender_proxy_;
577 }; 581 };
578 582
579 } // namespace voe 583 } // namespace voe
580 } // namespace webrtc 584 } // namespace webrtc
581 585
582 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_ 586 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698