| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/video_track_to_pepper_adapter.h" | 5 #include "content/renderer/media/video_track_to_pepper_adapter.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 reader_(NULL), | 33 reader_(NULL), |
| 34 weak_factory_(this) { | 34 weak_factory_(this) { |
| 35 } | 35 } |
| 36 | 36 |
| 37 ~PpFrameReceiver() override {} | 37 ~PpFrameReceiver() override {} |
| 38 | 38 |
| 39 void SetReader(FrameReaderInterface* reader) { | 39 void SetReader(FrameReaderInterface* reader) { |
| 40 DCHECK((reader_ && !reader) || (!reader_ && reader)) | 40 DCHECK((reader_ && !reader) || (!reader_ && reader)) |
| 41 << " |reader| = " << reader << ", |reader_| = " << reader_; | 41 << " |reader| = " << reader << ", |reader_| = " << reader_; |
| 42 if (reader) { | 42 if (reader) { |
| 43 AddToVideoTrack(this, | 43 MediaStreamVideoSink::ConnectToTrack( |
| 44 media::BindToCurrentLoop( | 44 track_, |
| 45 base::Bind(&PpFrameReceiver::OnVideoFrame, | 45 media::BindToCurrentLoop( |
| 46 weak_factory_.GetWeakPtr())), | 46 base::Bind(&PpFrameReceiver::OnVideoFrame, |
| 47 track_); | 47 weak_factory_.GetWeakPtr()))); |
| 48 } else { | 48 } else { |
| 49 RemoveFromVideoTrack(this, track_); | 49 MediaStreamVideoSink::DisconnectFromTrack(); |
| 50 weak_factory_.InvalidateWeakPtrs(); | 50 weak_factory_.InvalidateWeakPtrs(); |
| 51 } | 51 } |
| 52 reader_ = reader; | 52 reader_ = reader; |
| 53 } | 53 } |
| 54 | 54 |
| 55 void OnVideoFrame(const scoped_refptr<media::VideoFrame>& frame, | 55 void OnVideoFrame(const scoped_refptr<media::VideoFrame>& frame, |
| 56 base::TimeTicks estimated_capture_time) { | 56 base::TimeTicks estimated_capture_time) { |
| 57 TRACE_EVENT0("video", "PpFrameReceiver::OnVideoFrame"); | 57 TRACE_EVENT0("video", "PpFrameReceiver::OnVideoFrame"); |
| 58 if (reader_) | 58 if (reader_) |
| 59 reader_->GotFrame(frame); | 59 reader_->GotFrame(frame); |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 134 FrameReaderInterface* reader) | 134 FrameReaderInterface* reader) |
| 135 : receiver_(new PpFrameReceiver(blink_track)) { | 135 : receiver_(new PpFrameReceiver(blink_track)) { |
| 136 receiver_->SetReader(reader); | 136 receiver_->SetReader(reader); |
| 137 } | 137 } |
| 138 | 138 |
| 139 VideoTrackToPepperAdapter::SourceInfo::~SourceInfo() { | 139 VideoTrackToPepperAdapter::SourceInfo::~SourceInfo() { |
| 140 receiver_->SetReader(NULL); | 140 receiver_->SetReader(NULL); |
| 141 } | 141 } |
| 142 | 142 |
| 143 } // namespace content | 143 } // namespace content |
| OLD | NEW |