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

Side by Side Diff: content/renderer/media/media_stream_video_source.h

Issue 973373002: fix for builds with webrtc disabled (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: move int const values to media_stream_video_source.h Created 5 years, 9 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 | « no previous file | content/renderer/media/media_stream_video_source.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 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_SOURCE_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_SOURCE_H_
6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_SOURCE_H_ 6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_SOURCE_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 static const char kMaxAspectRatio[]; // maxAspectRatio 71 static const char kMaxAspectRatio[]; // maxAspectRatio
72 static const char kMaxWidth[]; // maxWidth 72 static const char kMaxWidth[]; // maxWidth
73 static const char kMinWidth[]; // minWidthOnCaptureFormats 73 static const char kMinWidth[]; // minWidthOnCaptureFormats
74 static const char kMaxHeight[]; // maxHeight 74 static const char kMaxHeight[]; // maxHeight
75 static const char kMinHeight[]; // minHeight 75 static const char kMinHeight[]; // minHeight
76 static const char kMaxFrameRate[]; // maxFrameRate 76 static const char kMaxFrameRate[]; // maxFrameRate
77 static const char kMinFrameRate[]; // minFrameRate 77 static const char kMinFrameRate[]; // minFrameRate
78 78
79 // Default resolution. If no constraints are specified and the delegate 79 // Default resolution. If no constraints are specified and the delegate
80 // support it, this is the resolution that will be used. 80 // support it, this is the resolution that will be used.
81 static const int kDefaultWidth; 81 static const int kDefaultWidth = 640;
DaleCurtis 2015/03/04 21:26:04 Because you don't want static values in a header f
Mostyn Bramley-Moore 2015/03/04 21:49:39 I figured since it was only a few ints (as opposed
DaleCurtis 2015/03/04 21:54:23 It depends on how they're used; in the majority of
Mostyn Bramley-Moore 2015/03/04 21:57:39 OK. I will try to eliminate the need for this lat
82 static const int kDefaultHeight; 82 static const int kDefaultHeight = 480;
83 static const int kDefaultFrameRate; 83 static const int kDefaultFrameRate = 30;
84 static const int kUnknownFrameRate; 84 static const int kUnknownFrameRate = 0;
85 85
86 protected: 86 protected:
87 void DoStopSource() override; 87 void DoStopSource() override;
88 88
89 // Sets ready state and notifies the ready state to all registered tracks. 89 // Sets ready state and notifies the ready state to all registered tracks.
90 virtual void SetReadyState(blink::WebMediaStreamSource::ReadyState state); 90 virtual void SetReadyState(blink::WebMediaStreamSource::ReadyState state);
91 91
92 // Sets muted state and notifies it to all registered tracks. 92 // Sets muted state and notifies it to all registered tracks.
93 virtual void SetMutedState(bool state); 93 virtual void SetMutedState(bool state);
94 94
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 174
175 // NOTE: Weak pointers must be invalidated before all other member variables. 175 // NOTE: Weak pointers must be invalidated before all other member variables.
176 base::WeakPtrFactory<MediaStreamVideoSource> weak_factory_; 176 base::WeakPtrFactory<MediaStreamVideoSource> weak_factory_;
177 177
178 DISALLOW_COPY_AND_ASSIGN(MediaStreamVideoSource); 178 DISALLOW_COPY_AND_ASSIGN(MediaStreamVideoSource);
179 }; 179 };
180 180
181 } // namespace content 181 } // namespace content
182 182
183 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_SOURCE_H_ 183 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_SOURCE_H_
OLDNEW
« no previous file with comments | « no previous file | content/renderer/media/media_stream_video_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698