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

Side by Side Diff: talk/session/media/channelmanager.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/session/media/channelmanager.h ('k') | no next file » | 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 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 // app. 137 // app.
138 if (!initialized_) { 138 if (!initialized_) {
139 enable_rtx_ = enable; 139 enable_rtx_ = enable;
140 return true; 140 return true;
141 } else { 141 } else {
142 LOG(LS_WARNING) << "Cannot toggle rtx after initialization!"; 142 LOG(LS_WARNING) << "Cannot toggle rtx after initialization!";
143 return false; 143 return false;
144 } 144 }
145 } 145 }
146 146
147 int ChannelManager::GetCapabilities() {
148 return media_engine_->GetCapabilities();
149 }
150
151 void ChannelManager::GetSupportedAudioCodecs( 147 void ChannelManager::GetSupportedAudioCodecs(
152 std::vector<AudioCodec>* codecs) const { 148 std::vector<AudioCodec>* codecs) const {
153 codecs->clear(); 149 codecs->clear();
154 150
155 for (std::vector<AudioCodec>::const_iterator it = 151 for (std::vector<AudioCodec>::const_iterator it =
156 media_engine_->audio_codecs().begin(); 152 media_engine_->audio_codecs().begin();
157 it != media_engine_->audio_codecs().end(); ++it) { 153 it != media_engine_->audio_codecs().end(); ++it) {
158 codecs->push_back(*it); 154 codecs->push_back(*it);
159 } 155 }
160 } 156 }
(...skipping 484 matching lines...) Expand 10 before | Expand all | Expand 10 after
645 names->push_back(devs[i].name); 641 names->push_back(devs[i].name);
646 } 642 }
647 } 643 }
648 644
649 bool ChannelManager::StartAecDump(rtc::PlatformFile file) { 645 bool ChannelManager::StartAecDump(rtc::PlatformFile file) {
650 return worker_thread_->Invoke<bool>( 646 return worker_thread_->Invoke<bool>(
651 Bind(&MediaEngineInterface::StartAecDump, media_engine_.get(), file)); 647 Bind(&MediaEngineInterface::StartAecDump, media_engine_.get(), file));
652 } 648 }
653 649
654 } // namespace cricket 650 } // namespace cricket
OLDNEW
« no previous file with comments | « talk/session/media/channelmanager.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698