added some basic timeline functionality

This commit is contained in:
itsmattkc
2019-08-12 23:24:58 +10:00
parent 3eee9893f8
commit e9702aeb52
14 changed files with 264 additions and 59 deletions
+3 -1
View File
@@ -9,7 +9,9 @@ ColorService::ColorService()
void ColorService::ConvertFrame(FramePtr f)
{
OCIO::ConstConfigRcPtr config = OCIO::GetCurrentConfig();
OCIO::ConstConfigRcPtr config = OCIO::Config::CreateFromFile("/run/media/matt/Home/OpenColorIO/ocio.configs.0.7v4/nuke-default/config.ocio");
// OCIO::ConstConfigRcPtr config = OCIO::GetCurrentConfig();
OCIO::ConstProcessorRcPtr processor = config->getProcessor("srgb",
OCIO::ROLE_SCENE_LINEAR);
+2 -2
View File
@@ -26,8 +26,6 @@
const int kRGBAChannels = 4;
PixelService olive::pixel_service;
PixelService::PixelService()
{
}
@@ -98,6 +96,8 @@ FramePtr PixelService::ConvertPixelFormat(FramePtr frame, const olive::PixelForm
return frame;
}
// FIXME: It'd be nice if this was multithreaded soon
FramePtr converted = std::make_shared<Frame>();
// Copy parameters