Remove dead code related to Web Audio doppler effects

third_party/WebKit/Source/modules/webaudio/PannerNode.cpp

 /*
  * Copyright (C) 2010, 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
@@ skipping 31 matching lines @@
         x = 0.0;
 }
 
 PannerHandler::PannerHandler(AudioNode& node, float sampleRate)
     : AudioHandler(NodeTypePanner, node, sampleRate)
     , m_listener(node.context()->listener())
     , m_panningModel(Panner::PanningModelEqualPower)
     , m_distanceModel(DistanceEffect::ModelInverse)
     , m_position(0, 0, 0)
     , m_orientation(1, 0, 0)
-    , m_velocity(0, 0, 0)
     , m_isAzimuthElevationDirty(true)
     , m_isDistanceConeGainDirty(true)
-    , m_isDopplerRateDirty(true)
     , m_lastGain(-1.0)
     , m_cachedAzimuth(0)
     , m_cachedElevation(0)
     , m_cachedDistanceConeGain(1.0f)
-    , m_cachedDopplerRate(1)
 {
     // Load the HRTF database asynchronously so we don't block the Javascript thread while creating the HRTF database.
     // The HRTF panner will return zeroes until the database is loaded.
     listener()->createAndLoadHRTFDatabaseLoader(node.context()->sampleRate());
 
     addInput();
     addOutput(2);
 
     // Node-specific default mixing rules.
     m_channelCount = 2;
@@ skipping 250 matching lines @@
 void PannerHandler::setPosition(float x, float y, float z)
 {
     FloatPoint3D position = FloatPoint3D(x, y, z);
 
     if (m_position == position)
         return;
 
     // This synchronizes with process().
     MutexLocker processLocker(m_processLock);
     m_position = position;
-    markPannerAsDirty(PannerHandler::AzimuthElevationDirty | PannerHandler::DistanceConeGainDirty | PannerHandler::DopplerRateDirty);
+    markPannerAsDirty(PannerHandler::AzimuthElevationDirty | PannerHandler::DistanceConeGainDirty);
 }
 
 void PannerHandler::setOrientation(float x, float y, float z)
 {
     FloatPoint3D orientation = FloatPoint3D(x, y, z);
 
     if (m_orientation == orientation)
         return;
 
     // This synchronizes with process().
     MutexLocker processLocker(m_processLock);
     m_orientation = orientation;
     markPannerAsDirty(PannerHandler::DistanceConeGainDirty);
 }
 
-void PannerHandler::setVelocity(float x, float y, float z)
-{
-    FloatPoint3D velocity = FloatPoint3D(x, y, z);
-
-    if (m_velocity == velocity)
-        return;
-
-    // This synchronizes with process().
-    MutexLocker processLocker(m_processLock);
-    m_velocity = velocity;
-    markPannerAsDirty(PannerHandler::DopplerRateDirty);
-}
-
 void PannerHandler::calculateAzimuthElevation(double* outAzimuth, double* outElevation)
 {
     double azimuth = 0.0;
 
     // Calculate the source-listener vector
     FloatPoint3D listenerPosition = listener()->position();
     FloatPoint3D sourceListener = m_position - listenerPosition;
 
     // normalize() does nothing if the length of |sourceListener| is zero.
     sourceListener.normalize();
@@ skipping 35 matching lines @@
         elevation = 180.0 - elevation;
     else if (elevation < -90.0)
         elevation = -180.0 - elevation;
 
     if (outAzimuth)
         *outAzimuth = azimuth;
     if (outElevation)
         *outElevation = elevation;
 }
 
-double PannerHandler::calculateDopplerRate()
-{
-    double dopplerShift = 1.0;
-    double dopplerFactor = listener()->dopplerFactor();
-
-    if (dopplerFactor > 0.0) {
-        double speedOfSound = listener()->speedOfSound();
-
-        const FloatPoint3D& sourceVelocity = m_velocity;
-        const FloatPoint3D& listenerVelocity = listener()->velocity();
-
-        // Don't bother if both source and listener have no velocity
-        bool sourceHasVelocity = !sourceVelocity.isZero();
-        bool listenerHasVelocity = !listenerVelocity.isZero();
-
-        if (sourceHasVelocity || listenerHasVelocity) {
-            // Calculate the source to listener vector
-            FloatPoint3D listenerPosition = listener()->position();
-            FloatPoint3D sourceToListener = m_position - listenerPosition;
-
-            double sourceListenerMagnitude = sourceToListener.length();
-
-            if (!sourceListenerMagnitude) {
-                // Source and listener are at the same position. Skip the computation of the doppler
-                // shift, and just return the cached value.
-                dopplerShift = m_cachedDopplerRate;
-            } else {
-                double listenerProjection = sourceToListener.dot(listenerVelocity) / sourceListenerMagnitude;
-                double sourceProjection = sourceToListener.dot(sourceVelocity) / sourceListenerMagnitude;
-
-                listenerProjection = -listenerProjection;
-                sourceProjection = -sourceProjection;
-
-                double scaledSpeedOfSound = speedOfSound / dopplerFactor;
-                listenerProjection = std::min(listenerProjection, scaledSpeedOfSound);
-                sourceProjection = std::min(sourceProjection, scaledSpeedOfSound);
-
-                dopplerShift = ((speedOfSound - dopplerFactor * listenerProjection) / (speedOfSound - dopplerFactor * sourceProjection));
-                fixNANs(dopplerShift); // avoid illegal values
-
-                // Limit the pitch shifting to 4 octaves up and 3 octaves down.
-                if (dopplerShift > 16.0)
-                    dopplerShift = 16.0;
-                else if (dopplerShift < 0.125)
-                    dopplerShift = 0.125;
-            }
-        }
-    }
-
-    return dopplerShift;
-}
-
 float PannerHandler::calculateDistanceConeGain()
 {
     FloatPoint3D listenerPosition = listener()->position();
 
     double listenerDistance = m_position.distanceTo(listenerPosition);
     double distanceGain = m_distanceEffect.gain(listenerDistance);
     double coneGain = m_coneEffect.gain(m_position, m_orientation, listenerPosition);
 
     return float(distanceGain * coneGain);
 }
 
 void PannerHandler::azimuthElevation(double* outAzimuth, double* outElevation)
 {
     ASSERT(context()->isAudioThread());
 
     if (isAzimuthElevationDirty()) {
         calculateAzimuthElevation(&m_cachedAzimuth, &m_cachedElevation);
         m_isAzimuthElevationDirty = false;
     }
 
     *outAzimuth = m_cachedAzimuth;
     *outElevation = m_cachedElevation;
 }
 
-double PannerHandler::dopplerRate()
-{
-    ASSERT(context()->isAudioThread());
-
-    if (isDopplerRateDirty()) {
-        m_cachedDopplerRate = calculateDopplerRate();
-        m_isDopplerRateDirty = false;
-    }
-
-    return m_cachedDopplerRate;
-}
-
 float PannerHandler::distanceConeGain()
 {
     ASSERT(context()->isAudioThread());
 
     if (isDistanceConeGainDirty()) {
         m_cachedDistanceConeGain = calculateDistanceConeGain();
         m_isDistanceConeGainDirty = false;
     }
 
     return m_cachedDistanceConeGain;
 }
 
 void PannerHandler::markPannerAsDirty(unsigned dirty)
 {
     if (dirty & PannerHandler::AzimuthElevationDirty)
         m_isAzimuthElevationDirty = true;
 
     if (dirty & PannerHandler::DistanceConeGainDirty)
         m_isDistanceConeGainDirty = true;
-
-    if (dirty & PannerHandler::DopplerRateDirty)
-        m_isDopplerRateDirty = true;
 }
 
 void PannerHandler::setChannelCount(unsigned long channelCount, ExceptionState& exceptionState)
 {
     ASSERT(isMainThread());
     AbstractAudioContext::AutoLocker locker(context());
 
     // A PannerNode only supports 1 or 2 channels
     if (channelCount > 0 && channelCount <= 2) {
         if (m_channelCount != channelCount) {
@@ skipping 73 matching lines @@
     pannerHandler().setPosition(x, y, z);
 }
 
 void PannerNode::setOrientation(float x, float y, float z)
 {
     pannerHandler().setOrientation(x, y, z);
 }
 
 void PannerNode::setVelocity(float x, float y, float z)
 {
-    pannerHandler().setVelocity(x, y, z);
+    // The velocity is not used internally and cannot be read back by scripts,
+    // so it can be ignored entirely.
 }
 
 String PannerNode::distanceModel() const
 {
     return pannerHandler().distanceModel();
 }
 
 void PannerNode::setDistanceModel(const String& model)
 {
     pannerHandler().setDistanceModel(model);
@@ skipping 53 matching lines @@
 {
     return pannerHandler().coneOuterGain();
 }
 
 void PannerNode::setConeOuterGain(double gain)
 {
     pannerHandler().setConeOuterGain(gain);
 }
 
 } // namespace blink
-