| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "modules/mediacapturefromelement/CanvasCaptureMediaStreamTrack.h" | 5 #include "modules/mediacapturefromelement/CanvasCaptureMediaStreamTrack.h" |
| 6 | 6 |
| 7 #include "core/html/HTMLCanvasElement.h" | 7 #include "core/html/HTMLCanvasElement.h" |
| 8 #include "modules/mediacapturefromelement/AutoCanvasDrawListener.h" | 8 #include "modules/mediacapturefromelement/AutoCanvasDrawListener.h" |
| 9 #include "modules/mediacapturefromelement/OnRequestCanvasDrawListener.h" |
| 9 #include "modules/mediacapturefromelement/TimedCanvasDrawListener.h" | 10 #include "modules/mediacapturefromelement/TimedCanvasDrawListener.h" |
| 10 #include "platform/NotImplemented.h" | 11 #include "platform/NotImplemented.h" |
| 11 #include "platform/mediastream/MediaStreamCenter.h" | 12 #include "platform/mediastream/MediaStreamCenter.h" |
| 12 | 13 |
| 13 namespace blink { | 14 namespace blink { |
| 14 | 15 |
| 15 CanvasCaptureMediaStreamTrack* CanvasCaptureMediaStreamTrack::create(MediaStream
Component* component, PassRefPtrWillBeRawPtr<HTMLCanvasElement> element, const P
assOwnPtr<WebCanvasCaptureHandler> handler) | 16 CanvasCaptureMediaStreamTrack* CanvasCaptureMediaStreamTrack::create(MediaStream
Component* component, PassRefPtrWillBeRawPtr<HTMLCanvasElement> element, const P
assOwnPtr<WebCanvasCaptureHandler> handler) |
| 16 { | 17 { |
| 17 return new CanvasCaptureMediaStreamTrack(component, element, handler); | 18 return new CanvasCaptureMediaStreamTrack(component, element, handler); |
| 18 } | 19 } |
| 19 | 20 |
| 20 CanvasCaptureMediaStreamTrack* CanvasCaptureMediaStreamTrack::create(MediaStream
Component* component, PassRefPtrWillBeRawPtr<HTMLCanvasElement> element, const P
assOwnPtr<WebCanvasCaptureHandler> handler, double frameRate) | 21 CanvasCaptureMediaStreamTrack* CanvasCaptureMediaStreamTrack::create(MediaStream
Component* component, PassRefPtrWillBeRawPtr<HTMLCanvasElement> element, const P
assOwnPtr<WebCanvasCaptureHandler> handler, double frameRate) |
| 21 { | 22 { |
| 22 return new CanvasCaptureMediaStreamTrack(component, element, handler, frameR
ate); | 23 return new CanvasCaptureMediaStreamTrack(component, element, handler, frameR
ate); |
| 23 } | 24 } |
| 24 | 25 |
| 25 HTMLCanvasElement* CanvasCaptureMediaStreamTrack::canvas() const | 26 HTMLCanvasElement* CanvasCaptureMediaStreamTrack::canvas() const |
| 26 { | 27 { |
| 27 return m_canvasElement.get(); | 28 return m_canvasElement.get(); |
| 28 } | 29 } |
| 29 | 30 |
| 30 void CanvasCaptureMediaStreamTrack::requestFrame() | 31 void CanvasCaptureMediaStreamTrack::requestFrame() |
| 31 { | 32 { |
| 32 notImplemented(); | 33 m_drawListener->requestFrame(); |
| 33 return; | |
| 34 } | 34 } |
| 35 | 35 |
| 36 CanvasCaptureMediaStreamTrack* CanvasCaptureMediaStreamTrack::clone(ExecutionCon
text* context) | 36 CanvasCaptureMediaStreamTrack* CanvasCaptureMediaStreamTrack::clone(ExecutionCon
text* context) |
| 37 { | 37 { |
| 38 MediaStreamComponent* clonedComponent = MediaStreamComponent::create(compone
nt()->source()); | 38 MediaStreamComponent* clonedComponent = MediaStreamComponent::create(compone
nt()->source()); |
| 39 CanvasCaptureMediaStreamTrack* clonedTrack = new CanvasCaptureMediaStreamTra
ck(*this, clonedComponent); | 39 CanvasCaptureMediaStreamTrack* clonedTrack = new CanvasCaptureMediaStreamTra
ck(*this, clonedComponent); |
| 40 MediaStreamCenter::instance().didCreateMediaStreamTrack(clonedComponent); | 40 MediaStreamCenter::instance().didCreateMediaStreamTrack(clonedComponent); |
| 41 return clonedTrack; | 41 return clonedTrack; |
| 42 } | 42 } |
| 43 | 43 |
| (...skipping 20 matching lines...) Expand all Loading... |
| 64 suspendIfNeeded(); | 64 suspendIfNeeded(); |
| 65 m_drawListener = AutoCanvasDrawListener::create(handler); | 65 m_drawListener = AutoCanvasDrawListener::create(handler); |
| 66 m_canvasElement->addListener(m_drawListener.get()); | 66 m_canvasElement->addListener(m_drawListener.get()); |
| 67 } | 67 } |
| 68 | 68 |
| 69 CanvasCaptureMediaStreamTrack::CanvasCaptureMediaStreamTrack(MediaStreamComponen
t* component, PassRefPtrWillBeRawPtr<HTMLCanvasElement> element, const PassOwnPt
r<WebCanvasCaptureHandler> handler, double frameRate) | 69 CanvasCaptureMediaStreamTrack::CanvasCaptureMediaStreamTrack(MediaStreamComponen
t* component, PassRefPtrWillBeRawPtr<HTMLCanvasElement> element, const PassOwnPt
r<WebCanvasCaptureHandler> handler, double frameRate) |
| 70 : MediaStreamTrack(element->executionContext(), component) | 70 : MediaStreamTrack(element->executionContext(), component) |
| 71 , m_canvasElement(element) | 71 , m_canvasElement(element) |
| 72 { | 72 { |
| 73 suspendIfNeeded(); | 73 suspendIfNeeded(); |
| 74 TimedCanvasDrawListener* listener = TimedCanvasDrawListener::create(handler,
frameRate); | 74 if (frameRate == 0) { |
| 75 m_drawListener = listener; | 75 m_drawListener = OnRequestCanvasDrawListener::create(handler); |
| 76 } else { |
| 77 TimedCanvasDrawListener* listener = TimedCanvasDrawListener::create(hand
ler, frameRate); |
| 78 listener->requestNewFrame(); |
| 79 m_drawListener = listener; |
| 80 } |
| 76 m_canvasElement->addListener(m_drawListener.get()); | 81 m_canvasElement->addListener(m_drawListener.get()); |
| 77 listener->requestNewFrame(); | |
| 78 } | 82 } |
| 79 | 83 |
| 80 } // namespace blink | 84 } // namespace blink |
| OLD | NEW |