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

Side by Side Diff: talk/media/webrtc/webrtcvoiceengine.cc

Issue 1364083002: Remove ChannelManager::GetCapabilities() (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 5 years, 2 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 | « talk/media/webrtc/webrtcvoiceengine.h ('k') | talk/session/media/channelmanager.h » ('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 * libjingle 2 * libjingle
3 * Copyright 2004 Google Inc. 3 * Copyright 2004 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 545 matching lines...) Expand 10 before | Expand all | Expand 10 after
556 556
557 void WebRtcVoiceEngine::Terminate() { 557 void WebRtcVoiceEngine::Terminate() {
558 LOG(LS_INFO) << "WebRtcVoiceEngine::Terminate"; 558 LOG(LS_INFO) << "WebRtcVoiceEngine::Terminate";
559 initialized_ = false; 559 initialized_ = false;
560 560
561 StopAecDump(); 561 StopAecDump();
562 562
563 voe_wrapper_->base()->Terminate(); 563 voe_wrapper_->base()->Terminate();
564 } 564 }
565 565
566 int WebRtcVoiceEngine::GetCapabilities() {
567 return AUDIO_SEND | AUDIO_RECV;
568 }
569
570 VoiceMediaChannel* WebRtcVoiceEngine::CreateChannel(webrtc::Call* call, 566 VoiceMediaChannel* WebRtcVoiceEngine::CreateChannel(webrtc::Call* call,
571 const AudioOptions& options) { 567 const AudioOptions& options) {
572 WebRtcVoiceMediaChannel* ch = 568 WebRtcVoiceMediaChannel* ch =
573 new WebRtcVoiceMediaChannel(this, options, call); 569 new WebRtcVoiceMediaChannel(this, options, call);
574 if (!ch->valid()) { 570 if (!ch->valid()) {
575 delete ch; 571 delete ch;
576 return nullptr; 572 return nullptr;
577 } 573 }
578 return ch; 574 return ch;
579 } 575 }
(...skipping 2719 matching lines...) Expand 10 before | Expand all | Expand 10 after
3299 LOG(LS_WARNING) << "Unknown codec " << ToString(codec); 3295 LOG(LS_WARNING) << "Unknown codec " << ToString(codec);
3300 return false; 3296 return false;
3301 } 3297 }
3302 } 3298 }
3303 return true; 3299 return true;
3304 } 3300 }
3305 3301
3306 } // namespace cricket 3302 } // namespace cricket
3307 3303
3308 #endif // HAVE_WEBRTC_VOICE 3304 #endif // HAVE_WEBRTC_VOICE
OLDNEW
« no previous file with comments | « talk/media/webrtc/webrtcvoiceengine.h ('k') | talk/session/media/channelmanager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698