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

Side by Side Diff: talk/media/webrtc/webrtcvideoengine2.h

Issue 1324853003: Remove MediaChannel::GetOptions(). (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/sctp/sctpdataengine.h ('k') | talk/media/webrtc/webrtcvoiceengine.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 2014 Google Inc. 3 * Copyright 2014 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 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 bool MuteStream(uint32 ssrc, bool mute) override; 213 bool MuteStream(uint32 ssrc, bool mute) override;
214 214
215 // Set send/receive RTP header extensions. This must be done before creating 215 // Set send/receive RTP header extensions. This must be done before creating
216 // streams as it only has effect on future streams. 216 // streams as it only has effect on future streams.
217 bool SetRecvRtpHeaderExtensions( 217 bool SetRecvRtpHeaderExtensions(
218 const std::vector<RtpHeaderExtension>& extensions) override; 218 const std::vector<RtpHeaderExtension>& extensions) override;
219 bool SetSendRtpHeaderExtensions( 219 bool SetSendRtpHeaderExtensions(
220 const std::vector<RtpHeaderExtension>& extensions) override; 220 const std::vector<RtpHeaderExtension>& extensions) override;
221 bool SetMaxSendBandwidth(int bps) override; 221 bool SetMaxSendBandwidth(int bps) override;
222 bool SetOptions(const VideoOptions& options) override; 222 bool SetOptions(const VideoOptions& options) override;
223 bool GetOptions(VideoOptions* options) const override {
224 *options = options_;
225 return true;
226 }
227 void SetInterface(NetworkInterface* iface) override; 223 void SetInterface(NetworkInterface* iface) override;
228 void UpdateAspectRatio(int ratio_w, int ratio_h) override; 224 void UpdateAspectRatio(int ratio_w, int ratio_h) override;
229 225
230 void OnMessage(rtc::Message* msg) override; 226 void OnMessage(rtc::Message* msg) override;
231 227
232 void OnLoadUpdate(Load load) override; 228 void OnLoadUpdate(Load load) override;
233 229
234 // Implemented for VideoMediaChannelTest. 230 // Implemented for VideoMediaChannelTest.
235 bool sending() const { return sending_; } 231 bool sending() const { return sending_; }
236 uint32 GetDefaultSendChannelSsrc() { return default_send_ssrc_; } 232 uint32 GetDefaultSendChannelSsrc() { return default_send_ssrc_; }
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
543 WebRtcVideoDecoderFactory* const external_decoder_factory_; 539 WebRtcVideoDecoderFactory* const external_decoder_factory_;
544 std::vector<VideoCodecSettings> recv_codecs_; 540 std::vector<VideoCodecSettings> recv_codecs_;
545 std::vector<webrtc::RtpExtension> recv_rtp_extensions_; 541 std::vector<webrtc::RtpExtension> recv_rtp_extensions_;
546 webrtc::Call::Config::BitrateConfig bitrate_config_; 542 webrtc::Call::Config::BitrateConfig bitrate_config_;
547 VideoOptions options_; 543 VideoOptions options_;
548 }; 544 };
549 545
550 } // namespace cricket 546 } // namespace cricket
551 547
552 #endif // TALK_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_ 548 #endif // TALK_MEDIA_WEBRTC_WEBRTCVIDEOENGINE2_H_
OLDNEW
« no previous file with comments | « talk/media/sctp/sctpdataengine.h ('k') | talk/media/webrtc/webrtcvoiceengine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698