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

Side by Side Diff: media/video/capture/mac/video_capture_device_decklink_mac.mm

Issue 623263003: replace OVERRIDE and FINAL with override and final in media/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
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 #include "media/video/capture/mac/video_capture_device_decklink_mac.h" 5 #include "media/video/capture/mac/video_capture_device_decklink_mac.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/synchronization/lock.h" 9 #include "base/synchronization/lock.h"
10 #include "base/strings/sys_string_conversions.h" 10 #include "base/strings/sys_string_conversions.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 void StopAndDeAllocate(); 53 void StopAndDeAllocate();
54 54
55 // Remove the VideoCaptureDeviceDeckLinkMac's weak reference. 55 // Remove the VideoCaptureDeviceDeckLinkMac's weak reference.
56 void ResetVideoCaptureDeviceReference(); 56 void ResetVideoCaptureDeviceReference();
57 57
58 private: 58 private:
59 // IDeckLinkInputCallback interface implementation. 59 // IDeckLinkInputCallback interface implementation.
60 virtual HRESULT VideoInputFormatChanged( 60 virtual HRESULT VideoInputFormatChanged(
61 BMDVideoInputFormatChangedEvents notification_events, 61 BMDVideoInputFormatChangedEvents notification_events,
62 IDeckLinkDisplayMode *new_display_mode, 62 IDeckLinkDisplayMode *new_display_mode,
63 BMDDetectedVideoInputFormatFlags detected_signal_flags) OVERRIDE; 63 BMDDetectedVideoInputFormatFlags detected_signal_flags) override;
64 virtual HRESULT VideoInputFrameArrived( 64 virtual HRESULT VideoInputFrameArrived(
65 IDeckLinkVideoInputFrame* video_frame, 65 IDeckLinkVideoInputFrame* video_frame,
66 IDeckLinkAudioInputPacket* audio_packet) OVERRIDE; 66 IDeckLinkAudioInputPacket* audio_packet) override;
67 67
68 // IUnknown interface implementation. 68 // IUnknown interface implementation.
69 virtual HRESULT QueryInterface(REFIID iid, void** ppv) OVERRIDE; 69 virtual HRESULT QueryInterface(REFIID iid, void** ppv) override;
70 virtual ULONG AddRef() OVERRIDE; 70 virtual ULONG AddRef() override;
71 virtual ULONG Release() OVERRIDE; 71 virtual ULONG Release() override;
72 72
73 // Forwarder to VideoCaptureDeviceDeckLinkMac::SendErrorString(). 73 // Forwarder to VideoCaptureDeviceDeckLinkMac::SendErrorString().
74 void SendErrorString(const std::string& reason); 74 void SendErrorString(const std::string& reason);
75 75
76 // Forwarder to VideoCaptureDeviceDeckLinkMac::SendLogString(). 76 // Forwarder to VideoCaptureDeviceDeckLinkMac::SendLogString().
77 void SendLogString(const std::string& message); 77 void SendLogString(const std::string& message);
78 78
79 const media::VideoCaptureDevice::Name device_name_; 79 const media::VideoCaptureDevice::Name device_name_;
80 80
81 // Protects concurrent setting and using of |frame_receiver_|. 81 // Protects concurrent setting and using of |frame_receiver_|.
(...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after
474 if (decklink_capture_delegate_.get()) 474 if (decklink_capture_delegate_.get())
475 decklink_capture_delegate_->AllocateAndStart(params); 475 decklink_capture_delegate_->AllocateAndStart(params);
476 } 476 }
477 477
478 void VideoCaptureDeviceDeckLinkMac::StopAndDeAllocate() { 478 void VideoCaptureDeviceDeckLinkMac::StopAndDeAllocate() {
479 if (decklink_capture_delegate_.get()) 479 if (decklink_capture_delegate_.get())
480 decklink_capture_delegate_->StopAndDeAllocate(); 480 decklink_capture_delegate_->StopAndDeAllocate();
481 } 481 }
482 482
483 } // namespace media 483 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698