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

Side by Side Diff: talk/media/base/streamparams.h

Issue 1345433002: Add RTC_ prefix to contructormagic macros. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Formatting fix. 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/rtpdump.h ('k') | talk/media/base/videoadapter.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 2011 Google Inc. 3 * Copyright 2011 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 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 // Removes a stream, returning true if found and removed. 239 // Removes a stream, returning true if found and removed.
240 bool RemoveAudioStream(const StreamSelector& selector); 240 bool RemoveAudioStream(const StreamSelector& selector);
241 bool RemoveVideoStream(const StreamSelector& selector); 241 bool RemoveVideoStream(const StreamSelector& selector);
242 bool RemoveDataStream(const StreamSelector& selector); 242 bool RemoveDataStream(const StreamSelector& selector);
243 243
244 private: 244 private:
245 std::vector<StreamParams> audio_; 245 std::vector<StreamParams> audio_;
246 std::vector<StreamParams> video_; 246 std::vector<StreamParams> video_;
247 std::vector<StreamParams> data_; 247 std::vector<StreamParams> data_;
248 248
249 DISALLOW_COPY_AND_ASSIGN(MediaStreams); 249 RTC_DISALLOW_COPY_AND_ASSIGN(MediaStreams);
250 }; 250 };
251 251
252 // A request for a specific format of a specific stream. 252 // A request for a specific format of a specific stream.
253 struct StaticVideoView { 253 struct StaticVideoView {
254 StaticVideoView(const StreamSelector& selector, 254 StaticVideoView(const StreamSelector& selector,
255 int width, int height, int framerate) 255 int width, int height, int framerate)
256 : selector(selector), 256 : selector(selector),
257 width(width), 257 width(width),
258 height(height), 258 height(height),
259 framerate(framerate), 259 framerate(framerate),
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 bool IsOneSsrcStream(const StreamParams& sp); 338 bool IsOneSsrcStream(const StreamParams& sp);
339 339
340 // Checks if |sp| defines parameters for one Simulcast stream. There may be RTX 340 // Checks if |sp| defines parameters for one Simulcast stream. There may be RTX
341 // streams associated with the simulcast streams. Leaving as non-static so we 341 // streams associated with the simulcast streams. Leaving as non-static so we
342 // can test this function. 342 // can test this function.
343 bool IsSimulcastStream(const StreamParams& sp); 343 bool IsSimulcastStream(const StreamParams& sp);
344 344
345 } // namespace cricket 345 } // namespace cricket
346 346
347 #endif // TALK_MEDIA_BASE_STREAMPARAMS_H_ 347 #endif // TALK_MEDIA_BASE_STREAMPARAMS_H_
OLDNEW
« no previous file with comments | « talk/media/base/rtpdump.h ('k') | talk/media/base/videoadapter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698