Revert 194371

media/audio/android/audio_manager_android.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/audio/android/audio_manager_android.h"
 
 #include "base/logging.h"
-#include "jni/AudioManagerAndroid_jni.h"
 #include "media/audio/android/opensles_input.h"
 #include "media/audio/android/opensles_output.h"
 #include "media/audio/audio_manager.h"
 #include "media/audio/audio_parameters.h"
 #include "media/audio/audio_util.h"
 #include "media/audio/fake_audio_input_stream.h"
 #include "media/base/channel_layout.h"
 
 namespace media {
 
 // Maximum number of output streams that can be open simultaneously.
 static const int kMaxOutputStreams = 10;
 
-static const int kAudioModeNormal = 0x00000000;
-static const int kAudioModeInCommunication = 0x00000003;
-
 AudioManager* CreateAudioManager() {
   return new AudioManagerAndroid();
 }
 
 AudioManagerAndroid::AudioManagerAndroid() {
   SetMaxOutputStreamsAllowed(kMaxOutputStreams);
-
-  j_audio_manager_.Reset(
-      Java_AudioManagerAndroid_createAudioManagerAndroid(
-          base::android::AttachCurrentThread(),
-          base::android::GetApplicationContext()));
 }
 
 AudioManagerAndroid::~AudioManagerAndroid() {
   Shutdown();
 }
 
 bool AudioManagerAndroid::HasAudioOutputDevices() {
   return true;
 }
 
@@ skipping 13 matching lines @@
   // TODO(xians): figure out the right input sample rate and buffer size to
   // achieve the best audio performance for Android devices.
   // TODO(xians): query the native channel layout for the specific device.
   static const int kDefaultSampleRate = 16000;
   static const int kDefaultBufferSize = 1024;
   return AudioParameters(
       AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO,
       kDefaultSampleRate, 16, kDefaultBufferSize);
 }
 
-AudioOutputStream* AudioManagerAndroid::MakeAudioOutputStream(
-    const AudioParameters& params) {
-  AudioOutputStream* stream =
-    AudioManagerBase::MakeAudioOutputStream(params);
-  if (stream && output_stream_count() == 1)
-    RegisterHeadsetReceiver();
-  return stream;
-}
-
-AudioInputStream* AudioManagerAndroid::MakeAudioInputStream(
-    const AudioParameters& params, const std::string& device_id) {
-  AudioInputStream* stream =
-    AudioManagerBase::MakeAudioInputStream(params, device_id);
-  if (stream && input_stream_count() == 1)
-    SetAudioMode(kAudioModeInCommunication);
-  return stream;
-}
-
-void AudioManagerAndroid::ReleaseOutputStream(AudioOutputStream* stream) {
-  AudioManagerBase::ReleaseOutputStream(stream);
-  if (!output_stream_count())
-    UnregisterHeadsetReceiver();
-}
-
-void AudioManagerAndroid::ReleaseInputStream(AudioInputStream* stream) {
-  AudioManagerBase::ReleaseInputStream(stream);
-  if (!input_stream_count())
-    SetAudioMode(kAudioModeNormal);
-}
-
 AudioOutputStream* AudioManagerAndroid::MakeLinearOutputStream(
       const AudioParameters& params) {
   DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
   return new OpenSLESOutputStream(this, params);
 }
 
 AudioOutputStream* AudioManagerAndroid::MakeLowLatencyOutputStream(
       const AudioParameters& params) {
   DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
   return new OpenSLESOutputStream(this, params);
@@ skipping 39 matching lines @@
 
   int user_buffer_size = GetUserBufferSize();
   if (user_buffer_size)
     buffer_size = user_buffer_size;
 
   return AudioParameters(
       AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout, input_channels,
       sample_rate, bits_per_sample, buffer_size);
 }
 
-// static
-bool AudioManagerAndroid::RegisterAudioManager(JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}
-
-void AudioManagerAndroid::SetAudioMode(int mode) {
-  Java_AudioManagerAndroid_setMode(
-      base::android::AttachCurrentThread(),
-      j_audio_manager_.obj(), mode);
-}
-
-void AudioManagerAndroid::RegisterHeadsetReceiver() {
-  Java_AudioManagerAndroid_registerHeadsetReceiver(
-      base::android::AttachCurrentThread(),
-      j_audio_manager_.obj());
-}
-
-void AudioManagerAndroid::UnregisterHeadsetReceiver() {
-  Java_AudioManagerAndroid_unregisterHeadsetReceiver(
-      base::android::AttachCurrentThread(),
-      j_audio_manager_.obj());
-}
-
 }  // namespace media