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

Side by Side Diff: webrtc/media/base/fakemediaengine.h

Issue 2408153002: Remove cricket::VideoCodec with, height and framerate properties (Closed)
Patch Set: Rebased Created 4 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 | « webrtc/media/base/codec_unittest.cc ('k') | webrtc/media/base/mediaconstants.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 * Copyright (c) 2004 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2004 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 788 matching lines...) Expand 10 before | Expand all | Expand 10 after
799 std::vector<AudioCodec> codecs_; 799 std::vector<AudioCodec> codecs_;
800 800
801 friend class FakeMediaEngine; 801 friend class FakeMediaEngine;
802 }; 802 };
803 803
804 class FakeVideoEngine : public FakeBaseEngine { 804 class FakeVideoEngine : public FakeBaseEngine {
805 public: 805 public:
806 FakeVideoEngine() : capture_(false) { 806 FakeVideoEngine() : capture_(false) {
807 // Add a fake video codec. Note that the name must not be "" as there are 807 // Add a fake video codec. Note that the name must not be "" as there are
808 // sanity checks against that. 808 // sanity checks against that.
809 codecs_.push_back(VideoCodec(0, "fake_video_codec", 0, 0, 0)); 809 codecs_.push_back(VideoCodec(0, "fake_video_codec"));
810 } 810 }
811 void Init() {} 811 void Init() {}
812 bool SetOptions(const VideoOptions& options) { 812 bool SetOptions(const VideoOptions& options) {
813 options_ = options; 813 options_ = options;
814 options_changed_ = true; 814 options_changed_ = true;
815 return true; 815 return true;
816 } 816 }
817 817
818 VideoMediaChannel* CreateChannel(webrtc::Call* call, 818 VideoMediaChannel* CreateChannel(webrtc::Call* call,
819 const MediaConfig& config, 819 const MediaConfig& config,
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
959 959
960 private: 960 private:
961 std::vector<FakeDataMediaChannel*> channels_; 961 std::vector<FakeDataMediaChannel*> channels_;
962 std::vector<DataCodec> data_codecs_; 962 std::vector<DataCodec> data_codecs_;
963 DataChannelType last_channel_type_; 963 DataChannelType last_channel_type_;
964 }; 964 };
965 965
966 } // namespace cricket 966 } // namespace cricket
967 967
968 #endif // WEBRTC_MEDIA_BASE_FAKEMEDIAENGINE_H_ 968 #endif // WEBRTC_MEDIA_BASE_FAKEMEDIAENGINE_H_
OLDNEW
« no previous file with comments | « webrtc/media/base/codec_unittest.cc ('k') | webrtc/media/base/mediaconstants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698