jamosdev
/
rhubarb-lip-sync
mirror of https://github.com/DanielSWolf/rhubarb-lip-sync.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Renamed phoneExtraction to phoneRecognition

This commit is contained in:
Daniel Wolf 2016-09-21 10:32:26 +02:00
parent 600b3429a7
commit 938079a75f
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -212,7 +212,7 @@ set(SOURCE_FILES
src/EnumConverter.h src/EnumConverter.h
src/Viseme.cpp src/Viseme.h src/Viseme.cpp src/Viseme.h
src/mouthAnimation.cpp src/mouthAnimation.h src/mouthAnimation.cpp src/mouthAnimation.h
src/phoneExtraction.cpp src/phoneExtraction.h src/phoneRecognition.cpp src/phoneRecognition.h
src/platformTools.cpp src/platformTools.h src/platformTools.cpp src/platformTools.h
src/tools.cpp src/tools.h src/tools.cpp src/tools.h
src/audio/AudioClip.cpp src/audio/AudioClip.h src/audio/AudioClip.cpp src/audio/AudioClip.h

4
src/main.cpp
View File

@ -3,7 +3,7 @@
#include <format.h> #include <format.h>
#include <tclap/CmdLine.h> #include <tclap/CmdLine.h>
#include "audio/WaveFileReader.h" #include "audio/WaveFileReader.h"
#include "phoneExtraction.h" #include "phoneRecognition.h"
#include "mouthAnimation.h" #include "mouthAnimation.h"
#include "appInfo.h" #include "appInfo.h"
#include "NiceCmdLineOutput.h" #include "NiceCmdLineOutput.h"
@ -153,7 +153,7 @@ int main(int argc, char *argv[]) {
BoundedTimeline<Phone> phones(TimeRange::zero()); BoundedTimeline<Phone> phones(TimeRange::zero());
{ {
ProgressBar progressBar; ProgressBar progressBar;
phones = detectPhones( phones = recognizePhones(
*createAudioClip(inputFileName.getValue()), *createAudioClip(inputFileName.getValue()),
dialogFile.isSet() ? readTextFile(path(dialogFile.getValue())) : boost::optional<u32string>(), dialogFile.isSet() ? readTextFile(path(dialogFile.getValue())) : boost::optional<u32string>(),
maxThreadCount.getValue(), maxThreadCount.getValue(),

4
src/phoneExtraction.cpp → src/phoneRecognition.cpp
View File

@ -1,5 +1,5 @@
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include "phoneExtraction.h" #include "phoneRecognition.h"
#include "audio/SampleRateConverter.h" #include "audio/SampleRateConverter.h"
#include "platformTools.h" #include "platformTools.h"
#include "tools.h" #include "tools.h"
@ -356,7 +356,7 @@ Timeline<void> getUnknownSounds(const Timeline<void>& utterances, const Timeline
return unknownSounds; return unknownSounds;
} }
BoundedTimeline<Phone> detectPhones( BoundedTimeline<Phone> recognizePhones(
const AudioClip& inputAudioClip, const AudioClip& inputAudioClip,
optional<u32string> dialog, optional<u32string> dialog,
int maxThreadCount, int maxThreadCount,

2
src/phoneExtraction.h → src/phoneRecognition.h
View File

@ -5,7 +5,7 @@
#include "ProgressBar.h" #include "ProgressBar.h"
#include "BoundedTimeline.h" #include "BoundedTimeline.h"
BoundedTimeline<Phone> detectPhones( BoundedTimeline<Phone> recognizePhones(
const AudioClip& audioClip, const AudioClip& audioClip,
boost::optional<std::u32string> dialog, boost::optional<std::u32string> dialog,
int maxThreadCount, int maxThreadCount,