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

Unified 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: Totally disable the functionality 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 side-by-side diff with in-line comments
Download patch
Index: webrtc/common_video/interface/incoming_video_stream.h
diff --git a/webrtc/common_video/interface/incoming_video_stream.h b/webrtc/common_video/interface/incoming_video_stream.h
index 74ecc4e837b2938e1a2eeacbf9db99307307c0d5..a34418bbcdb79fef69dde4141b736493511f954a 100644
--- a/webrtc/common_video/interface/incoming_video_stream.h
+++ b/webrtc/common_video/interface/incoming_video_stream.h
@@ -13,7 +13,7 @@
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/base/thread_annotations.h"
-#include "webrtc/common_video/video_render_frames.h"
+#include "webrtc/video_frame.h"
namespace webrtc {
class CriticalSectionWrapper;
@@ -63,10 +63,6 @@ class IncomingVideoStream : public VideoRenderCallback {
int32_t SetExpectedRenderDelay(int32_t delay_ms);
- protected:
- static bool IncomingVideoStreamThreadFun(void* obj);
- bool IncomingVideoStreamProcess();
-
private:
enum { kEventStartupTimeMs = 10 };
enum { kEventMaxWaitTimeMs = 100 };
@@ -76,16 +72,10 @@ class IncomingVideoStream : public VideoRenderCallback {
// Critsects in allowed to enter order.
const rtc::scoped_ptr<CriticalSectionWrapper> stream_critsect_;
const rtc::scoped_ptr<CriticalSectionWrapper> thread_critsect_;
- const rtc::scoped_ptr<CriticalSectionWrapper> buffer_critsect_;
- rtc::scoped_ptr<ThreadWrapper> incoming_render_thread_
- GUARDED_BY(thread_critsect_);
- rtc::scoped_ptr<EventTimerWrapper> deliver_buffer_event_;
bool running_ GUARDED_BY(stream_critsect_);
VideoRenderCallback* external_callback_ GUARDED_BY(thread_critsect_);
VideoRenderCallback* render_callback_ GUARDED_BY(thread_critsect_);
- const rtc::scoped_ptr<VideoRenderFrames> render_buffers_
- GUARDED_BY(buffer_critsect_);
uint32_t incoming_rate_ GUARDED_BY(stream_critsect_);
int64_t last_rate_calculation_time_ms_ GUARDED_BY(stream_critsect_);

Powered by Google App Engine
This is Rietveld 408576698