| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/renderer/media/webrtc/media_stream_remote_video_source.h" | 5 #include "content/renderer/media/webrtc/media_stream_remote_video_source.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| 11 #include "base/callback_helpers.h" | 11 #include "base/callback_helpers.h" |
| 12 #include "base/location.h" | 12 #include "base/location.h" |
| 13 #include "base/threading/thread_checker.h" | |
| 14 #include "base/trace_event/trace_event.h" | 13 #include "base/trace_event/trace_event.h" |
| 15 #include "content/renderer/media/webrtc/track_observer.h" | 14 #include "content/renderer/media/webrtc/track_observer.h" |
| 16 #include "media/base/bind_to_current_loop.h" | 15 #include "media/base/bind_to_current_loop.h" |
| 17 #include "media/base/timestamp_constants.h" | 16 #include "media/base/timestamp_constants.h" |
| 18 #include "media/base/video_frame.h" | 17 #include "media/base/video_frame.h" |
| 19 #include "media/base/video_util.h" | 18 #include "media/base/video_util.h" |
| 20 #include "third_party/webrtc/media/base/videoframe.h" | 19 #include "third_party/webrtc/media/base/videoframe.h" |
| 21 #include "third_party/webrtc/media/base/videosinkinterface.h" | 20 #include "third_party/webrtc/media/base/videosinkinterface.h" |
| 22 | 21 |
| 23 namespace content { | 22 namespace content { |
| (...skipping 14 matching lines...) Expand all Loading... |
| 38 | 37 |
| 39 // Implements rtc::VideoSinkInterface used for receiving video frames | 38 // Implements rtc::VideoSinkInterface used for receiving video frames |
| 40 // from the PeerConnection video track. May be called on a libjingle internal | 39 // from the PeerConnection video track. May be called on a libjingle internal |
| 41 // thread. | 40 // thread. |
| 42 void OnFrame(const cricket::VideoFrame& frame) override; | 41 void OnFrame(const cricket::VideoFrame& frame) override; |
| 43 | 42 |
| 44 void DoRenderFrameOnIOThread( | 43 void DoRenderFrameOnIOThread( |
| 45 const scoped_refptr<media::VideoFrame>& video_frame); | 44 const scoped_refptr<media::VideoFrame>& video_frame); |
| 46 | 45 |
| 47 private: | 46 private: |
| 48 // Bound to the render thread. | |
| 49 base::ThreadChecker thread_checker_; | |
| 50 | |
| 51 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_; | 47 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_; |
| 52 | 48 |
| 53 // |frame_callback_| is accessed on the IO thread. | 49 // |frame_callback_| is accessed on the IO thread. |
| 54 VideoCaptureDeliverFrameCB frame_callback_; | 50 VideoCaptureDeliverFrameCB frame_callback_; |
| 55 | 51 |
| 56 // Timestamp of the first received frame. | 52 // Timestamp of the first received frame. |
| 57 base::TimeDelta start_timestamp_; | 53 base::TimeDelta start_timestamp_; |
| 58 // WebRTC Chromium timestamp diff | 54 // WebRTC Chromium timestamp diff |
| 59 const base::TimeDelta time_diff_; | 55 const base::TimeDelta time_diff_; |
| 60 }; | 56 }; |
| (...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 216 case webrtc::MediaStreamTrackInterface::kEnded: | 212 case webrtc::MediaStreamTrackInterface::kEnded: |
| 217 SetReadyState(blink::WebMediaStreamSource::ReadyStateEnded); | 213 SetReadyState(blink::WebMediaStreamSource::ReadyStateEnded); |
| 218 break; | 214 break; |
| 219 default: | 215 default: |
| 220 NOTREACHED(); | 216 NOTREACHED(); |
| 221 break; | 217 break; |
| 222 } | 218 } |
| 223 } | 219 } |
| 224 | 220 |
| 225 } // namespace content | 221 } // namespace content |
| OLD | NEW |