generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ADM no longer reads PCM files from data/audio_device. Now uses the resource folder instead.

Browse Source 
BUG=737

Review URL: https://webrtc-codereview.appspot.com/714012

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2643 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrika@webrtc.org 2012-08-20 09:44:59 +00:00
parent 6f909835f1
commit 3994e0324d
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/audio_device/audio_short16.pcm
View File

Binary file not shown.

BIN
data/audio_device/audio_short44.pcm
View File

Binary file not shown.

BIN
data/audio_device/audio_short48.pcm
View File

Binary file not shown.

BIN
data/audio_device/audio_short8.pcm
View File

Binary file not shown.

15
src/modules/audio_device/main/test/func_test_manager.cc
View File

@ -557,18 +557,19 @@ WebRtc_Word32 AudioTransportImpl::NeedMorePlayData(
} }
FuncTestManager::FuncTestManager() : FuncTestManager::FuncTestManager() :
_resourcePath(webrtc::test::ProjectRootPath() +
"data/audio_device/"),
_processThread(NULL), _processThread(NULL),
_audioDevice(NULL), _audioDevice(NULL),
_audioEventObserver(NULL), _audioEventObserver(NULL),
_audioTransport(NULL) _audioTransport(NULL)
{ {
assert(!_resourcePath.empty()); _playoutFile48 = webrtc::test::ResourcePath("audio_device\\audio_short48",
_playoutFile48 = _resourcePath + "audio_short48.pcm"; "pcm");
_playoutFile44 = _resourcePath + "audio_short44.pcm"; _playoutFile44 = webrtc::test::ResourcePath("audio_device\\audio_short44",
_playoutFile16 = _resourcePath + "audio_short16.pcm"; "pcm");
_playoutFile8 = _resourcePath + "audio_short8.pcm"; _playoutFile16 = webrtc::test::ResourcePath("audio_device\\audio_short16",
"pcm");
_playoutFile8 = webrtc::test::ResourcePath("audio_device\\audio_short8",
"pcm");
} }
FuncTestManager::~FuncTestManager() FuncTestManager::~FuncTestManager()

1
src/modules/audio_device/main/test/func_test_manager.h
View File

@ -208,7 +208,6 @@ private:
WebRtc_Word32 TestAdvancedMBAPI(); WebRtc_Word32 TestAdvancedMBAPI();
private: private:
// Paths to where the resource files to be used for this test are located. // Paths to where the resource files to be used for this test are located.
std::string _resourcePath;
std::string _playoutFile48; std::string _playoutFile48;
std::string _playoutFile44; std::string _playoutFile44;
std::string _playoutFile16; std::string _playoutFile16;