Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(551)

Side by Side Diff: content/renderer/media/video_source_handler.cc

Issue 1315993003: Reland: Change VideoCaptureDeliverFrameCB's signature (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address new changes Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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_source_handler.h" 5 #include "content/renderer/media/video_source_handler.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 weak_factory_.GetWeakPtr())), 45 weak_factory_.GetWeakPtr())),
46 track_); 46 track_);
47 } else { 47 } else {
48 RemoveFromVideoTrack(this, track_); 48 RemoveFromVideoTrack(this, track_);
49 weak_factory_.InvalidateWeakPtrs(); 49 weak_factory_.InvalidateWeakPtrs();
50 } 50 }
51 reader_ = reader; 51 reader_ = reader;
52 } 52 }
53 53
54 void OnVideoFrame(const scoped_refptr<media::VideoFrame>& frame, 54 void OnVideoFrame(const scoped_refptr<media::VideoFrame>& frame,
55 const base::TimeTicks& estimated_capture_time) { 55 base::TimeTicks estimated_capture_time) {
56 TRACE_EVENT0("video", "PpFrameReceiver::OnVideoFrame"); 56 TRACE_EVENT0("video", "PpFrameReceiver::OnVideoFrame");
57 if (reader_) 57 if (reader_)
58 reader_->GotFrame(frame); 58 reader_->GotFrame(frame);
59 } 59 }
60 60
61 private: 61 private:
62 const blink::WebMediaStreamTrack track_; 62 const blink::WebMediaStreamTrack track_;
63 FrameReaderInterface* reader_; 63 FrameReaderInterface* reader_;
64 base::WeakPtrFactory<PpFrameReceiver> weak_factory_; 64 base::WeakPtrFactory<PpFrameReceiver> weak_factory_;
65 65
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 FrameReaderInterface* reader) 132 FrameReaderInterface* reader)
133 : receiver_(new PpFrameReceiver(blink_track)) { 133 : receiver_(new PpFrameReceiver(blink_track)) {
134 receiver_->SetReader(reader); 134 receiver_->SetReader(reader);
135 } 135 }
136 136
137 VideoSourceHandler::SourceInfo::~SourceInfo() { 137 VideoSourceHandler::SourceInfo::~SourceInfo() {
138 receiver_->SetReader(NULL); 138 receiver_->SetReader(NULL);
139 } 139 }
140 140
141 } // namespace content 141 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/video_capture_impl_unittest.cc ('k') | content/renderer/media/video_track_adapter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698