Revert of Supporting 48kHz PCM file.

webrtc/modules/media_file/media_file_impl.cc

Index: webrtc/modules/media_file/media_file_impl.cc
diff --git a/webrtc/modules/media_file/media_file_impl.cc b/webrtc/modules/media_file/media_file_impl.cc
index 88310a5ef6d0ed01f1bf013325939a92cf4575de..e35626c76068d13574d2f4a27402b20dabe1021e 100644
--- a/webrtc/modules/media_file/media_file_impl.cc
+++ b/webrtc/modules/media_file/media_file_impl.cc
@@ -132,7 +132,6 @@
 
         switch(_fileFormat)
         {
-            case kFileFormatPcm48kHzFile:
             case kFileFormatPcm32kHzFile:
             case kFileFormatPcm16kHzFile:
             case kFileFormatPcm8kHzFile:
@@ -480,7 +479,6 @@
         case kFileFormatPcm8kHzFile:
         case kFileFormatPcm16kHzFile:
         case kFileFormatPcm32kHzFile:
-        case kFileFormatPcm48kHzFile:
         {
             // ValidFileFormat() called in the beginneing of this function
             // prevents codecInst from being NULL here.
@@ -633,7 +631,6 @@
                 case kFileFormatPcm8kHzFile:
                 case kFileFormatPcm16kHzFile:
                 case kFileFormatPcm32kHzFile:
-                case kFileFormatPcm48kHzFile:
                     bytesWritten = _ptrFileUtilityObj->WritePCMData(
                         *_ptrOutStream,
                         buffer,
@@ -848,15 +845,13 @@
         }
         case kFileFormatPcm8kHzFile:
         case kFileFormatPcm16kHzFile:
-        case kFileFormatPcm32kHzFile:
-        case kFileFormatPcm48kHzFile:
         {
             if(!ValidFrequency(codecInst.plfreq) ||
                _ptrFileUtilityObj->InitPCMWriting(stream, codecInst.plfreq) ==
                -1)
             {
                 WEBRTC_TRACE(kTraceError, kTraceFile, _id,
-                             "Failed to initialize PCM file!");
+                             "Failed to initialize 8 or 16KHz PCM file!");
                 delete _ptrFileUtilityObj;
                 _ptrFileUtilityObj = NULL;
                 return -1;
@@ -1075,8 +1070,7 @@
         if(format == kFileFormatPreencodedFile ||
            format == kFileFormatPcm8kHzFile    ||
            format == kFileFormatPcm16kHzFile   ||
-           format == kFileFormatPcm32kHzFile   ||
-           format == kFileFormatPcm48kHzFile)
+           format == kFileFormatPcm32kHzFile)
         {
             WEBRTC_TRACE(kTraceError, kTraceFile, -1,
                          "Codec info required for file format specified!");
@@ -1121,12 +1115,12 @@
 
 bool MediaFileImpl::ValidFrequency(const uint32_t frequency)
 {
-    if((frequency == 8000) || (frequency == 16000)|| (frequency == 32000) || (frequency == 48000))
+    if((frequency == 8000) || (frequency == 16000)|| (frequency == 32000))
     {
         return true;
     }
     WEBRTC_TRACE(kTraceError, kTraceFile, -1,
-                 "Frequency should be 8000, 16000, 32000, or 48000 (Hz)");
+                 "Frequency should be 8000, 16000 or 32000 (Hz)");
     return false;
 }
 }  // namespace webrtc