Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / media / audio / audio_output_resampler.h

diff --git a/src/media/audio/audio_output_resampler.h b/src/media/audio/audio_output_resampler.h
index fa488aa..4c7be29 100644 (file)
--- a/src/media/audio/audio_output_resampler.h
+++ b/src/media/audio/audio_output_resampler.h
@@ -24,8 +24,8 @@ class OnMoreDataConverter;
 // AudioConverter class for details on the conversion process.
 //
 // AOR works by intercepting the AudioSourceCallback provided to StartStream()
-// and redirecting it through an AudioConverter instance.  AudioBuffersState is
-// adjusted for buffer delay caused by the conversion process.
+// and redirecting it through an AudioConverter instance.  |total_bytes_delay|
+// is adjusted for buffer delay caused by the conversion process.
 //
 // AOR will automatically fall back from AUDIO_PCM_LOW_LATENCY to
 // AUDIO_PCM_LINEAR if the output device fails to open at the requested output
@@ -44,18 +44,17 @@ class MEDIA_EXPORT AudioOutputResampler : public AudioOutputDispatcher {
                        const base::TimeDelta& close_delay);
 
   // AudioOutputDispatcher interface.
-  virtual bool OpenStream() OVERRIDE;
-  virtual bool StartStream(AudioOutputStream::AudioSourceCallback* callback,
-                           AudioOutputProxy* stream_proxy) OVERRIDE;
-  virtual void StopStream(AudioOutputProxy* stream_proxy) OVERRIDE;
-  virtual void StreamVolumeSet(AudioOutputProxy* stream_proxy,
-                               double volume) OVERRIDE;
-  virtual void CloseStream(AudioOutputProxy* stream_proxy) OVERRIDE;
-  virtual void Shutdown() OVERRIDE;
+  bool OpenStream() override;
+  bool StartStream(AudioOutputStream::AudioSourceCallback* callback,
+                   AudioOutputProxy* stream_proxy) override;
+  void StopStream(AudioOutputProxy* stream_proxy) override;
+  void StreamVolumeSet(AudioOutputProxy* stream_proxy, double volume) override;
+  void CloseStream(AudioOutputProxy* stream_proxy) override;
+  void Shutdown() override;
 
  private:
   friend class base::RefCountedThreadSafe<AudioOutputResampler>;
-  virtual ~AudioOutputResampler();
+  ~AudioOutputResampler() override;
 
   // Converts low latency based output parameters into high latency
   // appropriate output parameters in error situations.