Commit e42c2872 authored by Dipl.-Ing. Jonas Stienen's avatar Dipl.-Ing. Jonas Stienen
Browse files

Merging conflict fix

parents 3f560471 44f3c8e7
...@@ -91,6 +91,7 @@ Driver = Portaudio ...@@ -91,6 +91,7 @@ Driver = Portaudio
#Device = ASIO MADIface USB #Device = ASIO MADIface USB
#Device = Focusrite USB 2.0 Audio Driver #Device = Focusrite USB 2.0 Audio Driver
#Device = M-Audio Fast Track Ultra ASIO #Device = M-Audio Fast Track Ultra ASIO
#Device = Yamaha Steinberg USB ASIO
Device = default Device = default
# MANDATORY: Sampling rate [Hz] # MANDATORY: Sampling rate [Hz]
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include <ITAException.h> #include <ITAException.h>
#include <ITABufferDataSource.h> #include <ITABufferDataSource.h>
#include <ITASampleFrame.h> #include <ITASampleFrame.h>
#include <ITAAudioSample.h>
#include <sstream> #include <sstream>
#include <assert.h> #include <assert.h>
...@@ -43,7 +44,8 @@ CVAAudiofileSignalSource::CVAAudiofileSignalSource( const std::string& sFileName ...@@ -43,7 +44,8 @@ CVAAudiofileSignalSource::CVAAudiofileSignalSource( const std::string& sFileName
{ {
m_sbOutBuffer.Init( iBlockLength, true ); m_sbOutBuffer.Init( iBlockLength, true );
ITASampleFrame sfFileBuffer( sFileName ); CITAAudioSample sfFileBuffer(dSampleRate);
sfFileBuffer.LoadWithSampleRateConversion(sFileName);
std::vector< float* > vfBufferPointer; std::vector< float* > vfBufferPointer;
......
...@@ -420,7 +420,7 @@ void CVATextToSpeechSignalSource::VisemeProcessing(CPRC_abuf * abuf, void * user ...@@ -420,7 +420,7 @@ void CVATextToSpeechSignalSource::VisemeProcessing(CPRC_abuf * abuf, void * user
VA_INFO("CVATextToSpeechSignalSource", "ERROR: could not retrieve transcription at "+ std::to_string(i)); VA_INFO("CVATextToSpeechSignalSource", "ERROR: could not retrieve transcription at "+ std::to_string(i));
} }
} }
data->lastEnd = endTime; data->lastEnd += endTime;
//we basically append the data in abuf to the data in floatBuffer and on the way convert it from short to float (since that's what we need for the SoundSignal) //we basically append the data in abuf to the data in floatBuffer and on the way convert it from short to float (since that's what we need for the SoundSignal)
std::size_t bufferLength = CPRC_abuf_wav_sz(abuf); std::size_t bufferLength = CPRC_abuf_wav_sz(abuf);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment