admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert of Supporting 48kHz PCM file. (patchset #1 id:1 of https://codereview.webrtc.org/2790493004/ )

Browse Source 
Reason for revert:
broke internal project

Original issue's description:
> Supporting 48kHz PCM file.
>
> BUG=None
>
> Review-Url: https://codereview.webrtc.org/2790493004
> Cr-Commit-Position: refs/heads/master@{#17493}
> Committed: 5f93709e7c

TBR=niklas.enbom@webrtc.org,solenberg@webrtc.org,minyue@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=None

Review-Url: https://codereview.webrtc.org/2791453004
Cr-Commit-Position: refs/heads/master@{#17496}
This commit is contained in:
lliuu 2017-03-31 16:32:28 -07:00 committed by Commit bot
parent 029f7cccf4
commit bc436ede07
6 changed files with 17 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
webrtc/common_types.h
View File

@ -139,8 +139,7 @@ enum FileFormats {
kFileFormatPreencodedFile = 4,
kFileFormatPcm16kHzFile = 7,
kFileFormatPcm8kHzFile = 8,
kFileFormatPcm32kHzFile = 9,
kFileFormatPcm48kHzFile = 10
kFileFormatPcm32kHzFile = 9
};
enum FrameType {

14
webrtc/modules/media_file/media_file_impl.cc
View File

@ -132,7 +132,6 @@ int32_t MediaFileImpl::PlayoutAudioData(int8_t* buffer,
switch(_fileFormat)
{
case kFileFormatPcm48kHzFile:
case kFileFormatPcm32kHzFile:
case kFileFormatPcm16kHzFile:
case kFileFormatPcm8kHzFile:
@ -480,7 +479,6 @@ int32_t MediaFileImpl::StartPlayingStream(
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 @@ int32_t MediaFileImpl::IncomingAudioData(
case kFileFormatPcm8kHzFile:
case kFileFormatPcm16kHzFile:
case kFileFormatPcm32kHzFile:
case kFileFormatPcm48kHzFile:
bytesWritten = _ptrFileUtilityObj->WritePCMData(
*_ptrOutStream,
buffer,
@ -848,15 +845,13 @@ int32_t MediaFileImpl::StartRecordingAudioStream(
}
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 @@ bool MediaFileImpl::ValidFileFormat(const FileFormats format,
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::ValidFilePositions(const uint32_t startPointMs,
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

30
webrtc/modules/media_file/media_file_utility.cc
View File

@ -1178,16 +1178,6 @@ int32_t ModuleFileUtility::InitPCMReading(InStream& pcm,
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;
@ -1323,24 +1313,12 @@ int32_t ModuleFileUtility::InitPCMWriting(OutStream& out, uint32_t freq)
_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;
@ -1411,10 +1389,6 @@ int32_t ModuleFileUtility::set_codec_info(const CodecInst& codecInst)
{
_codecId = kCodecL16_32Khz;
}
else if(codecInst.plfreq == 48000)
{
_codecId = kCodecL16_48Khz;
}
}
#ifdef WEBRTC_CODEC_ILBC
else if(STR_CASE_CMP(codecInst.plname, "ilbc") == 0)

1
webrtc/modules/media_file/media_file_utility.h
View File

@ -228,7 +228,6 @@ private:
kCodecL16_8Khz,
kCodecL16_16kHz,
kCodecL16_32Khz,
kCodecL16_48Khz,
kCodecPcmu,
kCodecPcma,
kCodecIlbc20Ms,

22
webrtc/voice_engine/file_player.cc
View File

@ -100,7 +100,7 @@ int32_t FilePlayerImpl::Frequency() const {
} else if (_codec.plfreq == 44000) {
return 32000;
} else if (_codec.plfreq == 48000) {
return 48000;
return 32000;
} else {
return _codec.plfreq;
}
@ -220,18 +220,16 @@ int32_t FilePlayerImpl::StartPlayingFile(const char* fileName,
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.";
@ -279,8 +277,7 @@ int32_t FilePlayerImpl::StartPlayingFile(InStream* sourceStream,
const CodecInst* codecInst) {
if (_fileFormat == kFileFormatPcm16kHzFile ||
_fileFormat == kFileFormatPcm32kHzFile ||
_fileFormat == kFileFormatPcm8kHzFile ||
_fileFormat == kFileFormatPcm48kHzFile) {
_fileFormat == kFileFormatPcm8kHzFile) {
CodecInst codecInstL16;
strncpy(codecInstL16.plname, "L16", 32);
codecInstL16.pltype = 93;
@ -290,18 +287,16 @@ int32_t FilePlayerImpl::StartPlayingFile(InStream* sourceStream,
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.";
@ -384,7 +379,6 @@ std::unique_ptr<FilePlayer> FilePlayer::CreateFilePlayer(
case kFileFormatPcm16kHzFile:
case kFileFormatPcm8kHzFile:
case kFileFormatPcm32kHzFile:
case kFileFormatPcm48kHzFile:
// audio formats
return std::unique_ptr<FilePlayer>(
new FilePlayerImpl(instanceID, fileFormat));

4
webrtc/voice_engine/file_player.h
View File

@ -23,8 +23,8 @@ class FileCallback;
class FilePlayer {
public:
// The largest decoded frame size in samples (120ms with 48kHz sample rate).
enum { MAX_AUDIO_BUFFER_IN_SAMPLES = 120 * 48 };
// The largest decoded frame size in samples (60ms with 32kHz sample rate).
enum { MAX_AUDIO_BUFFER_IN_SAMPLES = 60 * 32 };
enum { MAX_AUDIO_BUFFER_IN_BYTES = MAX_AUDIO_BUFFER_IN_SAMPLES * 2 };
// Note: will return NULL for unsupported formats.