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

Side by Side Diff: webrtc/video_engine/vie_encoder.h

Issue 1411573007: Removed vie_defines.h (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 1 month 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) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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_VIDEO_ENGINE_VIE_ENCODER_H_ 11 #ifndef WEBRTC_VIDEO_ENGINE_VIE_ENCODER_H_
12 #define WEBRTC_VIDEO_ENGINE_VIE_ENCODER_H_ 12 #define WEBRTC_VIDEO_ENGINE_VIE_ENCODER_H_
13 13
14 #include <map> 14 #include <map>
15 #include <vector> 15 #include <vector>
16 16
17 #include "webrtc/base/scoped_ptr.h" 17 #include "webrtc/base/scoped_ptr.h"
18 #include "webrtc/base/scoped_ref_ptr.h" 18 #include "webrtc/base/scoped_ref_ptr.h"
19 #include "webrtc/base/thread_annotations.h" 19 #include "webrtc/base/thread_annotations.h"
20 #include "webrtc/common_types.h" 20 #include "webrtc/common_types.h"
21 #include "webrtc/frame_callback.h" 21 #include "webrtc/frame_callback.h"
22 #include "webrtc/modules/bitrate_controller/include/bitrate_allocator.h" 22 #include "webrtc/modules/bitrate_controller/include/bitrate_allocator.h"
23 #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h" 23 #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h"
24 #include "webrtc/modules/video_coding/main/interface/video_coding_defines.h" 24 #include "webrtc/modules/video_coding/main/interface/video_coding_defines.h"
25 #include "webrtc/modules/video_processing/main/interface/video_processing.h" 25 #include "webrtc/modules/video_processing/main/interface/video_processing.h"
26 #include "webrtc/typedefs.h" 26 #include "webrtc/typedefs.h"
27 #include "webrtc/video/video_capture_input.h" 27 #include "webrtc/video/video_capture_input.h"
28 #include "webrtc/video_engine/vie_defines.h"
29 28
30 namespace webrtc { 29 namespace webrtc {
31 30
32 class Config; 31 class Config;
33 class CriticalSectionWrapper; 32 class CriticalSectionWrapper;
34 class EncodedImageCallback; 33 class EncodedImageCallback;
35 class PacedSender; 34 class PacedSender;
36 class PayloadRouter; 35 class PayloadRouter;
37 class ProcessThread; 36 class ProcessThread;
38 class QMVideoSettingsCallback; 37 class QMVideoSettingsCallback;
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 bool has_received_rpsi_ GUARDED_BY(data_cs_); 195 bool has_received_rpsi_ GUARDED_BY(data_cs_);
197 uint64_t picture_id_rpsi_ GUARDED_BY(data_cs_); 196 uint64_t picture_id_rpsi_ GUARDED_BY(data_cs_);
198 std::map<uint32_t, int> ssrc_streams_ GUARDED_BY(data_cs_); 197 std::map<uint32_t, int> ssrc_streams_ GUARDED_BY(data_cs_);
199 198
200 bool video_suspended_ GUARDED_BY(data_cs_); 199 bool video_suspended_ GUARDED_BY(data_cs_);
201 }; 200 };
202 201
203 } // namespace webrtc 202 } // namespace webrtc
204 203
205 #endif // WEBRTC_VIDEO_ENGINE_VIE_ENCODER_H_ 204 #endif // WEBRTC_VIDEO_ENGINE_VIE_ENCODER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698