diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-03-06 15:27:16 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-03-06 15:32:45 +0400 |
commit | 4ce7d5cb79e23c4b28b1f1afe11fa066f3a5ea9c (patch) | |
tree | 973e72317b1f1af5f508b6ca82a8eca9dab8bac8 /source/blender/blenkernel/intern/movieclip.c | |
parent | 68ef6797b2fc2d2e37f59f6aae0d57b4ce8cc4bc (diff) |
Fixes for proxies color space
Basically proxy colorspace didn't work well enough.
It is still a bit weird and mainly:
- Proxies for image sequences are built in the image color space.
- Proxies for movies are built in the movie color space.
This could be unified but would need some work in proxy build
to make it not just pipe frames from one FFmpeg context to
another but also apply OCIO on it.
Diffstat (limited to 'source/blender/blenkernel/intern/movieclip.c')
-rw-r--r-- | source/blender/blenkernel/intern/movieclip.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/movieclip.c b/source/blender/blenkernel/intern/movieclip.c index 39c3b96f66e..a41b47809eb 100644 --- a/source/blender/blenkernel/intern/movieclip.c +++ b/source/blender/blenkernel/intern/movieclip.c @@ -214,8 +214,17 @@ static ImBuf *movieclip_load_sequence_file(MovieClip *clip, MovieClipUser *user, int undistort = user->render_flag & MCLIP_PROXY_RENDER_UNDISTORT; get_proxy_fname(clip, user->render_size, undistort, framenr, name); - /* proxies were built using default color space settings */ - colorspace = NULL; + /* Well, this is a bit weird, but proxies for movie sources + * are built in the same exact color space as the input, + * + * But image sequences are built in the display space. + */ + if (clip->source == MCLIP_SRC_MOVIE) { + colorspace = clip->colorspace_settings.name; + } + else { + colorspace = NULL; + } } else { get_sequence_fname(clip, framenr, name); |