commit 63e6a387456b3c85d1a26f211f4376146f297d37
author henrika <henrika@webrtc.org> Wed Dec 14 10:53:26 2016
committer Commit bot <commit-bot@chromium.org> Wed Dec 14 10:53:31 2016
tree d8b5e98f80dbc444aa0fd556191460102d9f79d8
parent fded4ccec45a835c51564325b60fac703bb0c542

Removes verification of audio parameters on Android

TBR=glaznev
BUG=webrtc:6890

Review-Url: https://codereview.webrtc.org/2572963003
Cr-Commit-Position: refs/heads/master@{#15599}

webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java

diff --git a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java b/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java
index c366544..136cce4 100644
--- a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java
+++ b/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java
@@ -198,11 +198,6 @@
     if (effects != null) {
       effects.enable(audioRecord.getAudioSessionId());
     }
-    // Verify that all audio parameters are valid and correct.
-    if (!areParametersValid(sampleRate, channels)) {
-      Logging.e(TAG, "At least one audio record parameter is invalid.");
-      return -1;
-    }
     logMainParameters();
     logMainParametersExtended();
     return framesPerBuffer;
@@ -243,15 +238,6 @@
     return true;
   }
 
-  // Verifies that the audio record is using correct parameters, i.e., that the
-  // created instance uses the parameters that we asked for.
-  private boolean areParametersValid(int sampleRate, int channels) {
-    return (audioRecord.getAudioFormat() == AudioFormat.ENCODING_PCM_16BIT
-        && audioRecord.getChannelConfiguration() == channelCountToConfiguration(channels)
-        && audioRecord.getAudioSource() == AudioSource.VOICE_COMMUNICATION
-        && audioRecord.getSampleRate() == sampleRate && audioRecord.getChannelCount() == channels);
-  }
-
   private void logMainParameters() {
     Logging.d(TAG, "AudioRecord: "
             + "session ID: " + audioRecord.getAudioSessionId() + ", "

webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioTrack.java

diff --git a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioTrack.java b/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioTrack.java
index 79961b9..5ea647a 100644
--- a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioTrack.java
+++ b/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioTrack.java
@@ -212,11 +212,6 @@
       Logging.e(TAG, "Initialization of audio track failed.");
       return false;
     }
-    // Verify that all audio parameters are valid and correct.
-    if (!areParametersValid(sampleRate, channels)) {
-      Logging.e(TAG, "At least one audio track parameter is invalid.");
-      return false;
-    }
     logMainParameters();
     logMainParametersExtended();
     return true;
@@ -280,17 +275,6 @@
     return audioManager.getStreamVolume(AudioManager.STREAM_VOICE_CALL);
   }
 
-  // Verifies that the audio track is using correct parameters, i.e., that the
-  // created track uses the parameters that we asked for.
-  private boolean areParametersValid(int sampleRate, int channels) {
-    final int streamType = audioTrack.getStreamType();
-    return (audioTrack.getAudioFormat() == AudioFormat.ENCODING_PCM_16BIT
-        && audioTrack.getChannelConfiguration() == channelCountToConfiguration(channels)
-        && streamType == AudioManager.STREAM_VOICE_CALL && audioTrack.getSampleRate() == sampleRate
-        && sampleRate == audioTrack.getNativeOutputSampleRate(streamType)
-        && audioTrack.getChannelCount() == channels);
-  }
-
   private void logMainParameters() {
     Logging.d(TAG, "AudioTrack: "
             + "session ID: " + audioTrack.getAudioSessionId() + ", "