Merge pull request #388 from rakuco/revert-webaudio-patches-xwalk-7030

Revert AudioDestinationNode.devicePosition commits
crosswalk-project · Oct 5, 2016 · 49772a4 · 49772a4
2 parents b53bd1c + 7807ac7
commit 49772a4
Show file tree

Hide file tree

Showing 33 changed files with 43 additions and 252 deletions.
diff --git a/content/browser/renderer_host/media/audio_sync_reader.cc b/content/browser/renderer_host/media/audio_sync_reader.cc
@@ -107,8 +107,7 @@ AudioSyncReader::~AudioSyncReader() {
 
 // media::AudioOutputController::SyncReader implementations.
 void AudioSyncReader::UpdatePendingBytes(uint32_t bytes,
-                                         uint32_t frames_skipped,
-                                         const media::StreamPosition& device_position) {
+                                         uint32_t frames_skipped) {
   // Increase the number of skipped frames stored in shared memory. We don't
   // send it over the socket since sending more than 4 bytes might lead to being
   // descheduled. The reading side will zero it when consumed.
@@ -121,7 +120,6 @@ void AudioSyncReader::UpdatePendingBytes(uint32_t bytes,
   output_bus_->Zero();
 
   socket_->Send(&bytes, sizeof(bytes));
-  socket_->Send(&device_position, sizeof(device_position));
   ++buffer_index_;
 }
 

diff --git a/content/browser/renderer_host/media/audio_sync_reader.h b/content/browser/renderer_host/media/audio_sync_reader.h
@@ -39,10 +39,7 @@ class AudioSyncReader : public media::AudioOutputController::SyncReader {
   ~AudioSyncReader() override;
 
   // media::AudioOutputController::SyncReader implementations.
-  void UpdatePendingBytes(
-      uint32_t bytes,
-      uint32_t frames_skipped,
-      const media::StreamPosition& position) override;
+  void UpdatePendingBytes(uint32_t bytes, uint32_t frames_skipped) override;
   void Read(media::AudioBus* dest) override;
   void Close() override;
 

diff --git a/content/renderer/media/renderer_webaudiodevice_impl.cc b/content/renderer/media/renderer_webaudiodevice_impl.cc
@@ -102,8 +102,7 @@ double RendererWebAudioDeviceImpl::sampleRate() {
 
 int RendererWebAudioDeviceImpl::Render(media::AudioBus* dest,
                                        uint32_t frames_delayed,
-                                       uint32_t frames_skipped,
-                                       const media::StreamPosition& position) {
+                                       uint32_t frames_skipped) {
 #if defined(OS_ANDROID)
   if (is_first_buffer_after_silence_) {
     DCHECK(!is_using_null_audio_sink_);
@@ -121,15 +120,9 @@ int RendererWebAudioDeviceImpl::Render(media::AudioBus* dest,
   // TODO(xians): Remove the following |web_audio_source_data| after
   // changing the blink interface.
   WebVector<float*> web_audio_source_data(static_cast<size_t>(0));
-
-  double seconds = position.ticks
-      / static_cast<double>(base::Time::kMicrosecondsPerSecond);
-  StreamPosition device_position(static_cast<size_t>(position.frames),
-                                 seconds);
   client_callback_->render(web_audio_source_data,
                            web_audio_dest_data,
-                           dest->frames(),
-                           device_position);
+                           dest->frames());
 
 #if defined(OS_ANDROID)
   const bool is_zero = dest->AreFramesZero();

diff --git a/content/renderer/media/renderer_webaudiodevice_impl.h b/content/renderer/media/renderer_webaudiodevice_impl.h
@@ -11,7 +11,6 @@
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/threading/thread_checker.h"
-#include "media/audio/audio_io.h"
 #include "media/base/audio_parameters.h"
 #include "media/base/audio_renderer_sink.h"
 #include "third_party/WebKit/public/platform/WebAudioDevice.h"
@@ -46,8 +45,7 @@ class RendererWebAudioDeviceImpl
   // AudioRendererSink::RenderCallback implementation.
   int Render(media::AudioBus* dest,
              uint32_t frames_delayed,
-             uint32_t frames_skipped,
-             const media::StreamPosition& position) override;
+             uint32_t frames_skipped) override;
 
   void OnRenderError() override;
 

diff --git a/media/audio/audio_device_thread.cc b/media/audio/audio_device_thread.cc
@@ -175,11 +175,6 @@ void AudioDeviceThread::Thread::Run() {
     if (bytes_read != sizeof(pending_data))
       break;
 
-    StreamPosition device_position = { 0, 0 };
-    bytes_read = socket_.Receive(&device_position, sizeof(device_position));
-    if (bytes_read != sizeof(device_position))
-      break;
-
     // std::numeric_limits<uint32_t>::max() is a special signal which is
     // returned after the browser stops the output device in response to a
     // renderer side request.
@@ -191,7 +186,7 @@ void AudioDeviceThread::Thread::Run() {
     if (pending_data != std::numeric_limits<uint32_t>::max()) {
       base::AutoLock auto_lock(callback_lock_);
       if (callback_)
-        callback_->Process(pending_data, device_position);
+        callback_->Process(pending_data);
     }
 
     // The usage of |synchronized_buffers_| differs between input and output

diff --git a/media/audio/audio_device_thread.h b/media/audio/audio_device_thread.h
@@ -12,7 +12,6 @@
 #include "base/memory/shared_memory.h"
 #include "base/sync_socket.h"
 #include "base/synchronization/lock.h"
-#include "media/audio/audio_io.h"
 #include "media/base/audio_parameters.h"
 #include "media/base/media_export.h"
 
@@ -22,7 +21,6 @@ class MessageLoop;
 
 namespace media {
 class AudioBus;
-struct StreamPosition;
 
 // Data transfer between browser and render process uses a combination
 // of sync sockets and shared memory. To read from the socket and render
@@ -54,9 +52,7 @@ class MEDIA_EXPORT AudioDeviceThread {
     virtual void MapSharedMemory() = 0;
 
     // Called whenever we receive notifications about pending input data.
-    virtual void Process(
-        uint32_t pending_data,
-        const StreamPosition& position) = 0;
+    virtual void Process(uint32_t pending_data) = 0;
 
    protected:
     // Protected so that derived classes can access directly.

diff --git a/media/audio/audio_input_device.cc b/media/audio/audio_input_device.cc
@@ -41,7 +41,7 @@ class AudioInputDevice::AudioThreadCallback
   void MapSharedMemory() override;
 
   // Called whenever we receive notifications about pending data.
-  void Process(uint32_t pending_data, const StreamPosition& position) override;
+  void Process(uint32_t pending_data) override;
 
  private:
   int current_segment_id_;
@@ -302,9 +302,7 @@ void AudioInputDevice::AudioThreadCallback::MapSharedMemory() {
   }
 }
 
-void AudioInputDevice::AudioThreadCallback::Process(
-    uint32_t pending_data,
-    const StreamPosition& position) {
+void AudioInputDevice::AudioThreadCallback::Process(uint32_t pending_data) {
   // The shared memory represents parameters, size of the data buffer and the
   // actual data buffer containing audio data. Map the memory into this
   // structure and parse out parameters and the data area.

diff --git a/media/audio/audio_io.h b/media/audio/audio_io.h
@@ -49,11 +49,6 @@
 
 namespace media {
 
-struct MEDIA_EXPORT StreamPosition {
-  int64_t frames;
-  int64_t ticks;  // Obtained from base::TimeTicks::ToInternalValue().
-};
-
 class MEDIA_EXPORT AudioOutputStream {
  public:
   // Audio sources must implement AudioSourceCallback. This interface will be
@@ -68,12 +63,9 @@ class MEDIA_EXPORT AudioOutputStream {
     // the number of frames it filled.  |total_bytes_delay| contains current
     // number of bytes of delay buffered by the AudioOutputStream.
     // |frames_skipped| contains the number of frames skipped by the consumer.
-    // |device_position| if provided, contains position of currently audible
-    // signal.
     virtual int OnMoreData(AudioBus* dest,
                            uint32_t total_bytes_delay,
-                           uint32_t frames_skipped,
-                           const StreamPosition& device_position = {0, 0}) = 0;
+                           uint32_t frames_skipped) = 0;
 
     // There was an error while playing a buffer. Audio source cannot be
     // destroyed yet. No direct action needed by the AudioStream, but it is

diff --git a/media/audio/audio_output_controller.cc b/media/audio/audio_output_controller.cc
@@ -172,7 +172,7 @@ void AudioOutputController::DoPlay() {
     return;
 
   // Ask for first packet.
-  sync_reader_->UpdatePendingBytes(0, 0, {0, 0});
+  sync_reader_->UpdatePendingBytes(0, 0);
 
   state_ = kPlaying;
 
@@ -225,8 +225,7 @@ void AudioOutputController::DoPause() {
   // Let the renderer know we've stopped.  Necessary to let PPAPI clients know
   // audio has been shutdown.  TODO(dalecurtis): This stinks.  PPAPI should have
   // a better way to know when it should exit PPB_Audio_Shared::Run().
-  sync_reader_->UpdatePendingBytes(std::numeric_limits<uint32_t>::max(), 0,
-                                   {0, 0});
+  sync_reader_->UpdatePendingBytes(std::numeric_limits<uint32_t>::max(), 0);
 
   handler_->OnPaused();
 }
@@ -294,8 +293,7 @@ void AudioOutputController::DoReportError() {
 
 int AudioOutputController::OnMoreData(AudioBus* dest,
                                       uint32_t total_bytes_delay,
-                                      uint32_t frames_skipped,
-                                      const StreamPosition& device_position) {
+                                      uint32_t frames_skipped) {
   TRACE_EVENT0("audio", "AudioOutputController::OnMoreData");
 
   // Indicate that we haven't wedged (at least not indefinitely, WedgeCheck()
@@ -309,8 +307,7 @@ int AudioOutputController::OnMoreData(AudioBus* dest,
 
   const int frames = dest->frames();
   sync_reader_->UpdatePendingBytes(
-      total_bytes_delay + frames * params_.GetBytesPerFrame(), frames_skipped,
-      device_position);
+      total_bytes_delay + frames * params_.GetBytesPerFrame(), frames_skipped);
 
   if (will_monitor_audio_levels())
     power_monitor_.Scan(*dest, frames);

diff --git a/media/audio/audio_output_controller.h b/media/audio/audio_output_controller.h
@@ -93,8 +93,7 @@ class MEDIA_EXPORT AudioOutputController
     // source can handle this appropriately depending on the type of source. An
     // ordinary file playout would ignore this.
     virtual void UpdatePendingBytes(uint32_t bytes,
-                                    uint32_t frames_skipped,
-                                    const StreamPosition& position) = 0;
+                                    uint32_t frames_skipped) = 0;
 
     // Attempts to completely fill |dest|, zeroing |dest| if the request can not
     // be fulfilled (due to timeout).
@@ -166,8 +165,7 @@ class MEDIA_EXPORT AudioOutputController
   // AudioSourceCallback implementation.
   int OnMoreData(AudioBus* dest,
                  uint32_t total_bytes_delay,
-                 uint32_t frames_skipped,
-                 const StreamPosition& device_position) override;
+                 uint32_t frames_skipped) override;
   void OnError(AudioOutputStream* stream) override;
 
   // AudioDeviceListener implementation.  When called AudioOutputController will

diff --git a/media/audio/audio_output_device.cc b/media/audio/audio_output_device.cc
@@ -39,7 +39,7 @@ class AudioOutputDevice::AudioThreadCallback
   void MapSharedMemory() override;
 
   // Called whenever we receive notifications about pending data.
-  void Process(uint32_t pending_data, const StreamPosition& position) override;
+  void Process(uint32_t pending_data) override;
 
  private:
   AudioRendererSink::RenderCallback* render_callback_;
@@ -445,9 +445,7 @@ void AudioOutputDevice::AudioThreadCallback::MapSharedMemory() {
 }
 
 // Called whenever we receive notifications about pending data.
-void AudioOutputDevice::AudioThreadCallback::Process(
-    uint32_t pending_data,
-    const StreamPosition& position) {
+void AudioOutputDevice::AudioThreadCallback::Process(uint32_t pending_data) {
   // Convert the number of pending bytes in the render buffer into frames.
   double frames_delayed = static_cast<double>(pending_data) / bytes_per_frame_;
 
@@ -477,7 +475,7 @@ void AudioOutputDevice::AudioThreadCallback::Process(
   // the shared memory the Render() call is writing directly into the shared
   // memory.
   render_callback_->Render(output_bus_.get(), std::round(frames_delayed),
-                           frames_skipped, position);
+                           frames_skipped);
 }
 
 }  // namespace media
diff --git a/media/audio/audio_output_resampler.cc b/media/audio/audio_output_resampler.cc
@@ -33,8 +33,7 @@ class OnMoreDataConverter
   // AudioSourceCallback interface.
   int OnMoreData(AudioBus* dest,
                  uint32_t total_bytes_delay,
-                 uint32_t frames_skipped,
-                 const StreamPosition& position) override;
+                 uint32_t frames_skipped) override;
   void OnError(AudioOutputStream* stream) override;
 
   // Sets |source_callback_|.  If this is not a new object, then Stop() must be
@@ -74,9 +73,6 @@ class OnMoreDataConverter
   // stream has been stopped.
   bool error_occurred_;
 
-  // Information about last recodred stream output position.
-  StreamPosition device_position_;
-
   DISALLOW_COPY_AND_ASSIGN(OnMoreDataConverter);
 };
 
@@ -353,8 +349,7 @@ OnMoreDataConverter::OnMoreDataConverter(const AudioParameters& input_params,
       source_callback_(nullptr),
       input_bytes_per_second_(input_params.GetBytesPerSecond()),
       audio_converter_(input_params, output_params, false),
-      error_occurred_(false),
-      device_position_() {}
+      error_occurred_(false) {}
 
 OnMoreDataConverter::~OnMoreDataConverter() {
   // Ensure Stop() has been called so we don't end up with an AudioOutputStream
@@ -381,9 +376,7 @@ void OnMoreDataConverter::Stop() {
 
 int OnMoreDataConverter::OnMoreData(AudioBus* dest,
                                     uint32_t total_bytes_delay,
-                                    uint32_t frames_skipped,
-                                    const StreamPosition& position) {
-  device_position_ = position;
+                                    uint32_t frames_skipped) {
   current_total_bytes_delay_ = total_bytes_delay;
   audio_converter_.Convert(dest);
 
@@ -402,10 +395,8 @@ double OnMoreDataConverter::ProvideInput(AudioBus* dest,
                    buffer_delay.InSecondsF() * input_bytes_per_second_));
 
   // Retrieve data from the original callback.
-  const int frames = source_callback_->OnMoreData(dest,
-                                                  new_total_bytes_delay,
-                                                  0,
-                                                  device_position_);
+  const int frames =
+      source_callback_->OnMoreData(dest, new_total_bytes_delay, 0);
 
   // Zero any unfilled frames if anything was filled, otherwise we'll just
   // return a volume of zero and let AudioConverter drop the output.

diff --git a/media/audio/audio_output_stream_sink.cc b/media/audio/audio_output_stream_sink.cc
@@ -79,8 +79,7 @@ OutputDeviceInfo AudioOutputStreamSink::GetOutputDeviceInfo() {
 
 int AudioOutputStreamSink::OnMoreData(AudioBus* dest,
                                       uint32_t total_bytes_delay,
-                                      uint32_t frames_skipped,
-                                      const StreamPosition& position) {
+                                      uint32_t frames_skipped) {
   // Note: Runs on the audio thread created by the OS.
   base::AutoLock al(callback_lock_);
   if (!active_render_callback_)

diff --git a/media/audio/audio_output_stream_sink.h b/media/audio/audio_output_stream_sink.h
@@ -44,8 +44,7 @@ class MEDIA_EXPORT AudioOutputStreamSink
   // AudioSourceCallback implementation.
   int OnMoreData(AudioBus* dest,
                  uint32_t total_bytes_delay,
-                 uint32_t frames_skipped,
-                 const StreamPosition& position) override;
+                 uint32_t frames_skipped) override;
   void OnError(AudioOutputStream* stream) override;
 
  private:

diff --git a/media/audio/simple_sources.cc b/media/audio/simple_sources.cc
@@ -117,8 +117,7 @@ SineWaveAudioSource::~SineWaveAudioSource() {
 // but it is efficient enough for our simple needs.
 int SineWaveAudioSource::OnMoreData(AudioBus* audio_bus,
                                     uint32_t total_bytes_delay,
-                                    uint32_t frames_skipped,
-                                    const StreamPosition& position) {
+                                    uint32_t frames_skipped) {
   base::AutoLock auto_lock(time_lock_);
   callbacks_++;
 
@@ -203,8 +202,7 @@ void FileSource::LoadWavFile(const base::FilePath& path_to_wav_file) {
 
 int FileSource::OnMoreData(AudioBus* audio_bus,
                            uint32_t total_bytes_delay,
-                           uint32_t frames_skipped,
-                           const StreamPosition& position) {
+                           uint32_t frames_skipped) {
   // Load the file if we haven't already. This load needs to happen on the
   // audio thread, otherwise we'll run on the UI thread on Mac for instance.
   // This will massively delay the first OnMoreData, but we'll catch up.
@@ -254,8 +252,7 @@ BeepingSource::~BeepingSource() {
 
 int BeepingSource::OnMoreData(AudioBus* audio_bus,
                               uint32_t total_bytes_delay,
-                              uint32_t frames_skipped,
-                              const StreamPosition& position) {
+                              uint32_t frames_skipped) {
   // Accumulate the time from the last beep.
   interval_from_last_beep_ += base::TimeTicks::Now() - last_callback_time_;
 

diff --git a/media/audio/simple_sources.h b/media/audio/simple_sources.h
@@ -37,8 +37,7 @@ class MEDIA_EXPORT SineWaveAudioSource
   // Implementation of AudioSourceCallback.
   int OnMoreData(AudioBus* audio_bus,
                  uint32_t total_bytes_delay,
-                 uint32_t frames_skipped,
-                 const StreamPosition& position) override;
+                 uint32_t frames_skipped) override;
   void OnError(AudioOutputStream* stream) override;
 
   // The number of OnMoreData() and OnError() calls respectively.
@@ -65,8 +64,7 @@ class MEDIA_EXPORT FileSource : public AudioOutputStream::AudioSourceCallback,
   // Implementation of AudioSourceCallback.
   int OnMoreData(AudioBus* audio_bus,
                  uint32_t total_bytes_delay,
-                 uint32_t frames_skipped,
-                 const StreamPosition& position) override;
+                 uint32_t frames_skipped) override;
   void OnError(AudioOutputStream* stream) override;
 
  private:
@@ -99,8 +97,7 @@ class BeepingSource : public AudioOutputStream::AudioSourceCallback {
   // Implementation of AudioSourceCallback.
   int OnMoreData(AudioBus* audio_bus,
                  uint32_t total_bytes_delay,
-                 uint32_t frames_skipped,
-                 const StreamPosition& position) override;
+                 uint32_t frames_skipped) override;
   void OnError(AudioOutputStream* stream) override;
 
   static void BeepOnce();