Chromium Code Reviews| 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 "config.h" | 5 #include "config.h" |
| 6 #include "modules/mediacapturefromelement/CanvasCaptureMediaStreamTrack.h" | 6 #include "modules/mediacapturefromelement/CanvasCaptureMediaStreamTrack.h" |
| 7 | 7 |
| 8 #include "core/html/HTMLCanvasElement.h" | 8 #include "core/html/HTMLCanvasElement.h" |
| 9 #include "modules/mediacapturefromelement/AutoCanvasDrawListener.h" | 9 #include "modules/mediacapturefromelement/AutoCanvasDrawListener.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, bool givenFrameRate, double frameRat e) |
| 16 { | 17 { |
| 17 return new CanvasCaptureMediaStreamTrack(component, element, handler); | 18 return new CanvasCaptureMediaStreamTrack(component, element, handler, givenF rameRate, frameRate); |
| 18 } | 19 } |
| 19 | 20 |
| 20 HTMLCanvasElement* CanvasCaptureMediaStreamTrack::canvas() const | 21 HTMLCanvasElement* CanvasCaptureMediaStreamTrack::canvas() const |
| 21 { | 22 { |
| 22 return m_canvasElement.get(); | 23 return m_canvasElement.get(); |
| 23 } | 24 } |
| 24 | 25 |
| 25 void CanvasCaptureMediaStreamTrack::requestFrame() | 26 void CanvasCaptureMediaStreamTrack::requestFrame() |
| 26 { | 27 { |
| 27 notImplemented(); | 28 notImplemented(); |
| (...skipping 17 matching lines...) Expand all Loading... | |
| 45 | 46 |
| 46 CanvasCaptureMediaStreamTrack::CanvasCaptureMediaStreamTrack(const CanvasCapture MediaStreamTrack& track, MediaStreamComponent* component) | 47 CanvasCaptureMediaStreamTrack::CanvasCaptureMediaStreamTrack(const CanvasCapture MediaStreamTrack& track, MediaStreamComponent* component) |
| 47 :MediaStreamTrack(track.m_canvasElement->executionContext(), component) | 48 :MediaStreamTrack(track.m_canvasElement->executionContext(), component) |
| 48 , m_canvasElement(track.m_canvasElement) | 49 , m_canvasElement(track.m_canvasElement) |
| 49 , m_drawListener(track.m_drawListener) | 50 , m_drawListener(track.m_drawListener) |
| 50 { | 51 { |
| 51 suspendIfNeeded(); | 52 suspendIfNeeded(); |
| 52 m_canvasElement->addListener(m_drawListener.get()); | 53 m_canvasElement->addListener(m_drawListener.get()); |
| 53 } | 54 } |
| 54 | 55 |
| 55 CanvasCaptureMediaStreamTrack::CanvasCaptureMediaStreamTrack(MediaStreamComponen t* component, PassRefPtrWillBeRawPtr<HTMLCanvasElement> element, const PassOwnPt r<WebCanvasCaptureHandler> handler) | 56 CanvasCaptureMediaStreamTrack::CanvasCaptureMediaStreamTrack(MediaStreamComponen t* component, PassRefPtrWillBeRawPtr<HTMLCanvasElement> element, const PassOwnPt r<WebCanvasCaptureHandler> handler, bool givenFrameRate, double frameRate) |
|
esprehn
2015/12/15 23:58:01
this is very strange, lets just add two constructo
emircan
2015/12/16 15:36:21
Done.
| |
| 56 : MediaStreamTrack(element->executionContext(), component) | 57 : MediaStreamTrack(element->executionContext(), component) |
| 57 , m_canvasElement(element) | 58 , m_canvasElement(element) |
| 58 { | 59 { |
| 59 suspendIfNeeded(); | 60 suspendIfNeeded(); |
| 60 m_drawListener = AutoCanvasDrawListener::create(handler); | 61 if (givenFrameRate) { |
| 62 m_drawListener = TimedCanvasDrawListener::create(handler, frameRate); | |
| 63 } else { | |
| 64 m_drawListener = AutoCanvasDrawListener::create(handler); | |
| 65 } | |
| 61 m_canvasElement->addListener(m_drawListener.get()); | 66 m_canvasElement->addListener(m_drawListener.get()); |
| 62 } | 67 } |
| 63 | 68 |
| 64 } // namespace blink | 69 } // namespace blink |
| OLD | NEW |