Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(388)

Unified Diff: webrtc/modules/media_file/media_file_utility.cc

Issue 2791453004: Revert of Supporting 48kHz PCM file. (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/modules/media_file/media_file_utility.h ('k') | webrtc/voice_engine/file_player.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/media_file/media_file_utility.cc
diff --git a/webrtc/modules/media_file/media_file_utility.cc b/webrtc/modules/media_file/media_file_utility.cc
index 6c60b056b703e9db4bcf02ab82a9b9a00cd24f1a..ae8d06f634054ef7738167840c6e9a2c45e33a7d 100644
--- a/webrtc/modules/media_file/media_file_utility.cc
+++ b/webrtc/modules/media_file/media_file_utility.cc
@@ -1178,16 +1178,6 @@
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 @@
_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))
- {
- WEBRTC_TRACE(kTraceError, kTraceFile, _id,
- "CodecInst is not 8KHz, 16KHz, 32kHz or 48kHz PCM!");
+ (_codecId != kCodecL16_32Khz))
+ {
+ WEBRTC_TRACE(kTraceError, kTraceFile, _id,
+ "CodecInst is not 8KHz PCM or 16KHz PCM!");
return -1;
}
_writing = true;
@@ -1410,10 +1388,6 @@
else if(codecInst.plfreq == 32000)
{
_codecId = kCodecL16_32Khz;
- }
- else if(codecInst.plfreq == 48000)
- {
- _codecId = kCodecL16_48Khz;
}
}
#ifdef WEBRTC_CODEC_ILBC
« no previous file with comments | « webrtc/modules/media_file/media_file_utility.h ('k') | webrtc/voice_engine/file_player.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698