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

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

Issue 1419673014: Remove frame time scheduing in IncomingVideoStream (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Pass bool into IncomingVideoStream, Remove thread in disabled case 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_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 ThreadWrapper;
24 class VideoRenderer;
24 25
25 class VideoRenderCallback { 26 class VideoRenderCallback {
26 public: 27 public:
27 virtual int32_t RenderFrame(const uint32_t streamId, 28 virtual int32_t RenderFrame(const uint32_t streamId,
28 const VideoFrame& videoFrame) = 0; 29 const VideoFrame& videoFrame) = 0;
29 30
30 protected: 31 protected:
31 virtual ~VideoRenderCallback() {} 32 virtual ~VideoRenderCallback() {}
32 }; 33 };
33 34
34 class IncomingVideoStream : public VideoRenderCallback { 35 class IncomingVideoStream : public VideoRenderCallback {
35 public: 36 public:
36 explicit IncomingVideoStream(uint32_t stream_id); 37 IncomingVideoStream(uint32_t stream_id, bool disable_prerenderer_smoothing);
37 ~IncomingVideoStream(); 38 ~IncomingVideoStream();
38 39
39 // Get callback to deliver frames to the module. 40 // Get callback to deliver frames to the module.
40 VideoRenderCallback* ModuleCallback(); 41 VideoRenderCallback* ModuleCallback();
41 virtual int32_t RenderFrame(const uint32_t stream_id, 42 virtual int32_t RenderFrame(const uint32_t stream_id,
42 const VideoFrame& video_frame); 43 const VideoFrame& video_frame);
43 44
44 // Set callback to the platform dependent code. 45 // Set callback to the platform dependent code.
45 void SetRenderCallback(VideoRenderCallback* render_callback); 46 void SetRenderCallback(VideoRenderCallback* render_callback);
46 47
(...skipping 20 matching lines...) Expand all
67 68
68 protected: 69 protected:
69 static bool IncomingVideoStreamThreadFun(void* obj); 70 static bool IncomingVideoStreamThreadFun(void* obj);
70 bool IncomingVideoStreamProcess(); 71 bool IncomingVideoStreamProcess();
71 72
72 private: 73 private:
73 enum { kEventStartupTimeMs = 10 }; 74 enum { kEventStartupTimeMs = 10 };
74 enum { kEventMaxWaitTimeMs = 100 }; 75 enum { kEventMaxWaitTimeMs = 100 };
75 enum { kFrameRatePeriodMs = 1000 }; 76 enum { kFrameRatePeriodMs = 1000 };
76 77
78 void HandOverFrame(const VideoFrame& video_frame)
79 GUARDED_BY(thread_critsect_);
80
77 uint32_t const stream_id_; 81 uint32_t const stream_id_;
82 const bool disable_prerenderer_smoothing_;
78 // Critsects in allowed to enter order. 83 // Critsects in allowed to enter order.
79 const rtc::scoped_ptr<CriticalSectionWrapper> stream_critsect_; 84 const rtc::scoped_ptr<CriticalSectionWrapper> stream_critsect_;
80 const rtc::scoped_ptr<CriticalSectionWrapper> thread_critsect_; 85 const rtc::scoped_ptr<CriticalSectionWrapper> thread_critsect_;
81 const rtc::scoped_ptr<CriticalSectionWrapper> buffer_critsect_; 86 const rtc::scoped_ptr<CriticalSectionWrapper> buffer_critsect_;
82 rtc::scoped_ptr<ThreadWrapper> incoming_render_thread_ 87 rtc::scoped_ptr<ThreadWrapper> incoming_render_thread_
83 GUARDED_BY(thread_critsect_); 88 GUARDED_BY(thread_critsect_);
84 rtc::scoped_ptr<EventTimerWrapper> deliver_buffer_event_; 89 rtc::scoped_ptr<EventTimerWrapper> deliver_buffer_event_;
85 90
86 bool running_ GUARDED_BY(stream_critsect_); 91 bool running_ GUARDED_BY(stream_critsect_);
87 VideoRenderCallback* external_callback_ GUARDED_BY(thread_critsect_); 92 VideoRenderCallback* external_callback_ GUARDED_BY(thread_critsect_);
88 VideoRenderCallback* render_callback_ GUARDED_BY(thread_critsect_); 93 VideoRenderCallback* render_callback_ GUARDED_BY(thread_critsect_);
89 const rtc::scoped_ptr<VideoRenderFrames> render_buffers_ 94 const rtc::scoped_ptr<VideoRenderFrames> render_buffers_
90 GUARDED_BY(buffer_critsect_); 95 GUARDED_BY(buffer_critsect_);
91 96
92 uint32_t incoming_rate_ GUARDED_BY(stream_critsect_); 97 uint32_t incoming_rate_ GUARDED_BY(stream_critsect_);
93 int64_t last_rate_calculation_time_ms_ GUARDED_BY(stream_critsect_); 98 int64_t last_rate_calculation_time_ms_ GUARDED_BY(stream_critsect_);
94 uint16_t num_frames_since_last_calculation_ GUARDED_BY(stream_critsect_); 99 uint16_t num_frames_since_last_calculation_ GUARDED_BY(stream_critsect_);
95 int64_t last_render_time_ms_ GUARDED_BY(thread_critsect_); 100 int64_t last_render_time_ms_ GUARDED_BY(thread_critsect_);
96 VideoFrame temp_frame_ GUARDED_BY(thread_critsect_); 101 VideoFrame temp_frame_ GUARDED_BY(thread_critsect_);
97 VideoFrame start_image_ GUARDED_BY(thread_critsect_); 102 VideoFrame start_image_ GUARDED_BY(thread_critsect_);
98 VideoFrame timeout_image_ GUARDED_BY(thread_critsect_); 103 VideoFrame timeout_image_ GUARDED_BY(thread_critsect_);
99 uint32_t timeout_time_ GUARDED_BY(thread_critsect_); 104 uint32_t timeout_time_ GUARDED_BY(thread_critsect_);
100 }; 105 };
101 106
102 } // namespace webrtc 107 } // namespace webrtc
103 108
104 #endif // WEBRTC_COMMON_VIDEO_INCLUDE_INCOMING_VIDEO_STREAM_H_ 109 #endif // WEBRTC_COMMON_VIDEO_INCLUDE_INCOMING_VIDEO_STREAM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698