use audioprocessor to match device's output

This commit is contained in:
itsmattkc
2022-05-05 16:32:17 -07:00
parent d727ab5353
commit 5bed4396ea
9 changed files with 107 additions and 13 deletions
+12 -3
View File
@@ -80,10 +80,11 @@ int InputCallback(const void *input, void *output, unsigned long frameCount, con
return paContinue;
}
void AudioManager::PushToOutput(const AudioParams &params, const QByteArray &samples)
bool AudioManager::PushToOutput(const AudioParams &params, const QByteArray &samples, QString *error)
{
if (output_device_ == paNoDevice) {
return;
if (error) *error = tr("No output device is set");
return false;
}
if (output_params_ != params || output_stream_ == nullptr) {
@@ -93,7 +94,13 @@ void AudioManager::PushToOutput(const AudioParams &params, const QByteArray &sam
PaStreamParameters p = GetPortAudioParams(params, output_device_);
Pa_OpenStream(&output_stream_, nullptr, &p, output_params_.sample_rate(), paFramesPerBufferUnspecified, paNoFlag, OutputCallback, output_buffer_);
PaError r = Pa_OpenStream(&output_stream_, nullptr, &p, output_params_.sample_rate(), paFramesPerBufferUnspecified, paNoFlag, OutputCallback, output_buffer_);
if (r != paNoError) {
// Unhandled error
//qCritical() << "Failed to open output stream:" << Pa_GetErrorText(r);
if (error) *error = Pa_GetErrorText(r);
return false;
}
output_buffer_->set_bytes_per_frame(output_params_.samples_to_bytes(1));
}
@@ -103,6 +110,8 @@ void AudioManager::PushToOutput(const AudioParams &params, const QByteArray &sam
if (!Pa_IsStreamActive(output_stream_)) {
Pa_StartStream(output_stream_);
}
return true;
}
void AudioManager::ClearBufferedOutput()
+4 -1
View File
@@ -27,6 +27,7 @@
#include <portaudio.h>
#include "audiovisualwaveform.h"
#include "audio/audioprocessor.h"
#include "common/define.h"
#include "codec/ffmpeg/ffmpegencoder.h"
#include "render/audioparams.h"
@@ -52,7 +53,7 @@ public:
void SetOutputNotifyInterval(int n);
void PushToOutput(const AudioParams &params, const QByteArray& samples);
bool PushToOutput(const AudioParams &params, const QByteArray& samples, QString *error = nullptr);
void ClearBufferedOutput();
@@ -86,6 +87,8 @@ public:
signals:
void OutputNotify();
void OutputParamsChanged();
private:
AudioManager();
+3
View File
@@ -51,6 +51,9 @@ public:
void Flush();
const AudioParams &from() const { return from_; }
const AudioParams &to() const { return to_; }
private:
static AVFilterContext* CreateTempoFilter(AVFilterGraph *graph, AVFilterContext *link, const double& tempo);