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

Unified Diff: Source/modules/mediastream/RTCDTMFSender.cpp

Issue 650063002: Move MediaStream and MediaStreamTrack implementation from modules/mediastream to core/mediastream. Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased. Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/modules/mediastream/RTCDTMFSender.h ('k') | Source/modules/mediastream/RTCDTMFSender.idl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/mediastream/RTCDTMFSender.cpp
diff --git a/Source/modules/mediastream/RTCDTMFSender.cpp b/Source/modules/mediastream/RTCDTMFSender.cpp
deleted file mode 100644
index 110e240f70d0e0894cec4ab5ae339daee6ef4b15..0000000000000000000000000000000000000000
--- a/Source/modules/mediastream/RTCDTMFSender.cpp
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Copyright (C) 2013 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GOOGLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "modules/mediastream/RTCDTMFSender.h"
-
-#include "bindings/core/v8/ExceptionMessages.h"
-#include "bindings/core/v8/ExceptionState.h"
-#include "core/dom/ExceptionCode.h"
-#include "core/dom/ExecutionContext.h"
-#include "modules/mediastream/MediaStreamTrack.h"
-#include "modules/mediastream/RTCDTMFToneChangeEvent.h"
-#include "public/platform/WebMediaStreamTrack.h"
-#include "public/platform/WebRTCDTMFSenderHandler.h"
-#include "public/platform/WebRTCPeerConnectionHandler.h"
-
-namespace blink {
-
-static const long minToneDurationMs = 70;
-static const long defaultToneDurationMs = 100;
-static const long maxToneDurationMs = 6000;
-static const long minInterToneGapMs = 50;
-static const long defaultInterToneGapMs = 50;
-
-RTCDTMFSender* RTCDTMFSender::create(ExecutionContext* context, WebRTCPeerConnectionHandler* peerConnectionHandler, MediaStreamTrack* track, ExceptionState& exceptionState)
-{
- OwnPtr<WebRTCDTMFSenderHandler> handler = adoptPtr(peerConnectionHandler->createDTMFSender(track->component()));
- if (!handler) {
- exceptionState.throwDOMException(NotSupportedError, "The MediaStreamTrack provided is not an element of a MediaStream that's currently in the local streams set.");
- return nullptr;
- }
-
- RTCDTMFSender* dtmfSender = new RTCDTMFSender(context, track, handler.release());
- dtmfSender->suspendIfNeeded();
- return dtmfSender;
-}
-
-RTCDTMFSender::RTCDTMFSender(ExecutionContext* context, MediaStreamTrack* track, PassOwnPtr<WebRTCDTMFSenderHandler> handler)
- : ActiveDOMObject(context)
- , m_track(track)
- , m_duration(defaultToneDurationMs)
- , m_interToneGap(defaultInterToneGapMs)
- , m_handler(handler)
- , m_stopped(false)
- , m_scheduledEventTimer(this, &RTCDTMFSender::scheduledEventTimerFired)
-{
- m_handler->setClient(this);
-}
-
-RTCDTMFSender::~RTCDTMFSender()
-{
-}
-
-bool RTCDTMFSender::canInsertDTMF() const
-{
- return m_handler->canInsertDTMF();
-}
-
-MediaStreamTrack* RTCDTMFSender::track() const
-{
- return m_track.get();
-}
-
-String RTCDTMFSender::toneBuffer() const
-{
- return m_handler->currentToneBuffer();
-}
-
-void RTCDTMFSender::insertDTMF(const String& tones, ExceptionState& exceptionState)
-{
- insertDTMF(tones, defaultToneDurationMs, defaultInterToneGapMs, exceptionState);
-}
-
-void RTCDTMFSender::insertDTMF(const String& tones, long duration, ExceptionState& exceptionState)
-{
- insertDTMF(tones, duration, defaultInterToneGapMs, exceptionState);
-}
-
-void RTCDTMFSender::insertDTMF(const String& tones, long duration, long interToneGap, ExceptionState& exceptionState)
-{
- if (!canInsertDTMF()) {
- exceptionState.throwDOMException(NotSupportedError, "The 'canInsertDTMF' attribute is false: this sender cannot send DTMF.");
- return;
- }
-
- if (duration > maxToneDurationMs || duration < minToneDurationMs) {
- exceptionState.throwDOMException(SyntaxError, ExceptionMessages::indexOutsideRange("duration", duration, minToneDurationMs, ExceptionMessages::ExclusiveBound, maxToneDurationMs, ExceptionMessages::ExclusiveBound));
- return;
- }
-
- if (interToneGap < minInterToneGapMs) {
- exceptionState.throwDOMException(SyntaxError, ExceptionMessages::indexExceedsMinimumBound("intertone gap", interToneGap, minInterToneGapMs));
- return;
- }
-
- m_duration = duration;
- m_interToneGap = interToneGap;
-
- if (!m_handler->insertDTMF(tones, m_duration, m_interToneGap))
- exceptionState.throwDOMException(SyntaxError, "Could not send provided tones, '" + tones + "'.");
-}
-
-void RTCDTMFSender::didPlayTone(const WebString& tone)
-{
- scheduleDispatchEvent(RTCDTMFToneChangeEvent::create(tone));
-}
-
-const AtomicString& RTCDTMFSender::interfaceName() const
-{
- return EventTargetNames::RTCDTMFSender;
-}
-
-ExecutionContext* RTCDTMFSender::executionContext() const
-{
- return ActiveDOMObject::executionContext();
-}
-
-void RTCDTMFSender::stop()
-{
- m_stopped = true;
- m_handler->setClient(0);
-}
-
-void RTCDTMFSender::scheduleDispatchEvent(PassRefPtrWillBeRawPtr<Event> event)
-{
- m_scheduledEvents.append(event);
-
- if (!m_scheduledEventTimer.isActive())
- m_scheduledEventTimer.startOneShot(0, FROM_HERE);
-}
-
-void RTCDTMFSender::scheduledEventTimerFired(Timer<RTCDTMFSender>*)
-{
- if (m_stopped)
- return;
-
- WillBeHeapVector<RefPtrWillBeMember<Event> > events;
- events.swap(m_scheduledEvents);
-
- WillBeHeapVector<RefPtrWillBeMember<Event> >::iterator it = events.begin();
- for (; it != events.end(); ++it)
- dispatchEvent((*it).release());
-}
-
-void RTCDTMFSender::trace(Visitor* visitor)
-{
- visitor->trace(m_track);
- visitor->trace(m_scheduledEvents);
- EventTargetWithInlineData::trace(visitor);
-}
-
-} // namespace blink
« no previous file with comments | « Source/modules/mediastream/RTCDTMFSender.h ('k') | Source/modules/mediastream/RTCDTMFSender.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698