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

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

Issue 1692923002: Fix VideoCapturer::OnMessage override (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 10 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 | no next file » | 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) 2010 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2010 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 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 void OnFrameCaptured(VideoCapturer* video_capturer, 282 void OnFrameCaptured(VideoCapturer* video_capturer,
283 const CapturedFrame* captured_frame); 283 const CapturedFrame* captured_frame);
284 284
285 // Callback attached to SignalVideoFrame. 285 // Callback attached to SignalVideoFrame.
286 // TODO(perkj): Remove once SignalVideoFrame is removed. 286 // TODO(perkj): Remove once SignalVideoFrame is removed.
287 void OnFrame(VideoCapturer* capturer, const VideoFrame* frame); 287 void OnFrame(VideoCapturer* capturer, const VideoFrame* frame);
288 288
289 void SetCaptureState(CaptureState state); 289 void SetCaptureState(CaptureState state);
290 290
291 // Marshals SignalStateChange onto thread_. 291 // Marshals SignalStateChange onto thread_.
292 void OnMessage(rtc::Message* message); 292 void OnMessage(rtc::Message* message) override;
293 293
294 // subclasses override this virtual method to provide a vector of fourccs, in 294 // subclasses override this virtual method to provide a vector of fourccs, in
295 // order of preference, that are expected by the media engine. 295 // order of preference, that are expected by the media engine.
296 virtual bool GetPreferredFourccs(std::vector<uint32_t>* fourccs) = 0; 296 virtual bool GetPreferredFourccs(std::vector<uint32_t>* fourccs) = 0;
297 297
298 // mutators to set private attributes 298 // mutators to set private attributes
299 void SetId(const std::string& id) { 299 void SetId(const std::string& id) {
300 id_ = id; 300 id_ = id;
301 } 301 }
302 302
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
373 373
374 // Whether capturer should apply rotation to the frame before signaling it. 374 // Whether capturer should apply rotation to the frame before signaling it.
375 bool apply_rotation_; 375 bool apply_rotation_;
376 376
377 RTC_DISALLOW_COPY_AND_ASSIGN(VideoCapturer); 377 RTC_DISALLOW_COPY_AND_ASSIGN(VideoCapturer);
378 }; 378 };
379 379
380 } // namespace cricket 380 } // namespace cricket
381 381
382 #endif // WEBRTC_MEDIA_BASE_VIDEOCAPTURER_H_ 382 #endif // WEBRTC_MEDIA_BASE_VIDEOCAPTURER_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698