Implement RtAudio backend
This commit is contained in:
parent
023c7619c7
commit
bd6013081a
63
include/f1x/openauto/autoapp/Projection/RtAudioOutput.hpp
Normal file
63
include/f1x/openauto/autoapp/Projection/RtAudioOutput.hpp
Normal file
@ -0,0 +1,63 @@
|
|||||||
|
/*
|
||||||
|
* This file is part of openauto project.
|
||||||
|
* Copyright (C) 2018 f1x.studio (Michal Szwaj)
|
||||||
|
*
|
||||||
|
* openauto is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
|
||||||
|
* openauto is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with openauto. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <RtAudio.h>
|
||||||
|
#include <f1x/openauto/autoapp/Projection/IAudioOutput.hpp>
|
||||||
|
#include <f1x/openauto/autoapp/Projection/SequentialBuffer.hpp>
|
||||||
|
|
||||||
|
namespace f1x
|
||||||
|
{
|
||||||
|
namespace openauto
|
||||||
|
{
|
||||||
|
namespace autoapp
|
||||||
|
{
|
||||||
|
namespace projection
|
||||||
|
{
|
||||||
|
|
||||||
|
class RtAudioOutput: public IAudioOutput
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
RtAudioOutput(uint32_t channelCount, uint32_t sampleSize, uint32_t sampleRate);
|
||||||
|
bool open() override;
|
||||||
|
void write(const aasdk::common::DataConstBuffer& buffer) override;
|
||||||
|
void start() override;
|
||||||
|
void stop() override;
|
||||||
|
void suspend() override;
|
||||||
|
uint32_t getSampleSize() const override;
|
||||||
|
uint32_t getChannelCount() const override;
|
||||||
|
uint32_t getSampleRate() const override;
|
||||||
|
|
||||||
|
private:
|
||||||
|
static int audioBufferReadHandler(void* outputBuffer, void* inputBuffer, unsigned int nBufferFrames,
|
||||||
|
double streamTime, RtAudioStreamStatus status, void* userData);
|
||||||
|
|
||||||
|
uint32_t channelCount_;
|
||||||
|
uint32_t sampleSize_;
|
||||||
|
uint32_t sampleRate_;
|
||||||
|
SequentialBuffer audioBuffer_;
|
||||||
|
bool playbackStarted_;
|
||||||
|
RtAudio dac_;
|
||||||
|
std::mutex mutex_;
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -93,6 +93,12 @@ void AudioService::onChannelOpenRequest(const aasdk::proto::messages::ChannelOpe
|
|||||||
OPENAUTO_LOG(info) << "[AudioService] open request"
|
OPENAUTO_LOG(info) << "[AudioService] open request"
|
||||||
<< ", channel: " << aasdk::messenger::channelIdToString(channel_->getId())
|
<< ", channel: " << aasdk::messenger::channelIdToString(channel_->getId())
|
||||||
<< ", priority: " << request.priority();
|
<< ", priority: " << request.priority();
|
||||||
|
|
||||||
|
OPENAUTO_LOG(debug) << "[AudioService] channel: " << aasdk::messenger::channelIdToString(channel_->getId())
|
||||||
|
<< " audio output sample rate: " << audioOutput_->getSampleRate()
|
||||||
|
<< ", sample size: " << audioOutput_->getSampleSize()
|
||||||
|
<< ", channel count: " << audioOutput_->getChannelCount();
|
||||||
|
|
||||||
const aasdk::proto::enums::Status::Enum status = audioOutput_->open() ? aasdk::proto::enums::Status::OK : aasdk::proto::enums::Status::FAIL;
|
const aasdk::proto::enums::Status::Enum status = audioOutput_->open() ? aasdk::proto::enums::Status::OK : aasdk::proto::enums::Status::FAIL;
|
||||||
OPENAUTO_LOG(info) << "[AudioService] open status: " << status
|
OPENAUTO_LOG(info) << "[AudioService] open status: " << status
|
||||||
<< ", channel: " << aasdk::messenger::channelIdToString(channel_->getId());
|
<< ", channel: " << aasdk::messenger::channelIdToString(channel_->getId());
|
||||||
|
148
src/autoapp/Projection/RtAudioOutput.cpp
Normal file
148
src/autoapp/Projection/RtAudioOutput.cpp
Normal file
@ -0,0 +1,148 @@
|
|||||||
|
/*
|
||||||
|
* This file is part of openauto project.
|
||||||
|
* Copyright (C) 2018 f1x.studio (Michal Szwaj)
|
||||||
|
*
|
||||||
|
* openauto is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
|
||||||
|
* openauto is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with openauto. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <f1x/openauto/autoapp/Projection/RtAudioOutput.hpp>
|
||||||
|
#include <f1x/openauto/Common/Log.hpp>
|
||||||
|
|
||||||
|
namespace f1x
|
||||||
|
{
|
||||||
|
namespace openauto
|
||||||
|
{
|
||||||
|
namespace autoapp
|
||||||
|
{
|
||||||
|
namespace projection
|
||||||
|
{
|
||||||
|
|
||||||
|
RtAudioOutput::RtAudioOutput(uint32_t channelCount, uint32_t sampleSize, uint32_t sampleRate)
|
||||||
|
: channelCount_(channelCount)
|
||||||
|
, sampleSize_(sampleSize)
|
||||||
|
, sampleRate_(sampleRate)
|
||||||
|
, playbackStarted_(false)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
bool RtAudioOutput::open()
|
||||||
|
{
|
||||||
|
std::lock_guard<decltype(mutex_)> lock(mutex_);
|
||||||
|
|
||||||
|
if(dac_.getDeviceCount() > 0)
|
||||||
|
{
|
||||||
|
RtAudio::StreamParameters parameters;
|
||||||
|
parameters.deviceId = dac_.getDefaultOutputDevice();
|
||||||
|
parameters.nChannels = channelCount_;
|
||||||
|
parameters.firstChannel = 0;
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
uint32_t bufferFrames = 256;
|
||||||
|
dac_.openStream(¶meters, nullptr, RTAUDIO_SINT16, sampleRate_, &bufferFrames, &RtAudioOutput::audioBufferReadHandler, static_cast<void*>(this));
|
||||||
|
|
||||||
|
return audioBuffer_.open(QIODevice::ReadWrite);
|
||||||
|
}
|
||||||
|
catch(const RtAudioError& e)
|
||||||
|
{
|
||||||
|
OPENAUTO_LOG(error) << "[RtAudioOutput] Failed to open audio output, what: " << e.what();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
OPENAUTO_LOG(error) << "[RtAudioOutput] No output devices found.";
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
void RtAudioOutput::write(const aasdk::common::DataConstBuffer& buffer)
|
||||||
|
{
|
||||||
|
audioBuffer_.write(reinterpret_cast<const char*>(buffer.cdata), buffer.size);
|
||||||
|
}
|
||||||
|
|
||||||
|
void RtAudioOutput::start()
|
||||||
|
{
|
||||||
|
std::lock_guard<decltype(mutex_)> lock(mutex_);
|
||||||
|
|
||||||
|
if(dac_.isStreamOpen() && !dac_.isStreamRunning())
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
dac_.startStream();
|
||||||
|
}
|
||||||
|
catch(const RtAudioError& e)
|
||||||
|
{
|
||||||
|
OPENAUTO_LOG(error) << "[RtAudioOutput] Failed to start audio output, what: " << e.what();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void RtAudioOutput::stop()
|
||||||
|
{
|
||||||
|
std::lock_guard<decltype(mutex_)> lock(mutex_);
|
||||||
|
|
||||||
|
this->suspend();
|
||||||
|
|
||||||
|
if(dac_.isStreamOpen())
|
||||||
|
{
|
||||||
|
dac_.closeStream();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void RtAudioOutput::suspend()
|
||||||
|
{
|
||||||
|
std::lock_guard<decltype(mutex_)> lock(mutex_);
|
||||||
|
|
||||||
|
if(!dac_.isStreamOpen() && !dac_.isStreamRunning())
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
dac_.stopStream();
|
||||||
|
}
|
||||||
|
catch(const RtAudioError& e)
|
||||||
|
{
|
||||||
|
OPENAUTO_LOG(error) << "[RtAudioOutput] Failed to suspend audio output, what: " << e.what();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
uint32_t RtAudioOutput::getSampleSize() const
|
||||||
|
{
|
||||||
|
return sampleSize_;
|
||||||
|
}
|
||||||
|
|
||||||
|
uint32_t RtAudioOutput::getChannelCount() const
|
||||||
|
{
|
||||||
|
return channelCount_;
|
||||||
|
}
|
||||||
|
|
||||||
|
uint32_t RtAudioOutput::getSampleRate() const
|
||||||
|
{
|
||||||
|
return sampleRate_;
|
||||||
|
}
|
||||||
|
|
||||||
|
int RtAudioOutput::audioBufferReadHandler(void* outputBuffer, void* inputBuffer, unsigned int nBufferFrames,
|
||||||
|
double streamTime, RtAudioStreamStatus status, void* userData)
|
||||||
|
{
|
||||||
|
RtAudioOutput* self = static_cast<RtAudioOutput*>(userData);
|
||||||
|
const auto bufferSize = nBufferFrames * (self->sampleSize_ / 8) * self->channelCount_;
|
||||||
|
self->audioBuffer_.read(reinterpret_cast<char*>(outputBuffer), bufferSize);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -32,6 +32,7 @@
|
|||||||
#include <f1x/openauto/autoapp/Projection/InputService.hpp>
|
#include <f1x/openauto/autoapp/Projection/InputService.hpp>
|
||||||
#include <f1x/openauto/autoapp/Projection/QtVideoOutput.hpp>
|
#include <f1x/openauto/autoapp/Projection/QtVideoOutput.hpp>
|
||||||
#include <f1x/openauto/autoapp/Projection/OMXVideoOutput.hpp>
|
#include <f1x/openauto/autoapp/Projection/OMXVideoOutput.hpp>
|
||||||
|
#include <f1x/openauto/autoapp/Projection/RtAudioOutput.hpp>
|
||||||
#include <f1x/openauto/autoapp/Projection/QtAudioOutput.hpp>
|
#include <f1x/openauto/autoapp/Projection/QtAudioOutput.hpp>
|
||||||
#include <f1x/openauto/autoapp/Projection/QtAudioInput.hpp>
|
#include <f1x/openauto/autoapp/Projection/QtAudioInput.hpp>
|
||||||
#include <f1x/openauto/autoapp/Projection/InputDevice.hpp>
|
#include <f1x/openauto/autoapp/Projection/InputDevice.hpp>
|
||||||
@ -64,17 +65,20 @@ ServiceList ServiceFactory::create(aasdk::messenger::IMessenger::Pointer messeng
|
|||||||
|
|
||||||
if(configuration_->musicAudioChannelEnabled())
|
if(configuration_->musicAudioChannelEnabled())
|
||||||
{
|
{
|
||||||
IAudioOutput::Pointer mediaAudioOutput(new QtAudioOutput(2, 16, 48000), std::bind(&QObject::deleteLater, std::placeholders::_1));
|
//IAudioOutput::Pointer mediaAudioOutput(new QtAudioOutput(2, 16, 48000), std::bind(&QObject::deleteLater, std::placeholders::_1));
|
||||||
|
auto mediaAudioOutput(std::make_shared<RtAudioOutput>(2, 16, 48000));
|
||||||
serviceList.emplace_back(std::make_shared<MediaAudioService>(ioService_, messenger, std::move(mediaAudioOutput)));
|
serviceList.emplace_back(std::make_shared<MediaAudioService>(ioService_, messenger, std::move(mediaAudioOutput)));
|
||||||
}
|
}
|
||||||
|
|
||||||
if(configuration_->speechAudioChannelEnabled())
|
if(configuration_->speechAudioChannelEnabled())
|
||||||
{
|
{
|
||||||
IAudioOutput::Pointer speechAudioOutput(new QtAudioOutput(1, 16, 16000), std::bind(&QObject::deleteLater, std::placeholders::_1));
|
IAudioOutput::Pointer speechAudioOutput(new QtAudioOutput(1, 16, 16000), std::bind(&QObject::deleteLater, std::placeholders::_1));
|
||||||
|
//auto speechAudioOutput(std::make_shared<RtAudioOutput>(1, 16, 1600));
|
||||||
serviceList.emplace_back(std::make_shared<SpeechAudioService>(ioService_, messenger, std::move(speechAudioOutput)));
|
serviceList.emplace_back(std::make_shared<SpeechAudioService>(ioService_, messenger, std::move(speechAudioOutput)));
|
||||||
}
|
}
|
||||||
|
|
||||||
IAudioOutput::Pointer systemAudioOutput(new QtAudioOutput(1, 16, 16000), std::bind(&QObject::deleteLater, std::placeholders::_1));
|
IAudioOutput::Pointer systemAudioOutput(new QtAudioOutput(1, 16, 16000), std::bind(&QObject::deleteLater, std::placeholders::_1));
|
||||||
|
//auto systemAudioOutput(std::make_shared<RtAudioOutput>(1, 16, 1600));
|
||||||
serviceList.emplace_back(std::make_shared<SystemAudioService>(ioService_, messenger, std::move(systemAudioOutput)));
|
serviceList.emplace_back(std::make_shared<SystemAudioService>(ioService_, messenger, std::move(systemAudioOutput)));
|
||||||
|
|
||||||
serviceList.emplace_back(std::make_shared<SensorService>(ioService_, messenger));
|
serviceList.emplace_back(std::make_shared<SensorService>(ioService_, messenger));
|
||||||
|
Loading…
x
Reference in New Issue
Block a user