| OLD | NEW |
| 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 |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 #include <sys/time.h> | 21 #include <sys/time.h> |
| 22 #endif | 22 #endif |
| 23 | 23 |
| 24 #include "webrtc/base/platform_thread.h" | 24 #include "webrtc/base/platform_thread.h" |
| 25 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" | 25 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" |
| 26 #include "webrtc/common_video/video_render_frames.h" | 26 #include "webrtc/common_video/video_render_frames.h" |
| 27 #include "webrtc/system_wrappers/include/critical_section_wrapper.h" | 27 #include "webrtc/system_wrappers/include/critical_section_wrapper.h" |
| 28 #include "webrtc/system_wrappers/include/event_wrapper.h" | 28 #include "webrtc/system_wrappers/include/event_wrapper.h" |
| 29 #include "webrtc/system_wrappers/include/tick_util.h" | 29 #include "webrtc/system_wrappers/include/tick_util.h" |
| 30 #include "webrtc/system_wrappers/include/trace.h" | 30 #include "webrtc/system_wrappers/include/trace.h" |
| 31 #include "webrtc/video_renderer.h" | |
| 32 | 31 |
| 33 namespace webrtc { | 32 namespace webrtc { |
| 34 | 33 |
| 35 IncomingVideoStream::IncomingVideoStream(uint32_t stream_id, | 34 IncomingVideoStream::IncomingVideoStream(uint32_t stream_id, |
| 36 bool disable_prerenderer_smoothing) | 35 bool disable_prerenderer_smoothing) |
| 37 : stream_id_(stream_id), | 36 : stream_id_(stream_id), |
| 38 disable_prerenderer_smoothing_(disable_prerenderer_smoothing), | 37 disable_prerenderer_smoothing_(disable_prerenderer_smoothing), |
| 39 incoming_render_thread_(), | 38 incoming_render_thread_(), |
| 40 deliver_buffer_event_(EventTimerWrapper::Create()), | 39 deliver_buffer_event_(EventTimerWrapper::Create()), |
| 41 running_(false), | 40 running_(false), |
| (...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 250 external_callback_->RenderFrame(stream_id_, video_frame); | 249 external_callback_->RenderFrame(stream_id_, video_frame); |
| 251 } else if (render_callback_) { | 250 } else if (render_callback_) { |
| 252 render_callback_->RenderFrame(stream_id_, video_frame); | 251 render_callback_->RenderFrame(stream_id_, video_frame); |
| 253 } | 252 } |
| 254 | 253 |
| 255 // We're done with this frame. | 254 // We're done with this frame. |
| 256 last_render_time_ms_ = video_frame.render_time_ms(); | 255 last_render_time_ms_ = video_frame.render_time_ms(); |
| 257 } | 256 } |
| 258 | 257 |
| 259 } // namespace webrtc | 258 } // namespace webrtc |
| OLD | NEW |