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

Side by Side Diff: webrtc/common_video/interface/incoming_video_stream.h

Issue 1418913006: common_video: rename interface -> include (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased 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_COMMON_VIDEO_INTERFACE_INCOMING_VIDEO_STREAM_H_ 11 #ifndef WEBRTC_COMMON_VIDEO_INCLUDE_INCOMING_VIDEO_STREAM_H_
12 #define WEBRTC_COMMON_VIDEO_INTERFACE_INCOMING_VIDEO_STREAM_H_ 12 #define WEBRTC_COMMON_VIDEO_INCLUDE_INCOMING_VIDEO_STREAM_H_
13
14 #pragma message("WARNING: common_video/include is DEPRECATED; use common_video/i nclude")
13 15
14 #include "webrtc/base/scoped_ptr.h" 16 #include "webrtc/base/scoped_ptr.h"
15 #include "webrtc/base/thread_annotations.h" 17 #include "webrtc/base/thread_annotations.h"
16 #include "webrtc/common_video/video_render_frames.h" 18 #include "webrtc/common_video/video_render_frames.h"
17 19
18 namespace webrtc { 20 namespace webrtc {
19 class CriticalSectionWrapper; 21 class CriticalSectionWrapper;
20 class EventTimerWrapper; 22 class EventTimerWrapper;
21 class ThreadWrapper; 23 class ThreadWrapper;
22 24
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 uint16_t num_frames_since_last_calculation_ GUARDED_BY(stream_critsect_); 94 uint16_t num_frames_since_last_calculation_ GUARDED_BY(stream_critsect_);
93 int64_t last_render_time_ms_ GUARDED_BY(thread_critsect_); 95 int64_t last_render_time_ms_ GUARDED_BY(thread_critsect_);
94 VideoFrame temp_frame_ GUARDED_BY(thread_critsect_); 96 VideoFrame temp_frame_ GUARDED_BY(thread_critsect_);
95 VideoFrame start_image_ GUARDED_BY(thread_critsect_); 97 VideoFrame start_image_ GUARDED_BY(thread_critsect_);
96 VideoFrame timeout_image_ GUARDED_BY(thread_critsect_); 98 VideoFrame timeout_image_ GUARDED_BY(thread_critsect_);
97 uint32_t timeout_time_ GUARDED_BY(thread_critsect_); 99 uint32_t timeout_time_ GUARDED_BY(thread_critsect_);
98 }; 100 };
99 101
100 } // namespace webrtc 102 } // namespace webrtc
101 103
102 #endif // WEBRTC_COMMON_VIDEO_INTERFACE_INCOMING_VIDEO_STREAM_H_ 104 #endif // WEBRTC_COMMON_VIDEO_INCLUDE_INCOMING_VIDEO_STREAM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698