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

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

Issue 1469013002: Move ThreadWrapper to ProcessThread in base. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: removed comment Created 5 years 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_INCLUDE_INCOMING_VIDEO_STREAM_H_ 11 #ifndef WEBRTC_COMMON_VIDEO_INCLUDE_INCOMING_VIDEO_STREAM_H_
12 #define WEBRTC_COMMON_VIDEO_INCLUDE_INCOMING_VIDEO_STREAM_H_ 12 #define WEBRTC_COMMON_VIDEO_INCLUDE_INCOMING_VIDEO_STREAM_H_
13 13
14 #pragma message("WARNING: common_video/include is DEPRECATED; use common_video/i nclude") 14 #pragma message("WARNING: common_video/include is DEPRECATED; use common_video/i nclude")
15 15
16 #include "webrtc/base/scoped_ptr.h" 16 #include "webrtc/base/scoped_ptr.h"
17 #include "webrtc/base/thread_annotations.h" 17 #include "webrtc/base/thread_annotations.h"
18 #include "webrtc/common_video/video_render_frames.h" 18 #include "webrtc/common_video/video_render_frames.h"
19 19
20 namespace webrtc { 20 namespace webrtc {
21 class CriticalSectionWrapper; 21 class CriticalSectionWrapper;
22 class EventTimerWrapper; 22 class EventTimerWrapper;
23 class ThreadWrapper; 23 class PlatformThread;
24 24
25 class VideoRenderCallback { 25 class VideoRenderCallback {
26 public: 26 public:
27 virtual int32_t RenderFrame(const uint32_t streamId, 27 virtual int32_t RenderFrame(const uint32_t streamId,
28 const VideoFrame& videoFrame) = 0; 28 const VideoFrame& videoFrame) = 0;
29 29
30 protected: 30 protected:
31 virtual ~VideoRenderCallback() {} 31 virtual ~VideoRenderCallback() {}
32 }; 32 };
33 33
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 private: 72 private:
73 enum { kEventStartupTimeMs = 10 }; 73 enum { kEventStartupTimeMs = 10 };
74 enum { kEventMaxWaitTimeMs = 100 }; 74 enum { kEventMaxWaitTimeMs = 100 };
75 enum { kFrameRatePeriodMs = 1000 }; 75 enum { kFrameRatePeriodMs = 1000 };
76 76
77 uint32_t const stream_id_; 77 uint32_t const stream_id_;
78 // Critsects in allowed to enter order. 78 // Critsects in allowed to enter order.
79 const rtc::scoped_ptr<CriticalSectionWrapper> stream_critsect_; 79 const rtc::scoped_ptr<CriticalSectionWrapper> stream_critsect_;
80 const rtc::scoped_ptr<CriticalSectionWrapper> thread_critsect_; 80 const rtc::scoped_ptr<CriticalSectionWrapper> thread_critsect_;
81 const rtc::scoped_ptr<CriticalSectionWrapper> buffer_critsect_; 81 const rtc::scoped_ptr<CriticalSectionWrapper> buffer_critsect_;
82 rtc::scoped_ptr<ThreadWrapper> incoming_render_thread_ 82 rtc::scoped_ptr<PlatformThread> incoming_render_thread_
83 GUARDED_BY(thread_critsect_); 83 GUARDED_BY(thread_critsect_);
84 rtc::scoped_ptr<EventTimerWrapper> deliver_buffer_event_; 84 rtc::scoped_ptr<EventTimerWrapper> deliver_buffer_event_;
85 85
86 bool running_ GUARDED_BY(stream_critsect_); 86 bool running_ GUARDED_BY(stream_critsect_);
87 VideoRenderCallback* external_callback_ GUARDED_BY(thread_critsect_); 87 VideoRenderCallback* external_callback_ GUARDED_BY(thread_critsect_);
88 VideoRenderCallback* render_callback_ GUARDED_BY(thread_critsect_); 88 VideoRenderCallback* render_callback_ GUARDED_BY(thread_critsect_);
89 const rtc::scoped_ptr<VideoRenderFrames> render_buffers_ 89 const rtc::scoped_ptr<VideoRenderFrames> render_buffers_
90 GUARDED_BY(buffer_critsect_); 90 GUARDED_BY(buffer_critsect_);
91 91
92 uint32_t incoming_rate_ GUARDED_BY(stream_critsect_); 92 uint32_t incoming_rate_ GUARDED_BY(stream_critsect_);
93 int64_t last_rate_calculation_time_ms_ GUARDED_BY(stream_critsect_); 93 int64_t last_rate_calculation_time_ms_ GUARDED_BY(stream_critsect_);
94 uint16_t num_frames_since_last_calculation_ GUARDED_BY(stream_critsect_); 94 uint16_t num_frames_since_last_calculation_ GUARDED_BY(stream_critsect_);
95 int64_t last_render_time_ms_ GUARDED_BY(thread_critsect_); 95 int64_t last_render_time_ms_ GUARDED_BY(thread_critsect_);
96 VideoFrame temp_frame_ GUARDED_BY(thread_critsect_); 96 VideoFrame temp_frame_ GUARDED_BY(thread_critsect_);
97 VideoFrame start_image_ GUARDED_BY(thread_critsect_); 97 VideoFrame start_image_ GUARDED_BY(thread_critsect_);
98 VideoFrame timeout_image_ GUARDED_BY(thread_critsect_); 98 VideoFrame timeout_image_ GUARDED_BY(thread_critsect_);
99 uint32_t timeout_time_ GUARDED_BY(thread_critsect_); 99 uint32_t timeout_time_ GUARDED_BY(thread_critsect_);
100 }; 100 };
101 101
102 } // namespace webrtc 102 } // namespace webrtc
103 103
104 #endif // WEBRTC_COMMON_VIDEO_INCLUDE_INCOMING_VIDEO_STREAM_H_ 104 #endif // WEBRTC_COMMON_VIDEO_INCLUDE_INCOMING_VIDEO_STREAM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698