Revert of Supporting 48kHz PCM file.

webrtc/modules/media_file/media_file_utility.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 1160 matching lines @@
     else if(freq == 32000)
     {
         strcpy(codec_info_.plname, "L16");
         codec_info_.pltype   = -1;
         codec_info_.plfreq   = 32000;
         codec_info_.pacsize  = 320;
         codec_info_.channels = 1;
         codec_info_.rate     = 512000;
         _codecId = kCodecL16_32Khz;
     }
-    else if(freq == 48000)
-    {
-        strcpy(codec_info_.plname, "L16");
-        codec_info_.pltype   = -1;
-        codec_info_.plfreq   = 48000;
-        codec_info_.pacsize  = 480;
-        codec_info_.channels = 1;
-        codec_info_.rate     = 768000;
-        _codecId = kCodecL16_48Khz;
-    }
 
     // Readsize for 10ms of audio data (2 bytes per sample).
     _readSizeBytes = 2 * codec_info_. plfreq / 100;
     if(_startPointInMs > 0)
     {
         while (_playoutPositionMs < _startPointInMs)
         {
             read_len = pcm.Read(dummy, _readSizeBytes);
             if(read_len != static_cast<int>(_readSizeBytes))
             {
@@ skipping 115 matching lines @@
     {
         strcpy(codec_info_.plname, "L16");
         codec_info_.pltype   = -1;
         codec_info_.plfreq   = 32000;
         codec_info_.pacsize  = 320;
         codec_info_.channels = 1;
         codec_info_.rate     = 512000;
 
         _codecId = kCodecL16_32Khz;
     }
-    else if(freq == 48000)
-    {
-        strcpy(codec_info_.plname, "L16");
-        codec_info_.pltype   = -1;
-        codec_info_.plfreq   = 48000;
-        codec_info_.pacsize  = 480;
-        codec_info_.channels = 1;
-        codec_info_.rate     = 768000;
-
-        _codecId = kCodecL16_48Khz;
-    }
     if((_codecId != kCodecL16_8Khz) &&
        (_codecId != kCodecL16_16kHz) &&
-       (_codecId != kCodecL16_32Khz) &&
-       (_codecId != kCodecL16_48Khz))
+       (_codecId != kCodecL16_32Khz))
     {
         WEBRTC_TRACE(kTraceError, kTraceFile, _id,
-                     "CodecInst is not 8KHz, 16KHz, 32kHz or 48kHz PCM!");
+                     "CodecInst is not 8KHz PCM or 16KHz PCM!");
         return -1;
     }
     _writing = true;
     _bytesWritten = 0;
     return 0;
 }
 
 int32_t ModuleFileUtility::WritePCMData(OutStream& out,
                                         const int8_t*  buffer,
                                         const size_t dataLength)
@@ skipping 50 matching lines @@
             _codecId = kCodecL16_8Khz;
         }
         else if(codecInst.plfreq == 16000)
         {
             _codecId = kCodecL16_16kHz;
         }
         else if(codecInst.plfreq == 32000)
         {
             _codecId = kCodecL16_32Khz;
         }
-        else if(codecInst.plfreq == 48000)
-        {
-            _codecId = kCodecL16_48Khz;
-        }
     }
 #ifdef WEBRTC_CODEC_ILBC
     else if(STR_CASE_CMP(codecInst.plname, "ilbc") == 0)
     {
         if(codecInst.pacsize == 160)
         {
             _codecId = kCodecIlbc20Ms;
         }
         else if(codecInst.pacsize == 240)
         {
@@ skipping 147 matching lines @@
 }
 
 uint32_t ModuleFileUtility::PlayoutPositionMs()
 {
     WEBRTC_TRACE(kTraceStream, kTraceFile, _id,
                  "ModuleFileUtility::PlayoutPosition()");
 
     return _reading ? _playoutPositionMs : 0;
 }
 }  // namespace webrtc