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

Side by Side Diff: webrtc/modules/video_coding/test/vcm_payload_sink_factory.h

Issue 1721353002: Replace scoped_ptr with unique_ptr in webrtc/modules/video_coding/ (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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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_MODULES_VIDEO_CODING_TEST_VCM_PAYLOAD_SINK_FACTORY_H_ 11 #ifndef WEBRTC_MODULES_VIDEO_CODING_TEST_VCM_PAYLOAD_SINK_FACTORY_H_
12 #define WEBRTC_MODULES_VIDEO_CODING_TEST_VCM_PAYLOAD_SINK_FACTORY_H_ 12 #define WEBRTC_MODULES_VIDEO_CODING_TEST_VCM_PAYLOAD_SINK_FACTORY_H_
13 13
14 #include <memory>
14 #include <string> 15 #include <string>
15 #include <vector> 16 #include <vector>
16 17
17 #include "webrtc/base/constructormagic.h" 18 #include "webrtc/base/constructormagic.h"
18 #include "webrtc/base/scoped_ptr.h"
19 #include "webrtc/modules/video_coding/include/video_coding_defines.h" 19 #include "webrtc/modules/video_coding/include/video_coding_defines.h"
20 #include "webrtc/modules/video_coding/test/rtp_player.h" 20 #include "webrtc/modules/video_coding/test/rtp_player.h"
21 21
22 class NullEventFactory; 22 class NullEventFactory;
23 23
24 namespace webrtc { 24 namespace webrtc {
25 class Clock; 25 class Clock;
26 class CriticalSectionWrapper; 26 class CriticalSectionWrapper;
27 27
28 namespace rtpplayer { 28 namespace rtpplayer {
(...skipping 22 matching lines...) Expand all
51 51
52 void Remove(VcmPayloadSink* sink); 52 void Remove(VcmPayloadSink* sink);
53 53
54 std::string base_out_filename_; 54 std::string base_out_filename_;
55 Clock* clock_; 55 Clock* clock_;
56 bool protection_enabled_; 56 bool protection_enabled_;
57 VCMVideoProtection protection_method_; 57 VCMVideoProtection protection_method_;
58 int64_t rtt_ms_; 58 int64_t rtt_ms_;
59 uint32_t render_delay_ms_; 59 uint32_t render_delay_ms_;
60 uint32_t min_playout_delay_ms_; 60 uint32_t min_playout_delay_ms_;
61 rtc::scoped_ptr<NullEventFactory> null_event_factory_; 61 std::unique_ptr<NullEventFactory> null_event_factory_;
62 rtc::scoped_ptr<CriticalSectionWrapper> crit_sect_; 62 std::unique_ptr<CriticalSectionWrapper> crit_sect_;
63 Sinks sinks_; 63 Sinks sinks_;
64 64
65 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(VcmPayloadSinkFactory); 65 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(VcmPayloadSinkFactory);
66 }; 66 };
67 } // namespace rtpplayer 67 } // namespace rtpplayer
68 } // namespace webrtc 68 } // namespace webrtc
69 69
70 #endif // WEBRTC_MODULES_VIDEO_CODING_TEST_VCM_PAYLOAD_SINK_FACTORY_H_ 70 #endif // WEBRTC_MODULES_VIDEO_CODING_TEST_VCM_PAYLOAD_SINK_FACTORY_H_
OLDNEW
« no previous file with comments | « webrtc/modules/video_coding/test/rtp_player.cc ('k') | webrtc/modules/video_coding/test/vcm_payload_sink_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698