Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / webrtc / modules / audio_device / android / opensles_output.cc

diff --git a/src/third_party/webrtc/modules/audio_device/android/opensles_output.cc b/src/third_party/webrtc/modules/audio_device/android/opensles_output.cc
index 12f5f38..377789b 100644 (file)
--- a/src/third_party/webrtc/modules/audio_device/android/opensles_output.cc
+++ b/src/third_party/webrtc/modules/audio_device/android/opensles_output.cc
@@ -188,11 +188,6 @@ int32_t OpenSlesOutput::StopPlayout() {
   return 0;
 }
 
-int32_t OpenSlesOutput::SpeakerIsAvailable(bool& available) {  // NOLINT
-  available = true;
-  return 0;
-}
-
 int32_t OpenSlesOutput::InitSpeaker() {
   assert(!playing_);
   speaker_initialized_ = true;
@@ -345,7 +340,7 @@ void OpenSlesOutput::AllocateBuffers() {
   fifo_.reset(new SingleRwFifo(num_fifo_buffers_needed_));
 
   // Allocate the memory area to be used.
-  play_buf_.reset(new scoped_array<int8_t>[TotalBuffersUsed()]);
+  play_buf_.reset(new scoped_ptr<int8_t[]>[TotalBuffersUsed()]);
   int required_buffer_size = fine_buffer_->RequiredBufferSizeBytes();
   for (int i = 0; i < TotalBuffersUsed(); ++i) {
     play_buf_[i].reset(new int8_t[required_buffer_size]);