Merge branch 'master' into cache-update

2022-07-01 22:32:49 -05:00
parent e97c74fd2c 8ff3544cb3
commit 7e1792cfea
98 changed files with 1638 additions and 1480 deletions
@@ -25,7 +25,7 @@
 #include "node/traverser.h"
 #include "render/renderer.h"
 #include "rendercache.h"
-#include "threading/threadticket.h"
+#include "renderticket.h"

 namespace olive {

@@ -58,10 +58,7 @@ protected:

  virtual TexturePtr ProcessVideoCacheJob(const CacheJob &val) override;

-  virtual TexturePtr CreateTexture(const VideoParams &p) override
-  {
-    return render_ctx_->CreateTexture(p);
-  }
+  virtual TexturePtr CreateTexture(const VideoParams &p) override;

  virtual SampleBuffer CreateSampleBuffer(const AudioParams &params, int sample_count) override
  {