oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

implemented audio exporting

Browse Source 
The encoder was moved to its own thread and will transcode the PCM from the
audio renderer into the chosen codec while the video frames are still
received. The implementation isn't perfect and could use some cleaning up, but
it is functional at the moment.
This commit is contained in:
itsmattkc
2019-12-23 01:45:27 +11:00
parent a8beae64ae
commit 3a7b3ffac6
19 changed files with 377 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/render/backend/opengl/openglexporter.cpp
+7 -7
View File
@@ -3,8 +3,8 @@
#include "render/backend/opengl/functions.h"
#include "render/pixelservice.h"
OpenGLExporter::OpenGLExporter(ViewerOutput* viewer, const VideoRenderingParams& params, const QMatrix4x4 &transform, ColorProcessorPtr color_processor, EncoderPtr encoder, QObject* parent) :
Exporter(viewer, params, transform, color_processor, encoder, parent)
OpenGLExporter::OpenGLExporter(ViewerOutput* viewer, const VideoRenderingParams& video_params, const AudioRenderingParams &audio_params, const QMatrix4x4 &transform, ColorProcessorPtr color_processor, Encoder *encoder, QObject* parent) :
Exporter(viewer, video_params, audio_params, transform, color_processor, encoder, parent)
{
}
@@ -24,7 +24,7 @@ bool OpenGLExporter::Initialize()
buffer_.Create(ctx);
texture_ = std::make_shared<OpenGLTexture>();
texture_->Create(ctx, params_.effective_width(), params_.effective_height(), params_.format());
texture_->Create(ctx, video_params_.effective_width(), video_params_.effective_height(), video_params_.format());
pipeline_ = OpenGLShader::CreateDefault();
@@ -40,9 +40,9 @@ void OpenGLExporter::Cleanup()
FramePtr OpenGLExporter::TextureToFrame(const QVariant& texture)
{
FramePtr frame = Frame::Create();
frame->set_width(params_.width());
frame->set_height(params_.height());
frame->set_format(params_.format());
frame->set_width(video_params_.width());
frame->set_height(video_params_.height());
frame->set_format(video_params_.format());
frame->allocate();
// Blit for transform if the width/height are different
@@ -65,7 +65,7 @@ FramePtr OpenGLExporter::TextureToFrame(const QVariant& texture)
buffer_.Attach(texture_);
buffer_.Bind();
PixelFormatInfo format_info = PixelService::GetPixelFormatInfo(params_.format());
PixelFormatInfo format_info = PixelService::GetPixelFormatInfo(video_params_.format());
f->glReadPixels(0,
0,