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

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

Issue 2005873002: Let PacketSource::NextPacket() return an std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
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
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
(...skipping 20 matching lines...) Expand all
31 public: 31 public:
32 // Creates an RtcEventLogSource reading from |file_name|. If the file cannot 32 // Creates an RtcEventLogSource reading from |file_name|. If the file cannot
33 // be opened, or has the wrong format, NULL will be returned. 33 // be opened, or has the wrong format, NULL will be returned.
34 static RtcEventLogSource* Create(const std::string& file_name); 34 static RtcEventLogSource* Create(const std::string& file_name);
35 35
36 virtual ~RtcEventLogSource(); 36 virtual ~RtcEventLogSource();
37 37
38 // Registers an RTP header extension and binds it to |id|. 38 // Registers an RTP header extension and binds it to |id|.
39 virtual bool RegisterRtpHeaderExtension(RTPExtensionType type, uint8_t id); 39 virtual bool RegisterRtpHeaderExtension(RTPExtensionType type, uint8_t id);
40 40
41 // Returns a pointer to the next packet. Returns NULL if end of file was 41 std::unique_ptr<Packet> NextPacket() override;
42 // reached.
kwiberg-webrtc 2016/05/24 09:04:56 Why is this comment no longer needed?
hlundin-webrtc 2016/05/24 10:59:15 Same as before.
43 Packet* NextPacket() override;
44 42
45 // Returns the timestamp of the next audio output event, in milliseconds. The 43 // Returns the timestamp of the next audio output event, in milliseconds. The
46 // maximum value of int64_t is returned if there are no more audio output 44 // maximum value of int64_t is returned if there are no more audio output
47 // events available. 45 // events available.
48 int64_t NextAudioOutputEventMs(); 46 int64_t NextAudioOutputEventMs();
49 47
50 private: 48 private:
51 RtcEventLogSource(); 49 RtcEventLogSource();
52 50
53 bool OpenFile(const std::string& file_name); 51 bool OpenFile(const std::string& file_name);
54 52
55 size_t rtp_packet_index_ = 0; 53 size_t rtp_packet_index_ = 0;
56 size_t audio_output_index_ = 0; 54 size_t audio_output_index_ = 0;
57 55
58 ParsedRtcEventLog parsed_stream_; 56 ParsedRtcEventLog parsed_stream_;
59 std::unique_ptr<RtpHeaderParser> parser_; 57 std::unique_ptr<RtpHeaderParser> parser_;
60 58
61 RTC_DISALLOW_COPY_AND_ASSIGN(RtcEventLogSource); 59 RTC_DISALLOW_COPY_AND_ASSIGN(RtcEventLogSource);
62 }; 60 };
63 61
64 } // namespace test 62 } // namespace test
65 } // namespace webrtc 63 } // namespace webrtc
66 64
67 #endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_RTC_EVENT_LOG_SOURCE_H_ 65 #endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_TOOLS_RTC_EVENT_LOG_SOURCE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698