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

Side by Side Diff: talk/session/media/channelmanager.h

Issue 1364083002: Remove ChannelManager::GetCapabilities() (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 | « talk/media/webrtc/webrtcvoiceengine.cc ('k') | talk/session/media/channelmanager.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 * 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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 // but before Init. set_worker_thread will return false if called after Init. 76 // but before Init. set_worker_thread will return false if called after Init.
77 rtc::Thread* worker_thread() const { return worker_thread_; } 77 rtc::Thread* worker_thread() const { return worker_thread_; }
78 bool set_worker_thread(rtc::Thread* thread) { 78 bool set_worker_thread(rtc::Thread* thread) {
79 if (initialized_) return false; 79 if (initialized_) return false;
80 worker_thread_ = thread; 80 worker_thread_ = thread;
81 return true; 81 return true;
82 } 82 }
83 83
84 MediaEngineInterface* media_engine() { return media_engine_.get(); } 84 MediaEngineInterface* media_engine() { return media_engine_.get(); }
85 85
86 // Gets capabilities. Can be called prior to starting the media engine.
87 int GetCapabilities();
88
89 // Retrieves the list of supported audio & video codec types. 86 // Retrieves the list of supported audio & video codec types.
90 // Can be called before starting the media engine. 87 // Can be called before starting the media engine.
91 void GetSupportedAudioCodecs(std::vector<AudioCodec>* codecs) const; 88 void GetSupportedAudioCodecs(std::vector<AudioCodec>* codecs) const;
92 void GetSupportedAudioRtpHeaderExtensions(RtpHeaderExtensions* ext) const; 89 void GetSupportedAudioRtpHeaderExtensions(RtpHeaderExtensions* ext) const;
93 void GetSupportedVideoCodecs(std::vector<VideoCodec>* codecs) const; 90 void GetSupportedVideoCodecs(std::vector<VideoCodec>* codecs) const;
94 void GetSupportedVideoRtpHeaderExtensions(RtpHeaderExtensions* ext) const; 91 void GetSupportedVideoRtpHeaderExtensions(RtpHeaderExtensions* ext) const;
95 void GetSupportedDataCodecs(std::vector<DataCodec>* codecs) const; 92 void GetSupportedDataCodecs(std::vector<DataCodec>* codecs) const;
96 93
97 // Indicates whether the media engine is started. 94 // Indicates whether the media engine is started.
98 bool initialized() const { return initialized_; } 95 bool initialized() const { return initialized_; }
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 VideoEncoderConfig default_video_encoder_config_; 239 VideoEncoderConfig default_video_encoder_config_;
243 VideoRenderer* local_renderer_; 240 VideoRenderer* local_renderer_;
244 bool enable_rtx_; 241 bool enable_rtx_;
245 242
246 bool capturing_; 243 bool capturing_;
247 }; 244 };
248 245
249 } // namespace cricket 246 } // namespace cricket
250 247
251 #endif // TALK_SESSION_MEDIA_CHANNELMANAGER_H_ 248 #endif // TALK_SESSION_MEDIA_CHANNELMANAGER_H_
OLDNEW
« no previous file with comments | « talk/media/webrtc/webrtcvoiceengine.cc ('k') | talk/session/media/channelmanager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698