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

Side by Side Diff: webrtc/common_video/include/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: Remove unnecessary if 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
« no previous file with comments | « talk/media/webrtc/webrtcvideoengine2.cc ('k') | webrtc/common_video/incoming_video_stream.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "webrtc/base/scoped_ptr.h" 14 #include "webrtc/base/scoped_ptr.h"
15 #include "webrtc/base/thread_annotations.h" 15 #include "webrtc/base/thread_annotations.h"
16 #include "webrtc/common_video/video_render_frames.h" 16 #include "webrtc/common_video/video_render_frames.h"
17 17
18 namespace webrtc { 18 namespace webrtc {
19 class CriticalSectionWrapper; 19 class CriticalSectionWrapper;
20 class EventTimerWrapper; 20 class EventTimerWrapper;
21 class PlatformThread; 21 class PlatformThread;
22 class VideoRenderer;
22 23
23 class VideoRenderCallback { 24 class VideoRenderCallback {
24 public: 25 public:
25 virtual int32_t RenderFrame(const uint32_t streamId, 26 virtual int32_t RenderFrame(const uint32_t streamId,
26 const VideoFrame& videoFrame) = 0; 27 const VideoFrame& videoFrame) = 0;
27 28
28 protected: 29 protected:
29 virtual ~VideoRenderCallback() {} 30 virtual ~VideoRenderCallback() {}
30 }; 31 };
31 32
32 class IncomingVideoStream : public VideoRenderCallback { 33 class IncomingVideoStream : public VideoRenderCallback {
33 public: 34 public:
34 explicit IncomingVideoStream(uint32_t stream_id); 35 IncomingVideoStream(uint32_t stream_id, bool disable_prerenderer_smoothing);
35 ~IncomingVideoStream(); 36 ~IncomingVideoStream();
36 37
37 // Get callback to deliver frames to the module. 38 // Get callback to deliver frames to the module.
38 VideoRenderCallback* ModuleCallback(); 39 VideoRenderCallback* ModuleCallback();
39 virtual int32_t RenderFrame(const uint32_t stream_id, 40 virtual int32_t RenderFrame(const uint32_t stream_id,
40 const VideoFrame& video_frame); 41 const VideoFrame& video_frame);
41 42
42 // Set callback to the platform dependent code. 43 // Set callback to the platform dependent code.
43 void SetRenderCallback(VideoRenderCallback* render_callback); 44 void SetRenderCallback(VideoRenderCallback* render_callback);
44 45
(...skipping 20 matching lines...) Expand all
65 66
66 protected: 67 protected:
67 static bool IncomingVideoStreamThreadFun(void* obj); 68 static bool IncomingVideoStreamThreadFun(void* obj);
68 bool IncomingVideoStreamProcess(); 69 bool IncomingVideoStreamProcess();
69 70
70 private: 71 private:
71 enum { kEventStartupTimeMs = 10 }; 72 enum { kEventStartupTimeMs = 10 };
72 enum { kEventMaxWaitTimeMs = 100 }; 73 enum { kEventMaxWaitTimeMs = 100 };
73 enum { kFrameRatePeriodMs = 1000 }; 74 enum { kFrameRatePeriodMs = 1000 };
74 75
76 void DeliverFrame(const VideoFrame& video_frame);
77
75 uint32_t const stream_id_; 78 uint32_t const stream_id_;
79 const bool disable_prerenderer_smoothing_;
76 // Critsects in allowed to enter order. 80 // Critsects in allowed to enter order.
77 const rtc::scoped_ptr<CriticalSectionWrapper> stream_critsect_; 81 const rtc::scoped_ptr<CriticalSectionWrapper> stream_critsect_;
78 const rtc::scoped_ptr<CriticalSectionWrapper> thread_critsect_; 82 const rtc::scoped_ptr<CriticalSectionWrapper> thread_critsect_;
79 const rtc::scoped_ptr<CriticalSectionWrapper> buffer_critsect_; 83 const rtc::scoped_ptr<CriticalSectionWrapper> buffer_critsect_;
80 rtc::scoped_ptr<PlatformThread> incoming_render_thread_ 84 rtc::scoped_ptr<PlatformThread> incoming_render_thread_
81 GUARDED_BY(thread_critsect_); 85 GUARDED_BY(thread_critsect_);
82 rtc::scoped_ptr<EventTimerWrapper> deliver_buffer_event_; 86 rtc::scoped_ptr<EventTimerWrapper> deliver_buffer_event_;
83 87
84 bool running_ GUARDED_BY(stream_critsect_); 88 bool running_ GUARDED_BY(stream_critsect_);
85 VideoRenderCallback* external_callback_ GUARDED_BY(thread_critsect_); 89 VideoRenderCallback* external_callback_ GUARDED_BY(thread_critsect_);
86 VideoRenderCallback* render_callback_ GUARDED_BY(thread_critsect_); 90 VideoRenderCallback* render_callback_ GUARDED_BY(thread_critsect_);
87 const rtc::scoped_ptr<VideoRenderFrames> render_buffers_ 91 const rtc::scoped_ptr<VideoRenderFrames> render_buffers_
88 GUARDED_BY(buffer_critsect_); 92 GUARDED_BY(buffer_critsect_);
89 93
90 uint32_t incoming_rate_ GUARDED_BY(stream_critsect_); 94 uint32_t incoming_rate_ GUARDED_BY(stream_critsect_);
91 int64_t last_rate_calculation_time_ms_ GUARDED_BY(stream_critsect_); 95 int64_t last_rate_calculation_time_ms_ GUARDED_BY(stream_critsect_);
92 uint16_t num_frames_since_last_calculation_ GUARDED_BY(stream_critsect_); 96 uint16_t num_frames_since_last_calculation_ GUARDED_BY(stream_critsect_);
93 int64_t last_render_time_ms_ GUARDED_BY(thread_critsect_); 97 int64_t last_render_time_ms_ GUARDED_BY(thread_critsect_);
94 VideoFrame temp_frame_ GUARDED_BY(thread_critsect_); 98 VideoFrame temp_frame_ GUARDED_BY(thread_critsect_);
95 VideoFrame start_image_ GUARDED_BY(thread_critsect_); 99 VideoFrame start_image_ GUARDED_BY(thread_critsect_);
96 VideoFrame timeout_image_ GUARDED_BY(thread_critsect_); 100 VideoFrame timeout_image_ GUARDED_BY(thread_critsect_);
97 uint32_t timeout_time_ GUARDED_BY(thread_critsect_); 101 uint32_t timeout_time_ GUARDED_BY(thread_critsect_);
98 }; 102 };
99 103
100 } // namespace webrtc 104 } // namespace webrtc
101 105
102 #endif // WEBRTC_COMMON_VIDEO_INCLUDE_INCOMING_VIDEO_STREAM_H_ 106 #endif // WEBRTC_COMMON_VIDEO_INCLUDE_INCOMING_VIDEO_STREAM_H_
OLDNEW
« no previous file with comments | « talk/media/webrtc/webrtcvideoengine2.cc ('k') | webrtc/common_video/incoming_video_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698