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

Side by Side Diff: webrtc/modules/video_coding/packet_buffer.h

Issue 1923133002: Replace the remaining scoped_ptr with unique_ptr in webrtc/modules/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Don't remove #include "scoped_ptr.h" from .h files 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) 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_MODULES_VIDEO_CODING_PACKET_BUFFER_H_ 11 #ifndef WEBRTC_MODULES_VIDEO_CODING_PACKET_BUFFER_H_
12 #define WEBRTC_MODULES_VIDEO_CODING_PACKET_BUFFER_H_ 12 #define WEBRTC_MODULES_VIDEO_CODING_PACKET_BUFFER_H_
13 13
14 #include <array> 14 #include <array>
15 #include <vector> 15 #include <vector>
16 #include <map> 16 #include <map>
17 #include <memory>
17 #include <set> 18 #include <set>
18 #include <queue> 19 #include <queue>
19 20
20 #include "webrtc/base/criticalsection.h" 21 #include "webrtc/base/criticalsection.h"
21 #include "webrtc/base/scoped_ptr.h" 22 #include "webrtc/base/scoped_ptr.h"
22 #include "webrtc/base/thread_annotations.h" 23 #include "webrtc/base/thread_annotations.h"
23 #include "webrtc/modules/video_coding/packet.h" 24 #include "webrtc/modules/video_coding/packet.h"
24 #include "webrtc/modules/video_coding/sequence_number_util.h" 25 #include "webrtc/modules/video_coding/sequence_number_util.h"
25 26
26 namespace webrtc { 27 namespace webrtc {
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 // layer given a Tl0 picture index. 172 // layer given a Tl0 picture index.
172 std::map<uint8_t, 173 std::map<uint8_t,
173 std::array<int16_t, kMaxTemporalLayer>, 174 std::array<int16_t, kMaxTemporalLayer>,
174 DescendingSeqNumComp<uint8_t>> layer_info_ GUARDED_BY(crit_); 175 DescendingSeqNumComp<uint8_t>> layer_info_ GUARDED_BY(crit_);
175 }; 176 };
176 177
177 } // namespace video_coding 178 } // namespace video_coding
178 } // namespace webrtc 179 } // namespace webrtc
179 180
180 #endif // WEBRTC_MODULES_VIDEO_CODING_PACKET_BUFFER_H_ 181 #endif // WEBRTC_MODULES_VIDEO_CODING_PACKET_BUFFER_H_
OLDNEW
« no previous file with comments | « webrtc/modules/video_coding/jitter_buffer_unittest.cc ('k') | webrtc/modules/video_coding/packet_buffer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698