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

Side by Side Diff: webrtc/modules/audio_coding/neteq/tools/rtc_event_log_source.h

Issue 1697823002: Replace scoped_ptr with unique_ptr in webrtc/modules/audio_coding/neteq/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@up-codecs
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) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 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_AUDIO_CODING_NETEQ_TOOLS_RTC_EVENT_LOG_SOURCE_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_RTC_EVENT_LOG_SOURCE_H_
12 #define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_RTC_EVENT_LOG_SOURCE_H_ 12 #define WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_RTC_EVENT_LOG_SOURCE_H_
13 13
14 #include <memory>
14 #include <string> 15 #include <string>
15 16
16 #include "webrtc/base/constructormagic.h" 17 #include "webrtc/base/constructormagic.h"
17 #include "webrtc/base/scoped_ptr.h"
18 #include "webrtc/modules/audio_coding/neteq/tools/packet_source.h" 18 #include "webrtc/modules/audio_coding/neteq/tools/packet_source.h"
19 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" 19 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
20 20
21 namespace webrtc { 21 namespace webrtc {
22 22
23 class RtpHeaderParser; 23 class RtpHeaderParser;
24 24
25 namespace rtclog { 25 namespace rtclog {
26 class EventStream; 26 class EventStream;
27 } // namespace rtclog 27 } // namespace rtclog
(...skipping 23 matching lines...) Expand all
51 int64_t NextAudioOutputEventMs(); 51 int64_t NextAudioOutputEventMs();
52 52
53 private: 53 private:
54 RtcEventLogSource(); 54 RtcEventLogSource();
55 55
56 bool OpenFile(const std::string& file_name); 56 bool OpenFile(const std::string& file_name);
57 57
58 int rtp_packet_index_ = 0; 58 int rtp_packet_index_ = 0;
59 int audio_output_index_ = 0; 59 int audio_output_index_ = 0;
60 60
61 rtc::scoped_ptr<rtclog::EventStream> event_log_; 61 std::unique_ptr<rtclog::EventStream> event_log_;
62 rtc::scoped_ptr<RtpHeaderParser> parser_; 62 std::unique_ptr<RtpHeaderParser> parser_;
63 63
64 RTC_DISALLOW_COPY_AND_ASSIGN(RtcEventLogSource); 64 RTC_DISALLOW_COPY_AND_ASSIGN(RtcEventLogSource);
65 }; 65 };
66 66
67 } // namespace test 67 } // namespace test
68 } // namespace webrtc 68 } // namespace webrtc
69 69
70 #endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_RTC_EVENT_LOG_SOURCE_H_ 70 #endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_RTC_EVENT_LOG_SOURCE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698