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

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

Issue 1335353005: Remove channel ids from various interfaces. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 5 years, 3 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
« no previous file with comments | « webrtc/video_engine/vie_receiver.cc ('k') | webrtc/voice_engine/channel.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 int32_t OnRxVadDetected(int vadDecision); 357 int32_t OnRxVadDetected(int vadDecision);
358 358
359 // From RtpData in the RTP/RTCP module 359 // From RtpData in the RTP/RTCP module
360 int32_t OnReceivedPayloadData(const uint8_t* payloadData, 360 int32_t OnReceivedPayloadData(const uint8_t* payloadData,
361 size_t payloadSize, 361 size_t payloadSize,
362 const WebRtcRTPHeader* rtpHeader) override; 362 const WebRtcRTPHeader* rtpHeader) override;
363 bool OnRecoveredPacket(const uint8_t* packet, 363 bool OnRecoveredPacket(const uint8_t* packet,
364 size_t packet_length) override; 364 size_t packet_length) override;
365 365
366 // From RtpFeedback in the RTP/RTCP module 366 // From RtpFeedback in the RTP/RTCP module
367 int32_t OnInitializeDecoder(int32_t id, 367 int32_t OnInitializeDecoder(int8_t payloadType,
368 int8_t payloadType,
369 const char payloadName[RTP_PAYLOAD_NAME_SIZE], 368 const char payloadName[RTP_PAYLOAD_NAME_SIZE],
370 int frequency, 369 int frequency,
371 uint8_t channels, 370 uint8_t channels,
372 uint32_t rate) override; 371 uint32_t rate) override;
373 void OnIncomingSSRCChanged(int32_t id, uint32_t ssrc) override; 372 void OnIncomingSSRCChanged(uint32_t ssrc) override;
374 void OnIncomingCSRCChanged(int32_t id, uint32_t CSRC, bool added) override; 373 void OnIncomingCSRCChanged(uint32_t CSRC, bool added) override;
375 374
376 // From RtpAudioFeedback in the RTP/RTCP module 375 // From RtpAudioFeedback in the RTP/RTCP module
377 void OnPlayTelephoneEvent(int32_t id, 376 void OnPlayTelephoneEvent(uint8_t event,
378 uint8_t event,
379 uint16_t lengthMs, 377 uint16_t lengthMs,
380 uint8_t volume) override; 378 uint8_t volume) override;
381 379
382 // From Transport (called by the RTP/RTCP module) 380 // From Transport (called by the RTP/RTCP module)
383 int SendPacket(int /*channel*/, const void* data, size_t len) override; 381 int SendPacket(const void* data, size_t len) override;
384 int SendRTCPPacket(int /*channel*/, const void* data, size_t len) override; 382 int SendRTCPPacket(const void* data, size_t len) override;
385 383
386 // From MixerParticipant 384 // From MixerParticipant
387 int32_t GetAudioFrame(int32_t id, AudioFrame* audioFrame) override; 385 int32_t GetAudioFrame(int32_t id, AudioFrame* audioFrame) override;
388 int32_t NeededFrequency(int32_t id) const override; 386 int32_t NeededFrequency(int32_t id) const override;
389 387
390 // From FileCallback 388 // From FileCallback
391 void PlayNotification(int32_t id, uint32_t durationMs) override; 389 void PlayNotification(int32_t id, uint32_t durationMs) override;
392 void RecordNotification(int32_t id, uint32_t durationMs) override; 390 void RecordNotification(int32_t id, uint32_t durationMs) override;
393 void PlayFileEnded(int32_t id) override; 391 void PlayFileEnded(int32_t id) override;
394 void RecordFileEnded(int32_t id) override; 392 void RecordFileEnded(int32_t id) override;
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
583 rtc::scoped_ptr<NetworkPredictor> network_predictor_; 581 rtc::scoped_ptr<NetworkPredictor> network_predictor_;
584 // An associated send channel. 582 // An associated send channel.
585 rtc::scoped_ptr<CriticalSectionWrapper> assoc_send_channel_lock_; 583 rtc::scoped_ptr<CriticalSectionWrapper> assoc_send_channel_lock_;
586 ChannelOwner associate_send_channel_ GUARDED_BY(assoc_send_channel_lock_); 584 ChannelOwner associate_send_channel_ GUARDED_BY(assoc_send_channel_lock_);
587 }; 585 };
588 586
589 } // namespace voe 587 } // namespace voe
590 } // namespace webrtc 588 } // namespace webrtc
591 589
592 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_ 590 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_
OLDNEW
« no previous file with comments | « webrtc/video_engine/vie_receiver.cc ('k') | webrtc/voice_engine/channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698