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

Side by Side Diff: talk/media/base/mediachannel.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/base/fakemediaengine.h ('k') | talk/media/sctp/sctpdataengine.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 1117 matching lines...) Expand 10 before | Expand all | Expand 10 after
1128 // Gets quality stats for the channel. 1128 // Gets quality stats for the channel.
1129 virtual bool GetStats(VoiceMediaInfo* info) = 0; 1129 virtual bool GetStats(VoiceMediaInfo* info) = 0;
1130 // Gets last reported error for this media channel. 1130 // Gets last reported error for this media channel.
1131 virtual void GetLastMediaError(uint32* ssrc, 1131 virtual void GetLastMediaError(uint32* ssrc,
1132 VoiceMediaChannel::Error* error) { 1132 VoiceMediaChannel::Error* error) {
1133 ASSERT(error != NULL); 1133 ASSERT(error != NULL);
1134 *error = ERROR_NONE; 1134 *error = ERROR_NONE;
1135 } 1135 }
1136 // Sets the media options to use. 1136 // Sets the media options to use.
1137 virtual bool SetOptions(const AudioOptions& options) = 0; 1137 virtual bool SetOptions(const AudioOptions& options) = 0;
1138 virtual bool GetOptions(AudioOptions* options) const = 0;
1139 1138
1140 // Signal errors from MediaChannel. Arguments are: 1139 // Signal errors from MediaChannel. Arguments are:
1141 // ssrc(uint32), and error(VoiceMediaChannel::Error). 1140 // ssrc(uint32), and error(VoiceMediaChannel::Error).
1142 sigslot::signal2<uint32, VoiceMediaChannel::Error> SignalMediaError; 1141 sigslot::signal2<uint32, VoiceMediaChannel::Error> SignalMediaError;
1143 }; 1142 };
1144 1143
1145 struct VideoSendParameters : RtpSendParameters<VideoCodec, VideoOptions> { 1144 struct VideoSendParameters : RtpSendParameters<VideoCodec, VideoOptions> {
1146 }; 1145 };
1147 1146
1148 struct VideoRecvParameters : RtpParameters<VideoCodec> { 1147 struct VideoRecvParameters : RtpParameters<VideoCodec> {
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
1204 // |capturer|. If |ssrc| is non zero create a new stream with |ssrc| as SSRC. 1203 // |capturer|. If |ssrc| is non zero create a new stream with |ssrc| as SSRC.
1205 virtual bool SetCapturer(uint32 ssrc, VideoCapturer* capturer) = 0; 1204 virtual bool SetCapturer(uint32 ssrc, VideoCapturer* capturer) = 0;
1206 // Gets quality stats for the channel. 1205 // Gets quality stats for the channel.
1207 virtual bool GetStats(VideoMediaInfo* info) = 0; 1206 virtual bool GetStats(VideoMediaInfo* info) = 0;
1208 // Send an intra frame to the receivers. 1207 // Send an intra frame to the receivers.
1209 virtual bool SendIntraFrame() = 0; 1208 virtual bool SendIntraFrame() = 0;
1210 // Reuqest each of the remote senders to send an intra frame. 1209 // Reuqest each of the remote senders to send an intra frame.
1211 virtual bool RequestIntraFrame() = 0; 1210 virtual bool RequestIntraFrame() = 0;
1212 // Sets the media options to use. 1211 // Sets the media options to use.
1213 virtual bool SetOptions(const VideoOptions& options) = 0; 1212 virtual bool SetOptions(const VideoOptions& options) = 0;
1214 virtual bool GetOptions(VideoOptions* options) const = 0;
1215 virtual void UpdateAspectRatio(int ratio_w, int ratio_h) = 0; 1213 virtual void UpdateAspectRatio(int ratio_w, int ratio_h) = 0;
1216 1214
1217 // Signal errors from MediaChannel. Arguments are: 1215 // Signal errors from MediaChannel. Arguments are:
1218 // ssrc(uint32), and error(VideoMediaChannel::Error). 1216 // ssrc(uint32), and error(VideoMediaChannel::Error).
1219 sigslot::signal2<uint32, Error> SignalMediaError; 1217 sigslot::signal2<uint32, Error> SignalMediaError;
1220 1218
1221 protected: 1219 protected:
1222 VideoRenderer *renderer_; 1220 VideoRenderer *renderer_;
1223 }; 1221 };
1224 1222
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
1360 // Signal when the media channel is ready to send the stream. Arguments are: 1358 // Signal when the media channel is ready to send the stream. Arguments are:
1361 // writable(bool) 1359 // writable(bool)
1362 sigslot::signal1<bool> SignalReadyToSend; 1360 sigslot::signal1<bool> SignalReadyToSend;
1363 // Signal for notifying that the remote side has closed the DataChannel. 1361 // Signal for notifying that the remote side has closed the DataChannel.
1364 sigslot::signal1<uint32> SignalStreamClosedRemotely; 1362 sigslot::signal1<uint32> SignalStreamClosedRemotely;
1365 }; 1363 };
1366 1364
1367 } // namespace cricket 1365 } // namespace cricket
1368 1366
1369 #endif // TALK_MEDIA_BASE_MEDIACHANNEL_H_ 1367 #endif // TALK_MEDIA_BASE_MEDIACHANNEL_H_
OLDNEW
« no previous file with comments | « talk/media/base/fakemediaengine.h ('k') | talk/media/sctp/sctpdataengine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698