Revert of Supporting 48kHz PCM file.

webrtc/voice_engine/file_player.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 82 matching lines @@
   }
   // Make sure that sample rate is 8,16 or 32 kHz. E.g. WAVE files may have
   // other sampling rates.
   if (_codec.plfreq == 11000) {
     return 16000;
   } else if (_codec.plfreq == 22000) {
     return 32000;
   } else if (_codec.plfreq == 44000) {
     return 32000;
   } else if (_codec.plfreq == 48000) {
-    return 48000;
+    return 32000;
   } else {
     return _codec.plfreq;
   }
 }
 
 int32_t FilePlayerImpl::AudioCodec(CodecInst* audioCodec) const {
   *audioCodec = _codec;
   return 0;
 }
 
@@ skipping 99 matching lines @@
       _fileFormat == kFileFormatPcm32kHzFile) {
     CodecInst codecInstL16;
     strncpy(codecInstL16.plname, "L16", 32);
     codecInstL16.pltype = 93;
     codecInstL16.channels = 1;
 
     if (_fileFormat == kFileFormatPcm8kHzFile) {
       codecInstL16.rate = 128000;
       codecInstL16.plfreq = 8000;
       codecInstL16.pacsize = 80;
+
     } else if (_fileFormat == kFileFormatPcm16kHzFile) {
       codecInstL16.rate = 256000;
       codecInstL16.plfreq = 16000;
       codecInstL16.pacsize = 160;
+
     } else if (_fileFormat == kFileFormatPcm32kHzFile) {
       codecInstL16.rate = 512000;
       codecInstL16.plfreq = 32000;
-      codecInstL16.pacsize = 320;
-    } else if (_fileFormat == kFileFormatPcm48kHzFile) {
-      codecInstL16.rate = 768000;
-      codecInstL16.plfreq = 48000;
-      codecInstL16.pacsize = 480;
+      codecInstL16.pacsize = 160;
     } else {
       LOG(LS_ERROR) << "StartPlayingFile() sample frequency not "
                     << "supported for PCM format.";
       return -1;
     }
 
     if (_fileModule.StartPlayingAudioFile(fileName, notification, loop,
                                           _fileFormat, &codecInstL16,
                                           startPosition, stopPosition) == -1) {
       LOG(LS_WARNING) << "StartPlayingFile() failed to initialize "
@@ skipping 27 matching lines @@
 }
 
 int32_t FilePlayerImpl::StartPlayingFile(InStream* sourceStream,
                                          uint32_t startPosition,
                                          float volumeScaling,
                                          uint32_t notification,
                                          uint32_t stopPosition,
                                          const CodecInst* codecInst) {
   if (_fileFormat == kFileFormatPcm16kHzFile ||
       _fileFormat == kFileFormatPcm32kHzFile ||
-      _fileFormat == kFileFormatPcm8kHzFile ||
-      _fileFormat == kFileFormatPcm48kHzFile) {
+      _fileFormat == kFileFormatPcm8kHzFile) {
     CodecInst codecInstL16;
     strncpy(codecInstL16.plname, "L16", 32);
     codecInstL16.pltype = 93;
     codecInstL16.channels = 1;
 
     if (_fileFormat == kFileFormatPcm8kHzFile) {
       codecInstL16.rate = 128000;
       codecInstL16.plfreq = 8000;
       codecInstL16.pacsize = 80;
+
     } else if (_fileFormat == kFileFormatPcm16kHzFile) {
       codecInstL16.rate = 256000;
       codecInstL16.plfreq = 16000;
       codecInstL16.pacsize = 160;
+
     } else if (_fileFormat == kFileFormatPcm32kHzFile) {
       codecInstL16.rate = 512000;
       codecInstL16.plfreq = 32000;
-      codecInstL16.pacsize = 320;
-    } else if (_fileFormat == kFileFormatPcm48kHzFile) {
-      codecInstL16.rate = 768000;
-      codecInstL16.plfreq = 48000;
-      codecInstL16.pacsize = 480;
+      codecInstL16.pacsize = 160;
     } else {
       LOG(LS_ERROR) << "StartPlayingFile() sample frequency not "
                     << "supported for PCM format.";
       return -1;
     }
     if (_fileModule.StartPlayingAudioStream(
             *sourceStream, notification, _fileFormat, &codecInstL16,
             startPosition, stopPosition) == -1) {
       LOG(LS_ERROR) << "StartPlayingFile() failed to initialize stream "
                     << "playout.";
@@ skipping 62 matching lines @@
 std::unique_ptr<FilePlayer> FilePlayer::CreateFilePlayer(
     uint32_t instanceID,
     FileFormats fileFormat) {
   switch (fileFormat) {
     case kFileFormatWavFile:
     case kFileFormatCompressedFile:
     case kFileFormatPreencodedFile:
     case kFileFormatPcm16kHzFile:
     case kFileFormatPcm8kHzFile:
     case kFileFormatPcm32kHzFile:
-    case kFileFormatPcm48kHzFile:
       // audio formats
       return std::unique_ptr<FilePlayer>(
           new FilePlayerImpl(instanceID, fileFormat));
     default:
       assert(false);
       return nullptr;
   }
 }
 
 }  // namespace webrtc