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

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

Issue 1942823002: Remove webrtc/base/scoped_ptr.h (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: fix additional scoped_ptr uses that had been added 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 <map> 15 #include <map>
16 #include <memory> 16 #include <memory>
17 #include <queue> 17 #include <queue>
18 #include <set> 18 #include <set>
19 #include <utility> 19 #include <utility>
20 #include <vector> 20 #include <vector>
21 21
22 #include "webrtc/base/criticalsection.h" 22 #include "webrtc/base/criticalsection.h"
23 #include "webrtc/base/scoped_ptr.h"
24 #include "webrtc/base/thread_annotations.h" 23 #include "webrtc/base/thread_annotations.h"
25 #include "webrtc/modules/include/module_common_types.h" 24 #include "webrtc/modules/include/module_common_types.h"
26 #include "webrtc/modules/video_coding/packet.h" 25 #include "webrtc/modules/video_coding/packet.h"
27 #include "webrtc/modules/video_coding/sequence_number_util.h" 26 #include "webrtc/modules/video_coding/sequence_number_util.h"
28 27
29 namespace webrtc { 28 namespace webrtc {
30 namespace video_coding { 29 namespace video_coding {
31 30
32 class FrameObject; 31 class FrameObject;
33 class RtpFrameObject; 32 class RtpFrameObject;
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 // For every temporal layer, keep a set of which frames that are missing. 224 // For every temporal layer, keep a set of which frames that are missing.
226 std::array<std::set<uint16_t, DescendingSeqNumComp<uint16_t, kPicIdLength>>, 225 std::array<std::set<uint16_t, DescendingSeqNumComp<uint16_t, kPicIdLength>>,
227 kMaxTemporalLayers> 226 kMaxTemporalLayers>
228 missing_frames_for_layer_ GUARDED_BY(crit_); 227 missing_frames_for_layer_ GUARDED_BY(crit_);
229 }; 228 };
230 229
231 } // namespace video_coding 230 } // namespace video_coding
232 } // namespace webrtc 231 } // namespace webrtc
233 232
234 #endif // WEBRTC_MODULES_VIDEO_CODING_PACKET_BUFFER_H_ 233 #endif // WEBRTC_MODULES_VIDEO_CODING_PACKET_BUFFER_H_
OLDNEW
« no previous file with comments | « webrtc/modules/utility/include/process_thread.h ('k') | webrtc/modules/video_coding/test/rtp_player.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698