ADM no longer reads PCM files from data/audio_device. Now uses the resource folder instead.
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:
parent
6f909835f1
commit
3994e0324d
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -557,18 +557,19 @@ WebRtc_Word32 AudioTransportImpl::NeedMorePlayData(
|
||||
}
|
||||
|
||||
FuncTestManager::FuncTestManager() :
|
||||
_resourcePath(webrtc::test::ProjectRootPath() +
|
||||
"data/audio_device/"),
|
||||
_processThread(NULL),
|
||||
_audioDevice(NULL),
|
||||
_audioEventObserver(NULL),
|
||||
_audioTransport(NULL)
|
||||
{
|
||||
assert(!_resourcePath.empty());
|
||||
_playoutFile48 = _resourcePath + "audio_short48.pcm";
|
||||
_playoutFile44 = _resourcePath + "audio_short44.pcm";
|
||||
_playoutFile16 = _resourcePath + "audio_short16.pcm";
|
||||
_playoutFile8 = _resourcePath + "audio_short8.pcm";
|
||||
_playoutFile48 = webrtc::test::ResourcePath("audio_device\\audio_short48",
|
||||
"pcm");
|
||||
_playoutFile44 = webrtc::test::ResourcePath("audio_device\\audio_short44",
|
||||
"pcm");
|
||||
_playoutFile16 = webrtc::test::ResourcePath("audio_device\\audio_short16",
|
||||
"pcm");
|
||||
_playoutFile8 = webrtc::test::ResourcePath("audio_device\\audio_short8",
|
||||
"pcm");
|
||||
}
|
||||
|
||||
FuncTestManager::~FuncTestManager()
|
||||
|
@ -208,7 +208,6 @@ private:
|
||||
WebRtc_Word32 TestAdvancedMBAPI();
|
||||
private:
|
||||
// Paths to where the resource files to be used for this test are located.
|
||||
std::string _resourcePath;
|
||||
std::string _playoutFile48;
|
||||
std::string _playoutFile44;
|
||||
std::string _playoutFile16;
|
||||
|
Loading…
x
Reference in New Issue
Block a user