solve some bugs

app/render/opengl/openglrenderer.h

@@ -68,6 +68,11 @@ public:
 	virtual Color GetPixelFromTexture(olive::Texture *texture,
 									  const QPointF &pt) override;
 
+	QOpenGLContext *context() const
+	{
+		return context_;
+	}
+
 protected:
 	virtual void Blit(QVariant shader, olive::AcceleratedJob& job,
 					  olive::Texture *destination,

app/render/plugin/pluginrenderer.cpp

@@ -296,17 +296,6 @@ void olive::plugin::PluginRenderer::RenderPlugin(TexturePtr src, olive::plugin::
 	if (olive_instance) {
 		olive_instance->setOpenGLEnabled(use_opengl);
 	}
-	OfxStatus stat;
-	stat = instance->createInstanceAction();
-	if(stat != kOfxStatOK && stat != kOfxStatReplyDefault) {
-		return;
-	}
-	// now we need to to call getClipPreferences on the instance so that it does the clip component/depth
-	// logic and caches away the components and depth on each clip.
-	bool ok = instance->getClipPreferences();
-	if (!ok) {
-		return;
-	}
 
 	// current render scale of 1
 	OfxPointD renderScale;
@@ -334,37 +323,22 @@ void olive::plugin::PluginRenderer::RenderPlugin(TexturePtr src, olive::plugin::
 
 
 	int numFramesToRender=1;
-	stat = instance->beginRenderAction(0, numFramesToRender,
-		1.0, false, renderScale, true,
-		interactive);
-	if (stat != kOfxStatOK && stat != kOfxStatReplyDefault) {
-		return;
-	}
-
-#ifdef OFX_SUPPORTS_OPENGLRENDER
-	if (use_opengl) {
-		instance->contextAttachedAction();
-		AttachOutputTexture(destination);
-	}
-#endif
 
 	OliveClipInstance *clip=dynamic_cast<plugin::OliveClipInstance *>(instance->getClip("Output"));
 	if (!clip) {
-#ifdef OFX_SUPPORTS_OPENGLRENDER
-		if (use_opengl) {
-			DetachOutputTexture();
-			instance->contextDetachedAction();
-		}
-#endif
-		instance->endRenderAction(0, numFramesToRender, 1.0, interactive, renderScale, true,interactive
-								  );
+		return;
+	}
+	clip->setParams(destination_params);
+
+	OfxStatus stat;
+	stat = instance->createInstanceAction();
+	if(stat != kOfxStatOK && stat != kOfxStatReplyDefault) {
 		return;
 	}
 
 	// call get region of interest on each of the inputs
 	OfxTime frame = 0;
 
-	clip->setParams(destination_params);
 	clip->setRegionOfDefinition(regionOfDefinition, frame);
 	clip->setOutputTexture(destination, frame);
 
@@ -388,6 +362,27 @@ void olive::plugin::PluginRenderer::RenderPlugin(TexturePtr src, olive::plugin::
 			}
 		}
 	}
+
+	// now we need to call getClipPreferences on the instance so that it does
+	// the clip component/depth logic and caches away the components and depth.
+	bool ok = instance->getClipPreferences();
+	if (!ok) {
+		return;
+	}
+
+	stat = instance->beginRenderAction(0, numFramesToRender,
+		1.0, false, renderScale, true,
+		interactive);
+	if (stat != kOfxStatOK && stat != kOfxStatReplyDefault) {
+		return;
+	}
+
+#ifdef OFX_SUPPORTS_OPENGLRENDER
+	if (use_opengl) {
+		instance->contextAttachedAction();
+		AttachOutputTexture(destination);
+	}
+#endif
 	// get the RoI for each input clip
 	// the regions of interest for each input clip are returned in a std::map
 	// on a real host, these will be the regions of each input clip that the

app/render/plugin/pluginrenderer.h

@@ -44,8 +44,7 @@ public:
 	virtual ~PluginRenderer() override{};
 	void AttachOutputTexture(olive::Texture *texture);
 	void DetachOutputTexture();
-protected:
-	virtual void RenderPlugin(TexturePtr src, olive::plugin::PluginJob& job,
+	void RenderPlugin(TexturePtr src, olive::plugin::PluginJob& job,
 					  olive::Texture *destination,
 					  olive::VideoParams destination_params,
 					  bool clear_destination, bool interactive);

app/render/previewautocacher.cpp

@@ -393,8 +393,9 @@ void PreviewAutoCacher::StartCachingAudioRange(ViewerOutput *context,
 	cache->ClearRequestRange(range);
 
 	pending_audio_jobs_.push_back({ node, context, cache, range });
-	audio_cache_data_[cache].job_tracker.insert(range,
-												copier_->GetGraphChangeTime());
+	AudioCacheData &data = audio_cache_data_[cache];
+	data.context = context;
+	data.job_tracker.insert(range, copier_->GetGraphChangeTime());
 	TryRender();
 }
 
@@ -675,6 +676,15 @@ RenderTicketPtr PreviewAutoCacher::RenderAudio(Node *node,
 	running_audio_tasks_.append(watcher);
 
 	AudioParams p = context->GetAudioParams();
+	const bool invalid_params =
+		(p.sample_rate() <= 0 || p.channel_count() <= 0);
+	if (invalid_params) {
+		AudioParams fallback(
+			OLIVE_CONFIG("DefaultSequenceAudioFrequency").toInt(),
+			OLIVE_CONFIG("DefaultSequenceAudioLayout").toULongLong(),
+			ViewerOutput::kDefaultSampleFormat);
+		p = fallback;
+	}
 	p.set_format(ViewerOutput::kDefaultSampleFormat);
 
 	RenderManager::RenderAudioParams rap(node, r, p, RenderMode::kOffline);
@@ -692,13 +702,17 @@ void PreviewAutoCacher::ConformFinished()
 	// Got an audio conform, requeue all the audio currently needing a conform
 	last_conform_task_.Acquire();
 
-	qDebug() << "CONFORM RESPONSE TEMPORARILY DISABLED";
-	/*for (auto it=audio_cache_data_.begin(); it!=audio_cache_data_.end(); it++) {
-    foreach (const TimeRange &range, it.value().needs_conform) {
-      it.key()->Request(range);
-    }
-    it.value().needs_conform.clear();
-  }*/
+	for (auto it = audio_cache_data_.begin(); it != audio_cache_data_.end();
+		 it++) {
+		if (!it.key() || !it.value().context) {
+			continue;
+		}
+
+		for (const TimeRange &range : it.value().needs_conform) {
+			it.key()->Request(it.value().context, range);
+		}
+		it.value().needs_conform.clear();
+	}
 }
 
 void PreviewAutoCacher::CacheProxyTaskCancelled()

app/render/previewautocacher.h

@@ -186,6 +186,7 @@ private:
 	struct AudioCacheData {
 		RenderJobTracker job_tracker;
 		TimeRangeList needs_conform;
+		ViewerOutput *context = nullptr;
 	};
 
 	std::list<VideoJob> pending_video_jobs_;

app/render/renderprocessor.cpp

@@ -28,6 +28,8 @@
 #include "node/block/transition/transition.h"
 #include "node/project.h"
 #include "rendermanager.h"
+#include "render/opengl/openglrenderer.h"
+#include "render/plugin/pluginrenderer.h"
 #include "pluginSupport/OliveClip.h"
 #include "pluginSupport/OliveHost.h"
 
@@ -606,6 +608,44 @@ void RenderProcessor::ProcessFrameGeneration(TexturePtr destination,
 	destination->Upload(frame->data(), frame->linesize_pixels());
 }
 
+TexturePtr RenderProcessor::ProcessPluginJob(TexturePtr texture,
+											 TexturePtr destination,
+											 const Node *node)
+{
+	(void)node;
+
+	if (!render_ctx_ || !texture || !destination) {
+		return destination;
+	}
+
+	auto *plugin_job =
+		dynamic_cast<plugin::PluginJob *>(texture->job());
+	if (!plugin_job) {
+		return destination;
+	}
+
+	if (!plugin_renderer_) {
+		auto *gl = dynamic_cast<OpenGLRenderer *>(render_ctx_);
+		if (!gl || !gl->context()) {
+			return destination;
+		}
+
+		plugin_renderer_ = std::make_unique<plugin::PluginRenderer>();
+		plugin_renderer_->Init(gl->context());
+		plugin_renderer_->PostInit();
+	}
+
+	plugin_renderer_->RenderPlugin(
+		texture,
+		*plugin_job,
+		destination.get(),
+		destination->params(),
+		true,
+		false);
+
+	return destination;
+}
+
 TexturePtr RenderProcessor::ProcessVideoCacheJob(const CacheJob *val)
 {
 	FramePtr frame = FrameHashCache::LoadCacheFrame(val->GetFilename());

app/render/renderprocessor.h

@@ -20,6 +20,7 @@
 #define RENDERPROCESSOR_H
 
 #include "node/block/clip/clip.h"
+#include <memory>
 #include "node/traverser.h"
 #include "render/renderer.h"
 #include "rendercache.h"
@@ -28,6 +29,10 @@
 namespace olive
 {
 
+namespace plugin {
+class PluginRenderer;
+}
+
 class RenderProcessor : public NodeTraverser {
 public:
 	virtual NodeValueDatabase GenerateDatabase(const Node *node,
@@ -66,6 +71,10 @@ protected:
 										const Node *node,
 										const GenerateJob *job) override;
 
+	virtual TexturePtr ProcessPluginJob(TexturePtr texture,
+										TexturePtr destination,
+										const Node *node) override;
+
 	virtual TexturePtr ProcessVideoCacheJob(const CacheJob *val) override;
 
 	virtual TexturePtr CreateTexture(const VideoParams &p) override;
@@ -100,6 +109,8 @@ private:
 
 	Renderer *render_ctx_;
 
+	std::unique_ptr<olive::plugin::PluginRenderer> plugin_renderer_;
+
 	DecoderCache *decoder_cache_;
 
 	ShaderCache *shader_cache_;