| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/media_stream_video_renderer_sink.h" | 5 #include "content/renderer/media/media_stream_video_renderer_sink.h" |
| 6 | 6 |
| 7 #include "base/single_thread_task_runner.h" | 7 #include "base/single_thread_task_runner.h" |
| 8 #include "base/thread_task_runner_handle.h" | 8 #include "base/thread_task_runner_handle.h" |
| 9 #include "base/trace_event/trace_event.h" | 9 #include "base/trace_event/trace_event.h" |
| 10 #include "media/base/bind_to_current_loop.h" | 10 #include "media/base/bind_to_current_loop.h" |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 if (gpu_memory_buffer_pool_) { | 43 if (gpu_memory_buffer_pool_) { |
| 44 media_task_runner_->DeleteSoon(FROM_HERE, | 44 media_task_runner_->DeleteSoon(FROM_HERE, |
| 45 gpu_memory_buffer_pool_.release()); | 45 gpu_memory_buffer_pool_.release()); |
| 46 } | 46 } |
| 47 } | 47 } |
| 48 | 48 |
| 49 void MediaStreamVideoRendererSink::Start() { | 49 void MediaStreamVideoRendererSink::Start() { |
| 50 DCHECK(task_runner_->BelongsToCurrentThread()); | 50 DCHECK(task_runner_->BelongsToCurrentThread()); |
| 51 DCHECK_EQ(state_, STOPPED); | 51 DCHECK_EQ(state_, STOPPED); |
| 52 | 52 |
| 53 AddToVideoTrack( | 53 MediaStreamVideoSink::ConnectToTrack(video_track_, |
| 54 this, | |
| 55 media::BindToCurrentLoop( | 54 media::BindToCurrentLoop( |
| 56 base::Bind( | 55 base::Bind( |
| 57 &MediaStreamVideoRendererSink::OnVideoFrame, | 56 &MediaStreamVideoRendererSink::OnVideoFrame, |
| 58 weak_factory_.GetWeakPtr())), | 57 weak_factory_.GetWeakPtr()))); |
| 59 video_track_); | |
| 60 state_ = STARTED; | 58 state_ = STARTED; |
| 61 | 59 |
| 62 if (video_track_.source().getReadyState() == | 60 if (video_track_.source().getReadyState() == |
| 63 blink::WebMediaStreamSource::ReadyStateEnded || | 61 blink::WebMediaStreamSource::ReadyStateEnded || |
| 64 !video_track_.isEnabled()) { | 62 !video_track_.isEnabled()) { |
| 65 RenderSignalingFrame(); | 63 RenderSignalingFrame(); |
| 66 } | 64 } |
| 67 } | 65 } |
| 68 | 66 |
| 69 void MediaStreamVideoRendererSink::Stop() { | 67 void MediaStreamVideoRendererSink::Stop() { |
| 70 DCHECK(task_runner_->BelongsToCurrentThread()); | 68 DCHECK(task_runner_->BelongsToCurrentThread()); |
| 71 DCHECK(state_ == STARTED || state_ == PAUSED); | 69 DCHECK(state_ == STARTED || state_ == PAUSED); |
| 72 RemoveFromVideoTrack(this, video_track_); | 70 MediaStreamVideoSink::DisconnectFromTrack(); |
| 73 weak_factory_.InvalidateWeakPtrs(); | 71 weak_factory_.InvalidateWeakPtrs(); |
| 74 state_ = STOPPED; | 72 state_ = STOPPED; |
| 75 frame_size_.set_width(kMinFrameSize); | 73 frame_size_.set_width(kMinFrameSize); |
| 76 frame_size_.set_height(kMinFrameSize); | 74 frame_size_.set_height(kMinFrameSize); |
| 77 } | 75 } |
| 78 | 76 |
| 79 void MediaStreamVideoRendererSink::Play() { | 77 void MediaStreamVideoRendererSink::Play() { |
| 80 DCHECK(task_runner_->BelongsToCurrentThread()); | 78 DCHECK(task_runner_->BelongsToCurrentThread()); |
| 81 if (state_ == PAUSED) | 79 if (state_ == PAUSED) |
| 82 state_ = STARTED; | 80 state_ = STARTED; |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 148 scoped_refptr<media::VideoFrame> video_frame = | 146 scoped_refptr<media::VideoFrame> video_frame = |
| 149 media::VideoFrame::CreateBlackFrame(frame_size_); | 147 media::VideoFrame::CreateBlackFrame(frame_size_); |
| 150 video_frame->metadata()->SetBoolean(media::VideoFrameMetadata::END_OF_STREAM, | 148 video_frame->metadata()->SetBoolean(media::VideoFrameMetadata::END_OF_STREAM, |
| 151 true); | 149 true); |
| 152 video_frame->metadata()->SetTimeTicks( | 150 video_frame->metadata()->SetTimeTicks( |
| 153 media::VideoFrameMetadata::REFERENCE_TIME, base::TimeTicks::Now()); | 151 media::VideoFrameMetadata::REFERENCE_TIME, base::TimeTicks::Now()); |
| 154 OnVideoFrame(video_frame, base::TimeTicks()); | 152 OnVideoFrame(video_frame, base::TimeTicks()); |
| 155 } | 153 } |
| 156 | 154 |
| 157 } // namespace content | 155 } // namespace content |
| OLD | NEW |