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

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

Issue 1937693002: Replace scoped_ptr with unique_ptr everywhere (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@unique5
Patch Set: Created 4 years, 7 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/videoadapter_unittest.cc ('k') | webrtc/media/base/videocapturer_unittest.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 /* 1 /*
2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2016 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
11 #ifndef WEBRTC_MEDIA_BASE_VIDEOBROADCASTER_H_ 11 #ifndef WEBRTC_MEDIA_BASE_VIDEOBROADCASTER_H_
12 #define WEBRTC_MEDIA_BASE_VIDEOBROADCASTER_H_ 12 #define WEBRTC_MEDIA_BASE_VIDEOBROADCASTER_H_
13 13
14 #include <memory>
14 #include <utility> 15 #include <utility>
15 #include <vector> 16 #include <vector>
16 17
17 #include "webrtc/base/criticalsection.h" 18 #include "webrtc/base/criticalsection.h"
18 #include "webrtc/base/thread_checker.h" 19 #include "webrtc/base/thread_checker.h"
19 #include "webrtc/media/base/videoframe.h" 20 #include "webrtc/media/base/videoframe.h"
20 #include "webrtc/media/base/videosinkinterface.h" 21 #include "webrtc/media/base/videosinkinterface.h"
21 #include "webrtc/media/base/videosourcebase.h" 22 #include "webrtc/media/base/videosourcebase.h"
22 #include "webrtc/media/engine/webrtcvideoframe.h" 23 #include "webrtc/media/engine/webrtcvideoframe.h"
23 24
(...skipping 24 matching lines...) Expand all
48 49
49 protected: 50 protected:
50 void UpdateWants() EXCLUSIVE_LOCKS_REQUIRED(sinks_and_wants_lock_); 51 void UpdateWants() EXCLUSIVE_LOCKS_REQUIRED(sinks_and_wants_lock_);
51 const cricket::VideoFrame& GetBlackFrame(const cricket::VideoFrame& frame) 52 const cricket::VideoFrame& GetBlackFrame(const cricket::VideoFrame& frame)
52 EXCLUSIVE_LOCKS_REQUIRED(sinks_and_wants_lock_); 53 EXCLUSIVE_LOCKS_REQUIRED(sinks_and_wants_lock_);
53 54
54 ThreadChecker thread_checker_; 55 ThreadChecker thread_checker_;
55 rtc::CriticalSection sinks_and_wants_lock_; 56 rtc::CriticalSection sinks_and_wants_lock_;
56 57
57 VideoSinkWants current_wants_ GUARDED_BY(sinks_and_wants_lock_); 58 VideoSinkWants current_wants_ GUARDED_BY(sinks_and_wants_lock_);
58 rtc::scoped_ptr<cricket::WebRtcVideoFrame> black_frame_; 59 std::unique_ptr<cricket::WebRtcVideoFrame> black_frame_;
59 }; 60 };
60 61
61 } // namespace rtc 62 } // namespace rtc
62 63
63 #endif // WEBRTC_MEDIA_BASE_VIDEOBROADCASTER_H_ 64 #endif // WEBRTC_MEDIA_BASE_VIDEOBROADCASTER_H_
OLDNEW
« no previous file with comments | « webrtc/media/base/videoadapter_unittest.cc ('k') | webrtc/media/base/videocapturer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698