Revert "OMAP: Configuring sample rate appropriatetly for AMR-WB record"

This reverts commit 4f9d14cc63f8ac4a7195670ea0f7b8abb776dbf8.

Original commit was:
"StagefrightRecorder was setting the sample rate incorrectly for
AMR-WB speech codec. This change will configure this setting
accordingly.".
This, however, overrides the sample rate selected by
setParamAudioSamplingRate and causes all audio to be recorded in its
lowest sample rate, resulting in significantly degraded audio quality.

Change-Id: I341a58ad4eaef06422f0f026b92155ab54294c21

1 files changed, 13 insertions, 16 deletions

diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp
index a28c225..e0ba290 100755
--- a/media/libmediaplayerservice/StagefrightRecorder.cpp
+++ b/media/libmediaplayerservice/StagefrightRecorder.cpp
@@ -678,6 +678,19 @@ status_t StagefrightRecorder::start() {
 }
 
 sp<MediaSource> StagefrightRecorder::createAudioSource() {
+    sp<AudioSource> audioSource =
+        new AudioSource(
+                mAudioSource,
+                mSampleRate,
+                mAudioChannels);
+
+    status_t err = audioSource->initCheck();
+
+    if (err != OK) {
+        LOGE("audio source is not initialized");
+        return NULL;
+    }
+
     sp<MetaData> encMeta = new MetaData;
     const char *mime;
     switch (mAudioEncoder) {
@@ -697,22 +710,6 @@ sp<MediaSource> StagefrightRecorder::createAudioSource() {
     }
     encMeta->setCString(kKeyMIMEType, mime);
 
-    mSampleRate = mEncoderProfiles->getAudioEncoderParamByName(
-                   "enc.aud.hz.min", mAudioEncoder);
-
-    sp<AudioSource> audioSource =
-        new AudioSource(
-                mAudioSource,
-                mSampleRate,
-                mAudioChannels);
-
-    status_t err = audioSource->initCheck();
-
-    if (err != OK) {
-        LOGE("audio source is not initialized");
-        return NULL;
-    }
-
     int32_t maxInputSize;
     CHECK(audioSource->getFormat()->findInt32(
                 kKeyMaxInputSize, &maxInputSize));