| 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 886dae58e605a5788286822ab95214bfc84103c7..06f11c8d6276d4fe036be64cbc2f15f2c2094ac2 100644
|
| --- a/webrtc/common_video/interface/incoming_video_stream.h
|
| +++ b/webrtc/common_video/interface/incoming_video_stream.h
|
| @@ -21,6 +21,7 @@ namespace webrtc {
|
| class CriticalSectionWrapper;
|
| class EventTimerWrapper;
|
| class ThreadWrapper;
|
| +class VideoRenderer;
|
|
|
| class VideoRenderCallback {
|
| public:
|
| @@ -33,7 +34,7 @@ class VideoRenderCallback {
|
|
|
| class IncomingVideoStream : public VideoRenderCallback {
|
| public:
|
| - explicit IncomingVideoStream(uint32_t stream_id);
|
| + IncomingVideoStream(uint32_t stream_id, bool disable_prerenderer_smoothing);
|
| ~IncomingVideoStream();
|
|
|
| // Get callback to deliver frames to the module.
|
| @@ -74,7 +75,11 @@ class IncomingVideoStream : public VideoRenderCallback {
|
| enum { kEventMaxWaitTimeMs = 100 };
|
| enum { kFrameRatePeriodMs = 1000 };
|
|
|
| + void HandOverFrame(const VideoFrame& video_frame)
|
| + GUARDED_BY(thread_critsect_);
|
| +
|
| uint32_t const stream_id_;
|
| + const bool disable_prerenderer_smoothing_;
|
| // Critsects in allowed to enter order.
|
| const rtc::scoped_ptr<CriticalSectionWrapper> stream_critsect_;
|
| const rtc::scoped_ptr<CriticalSectionWrapper> thread_critsect_;
|
|
|