Commit Graph

448 Commits

Author SHA1 Message Date
f70d2c65d8 rename api functions...
- minf, maxf, mini, maxi --> min_ff, max_ff, min_ii, max_ii
2012-10-23 13:28:22 +00:00
f3ece5a108 style cleanup: trailing tabs & expand some non prefix tabs into spaces. 2012-10-21 05:46:41 +00:00
2fd2775350 fix for crash in the sequencer if the video file fails to load (missing NULL check on imbuf),
all other uses of sequencer_imbuf_assign_spaces() check for NULL or assume IMB_allocImBuf() succeeds.
2012-10-08 02:20:47 +00:00
63840fd505 Fix #32755: Stripes in Metastrip can not be moved on other channel with mouse (grab tool)
The issue was caused by SEQ_BEGIN macro modifying sequence's depth
which ruined transformation routines. Used own DFS instead which
doesn't modify sequences.

Also corrected some typos in api and comments.
2012-10-04 18:30:28 +00:00
d8144ef0f5 style cleanup: comment blocks 2012-10-04 13:26:15 +00:00
6db84f85dc Fix #32091: Crop and offset coordinates changes proxy render settings on image strips
Made offset and crop working in final resolution space, meaning that visual result
would be the same when using different proxy resolution in sequencer preview and
different resolution percentage when rendering.

It could break some files designed to with render percentage not equal to 100%
using wrong image crop and offset values. But this would also make it easier to
setup scene and render it with different percentage (useful for preview renders
for example)
2012-09-26 10:39:36 +00:00
456a78961c code cleanup: make naming more consistent 2012-09-25 10:21:51 +00:00
bf41aa0168 - Corrected movie clip length computation
- Ignore clip's offset for movie clip sequencer strip
2012-09-24 15:27:04 +00:00
81dc928e50 Sequencer: movie clip float buffers should be converted to internal sequencer space 2012-09-24 15:26:59 +00:00
b4ccf4562c Fix crash on sequencer when movie clip fails to load frame 2012-09-24 14:48:24 +00:00
a73dd3476e Color Management, Stage 2: Switch color pipeline to use OpenColorIO
Replace old color pipeline which was supporting linear/sRGB color spaces
only with OpenColorIO-based pipeline.

This introduces two configurable color spaces:

- Input color space for images and movie clips. This space is used to convert
  images/movies from color space in which file is saved to Blender's linear
  space (for float images, byte images are not internally converted, only input
  space is stored for such images and used later).

  This setting could be found in image/clip data block settings.

- Display color space which defines space in which particular display is working.

  This settings could be found in scene's Color Management panel.

When render result is being displayed on the screen, apart from converting image
to display space, some additional conversions could happen.

This conversions are:

- View, which defines tone curve applying before display transformation.
  These are different ways to view the image on the same display device.
  For example it could be used to emulate film view on sRGB display.

- Exposure affects on image exposure before tone map is applied.

- Gamma is post-display gamma correction, could be used to match particular
  display gamma.

- RGB curves are user-defined curves which are applying before display
  transformation, could be used for different purposes.

All this settings by default are only applying on render result and does not
affect on other images. If some particular image needs to be affected by this
transformation, "View as Render" setting of image data block should be set to
truth. Movie clips are always affected by all display transformations.

This commit also introduces configurable color space in which sequencer is
working. This setting could be found in scene's Color Management panel and
it should be used if such stuff as grading needs to be done in color space
different from sRGB (i.e. when Film view on sRGB display is use, using VD16
space as sequencer's internal space would make grading working in space
which is close to the space using for display).

Some technical notes:

- Image buffer's float buffer is now always in linear space, even if it was
  created from 16bit byte images.

- Space of byte buffer is stored in image buffer's rect_colorspace property.

- Profile of image buffer was removed since it's not longer meaningful.

- OpenGL and GLSL is supposed to always work in sRGB space. It is possible
  to support other spaces, but it's quite large project which isn't so
  much important.

- Legacy Color Management option disabled is emulated by using None display.
  It could have some regressions, but there's no clear way to avoid them.

- If OpenColorIO is disabled on build time, it should make blender behaving
  in the same way as previous release with color management enabled.

More details could be found at this page (more details would be added soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.64/Color_Management

--
Thanks to Xavier Thomas, Lukas Toene for initial work on OpenColorIO
integration and to Brecht van Lommel for some further development and code/
usecase review!
2012-09-15 10:05:07 +00:00
cd4ffe496a Sequencer: clear cache and animation buffers for strips outside of cursor when rendering
This avoids having bunch of cached images when doing animation rendering,
keeping all the memory available for rendered itself.

This keeps memory usage low when rendering huge edits with mixed
scenes and movie strips.

This should not affect on sped of video encoding, which was confirmed by
some own tests.

--
svn merge -r50051:50052 ^/branches/soc-2011-tomato
2012-09-14 14:28:24 +00:00
883117077b fix for 2 crashes freeing masks
- freeing a mask from RNA BKE_libblock_free() twice on the mask.
- loading a new blend file would only free the mask and not unlink it from nodes - it would access freed memory.
2012-09-14 01:15:08 +00:00
c3b808721b Sequencer: add missed cache invalidation
Invalidation was missed for:

- Strip (Un)Muting
- Changing speed effect
- Strip translating
2012-09-13 10:51:18 +00:00
6f0cbd787d make freeing sequencer strip without cache an option only exposed within sequencer.c 2012-09-06 09:23:38 +00:00
3bb17bd64a fix for crash in sequencer introduced with recent cache addition,
- running undo with metastrips would crash immediately.
- freeing a strip without a scene would crash (clipboard does this).
2012-09-06 04:45:25 +00:00
122cb86d15 Sequencer: remove strip's color balance in favor of modifiers
Having two ways to control color balance now seems a bit overkill
and not clear.

Removed old Color Balance settings from the interface and logic,
added versioning code to convert this settings to modifier.

Unfortunately, since color balance was a pointer, it's not actually
possible to preserve compatibility of old files saved in new
blender and opened back in old blender.

Hopefully there's no regressions :)
2012-09-04 13:37:53 +00:00
aaafa0c2fe code cleanup: move file string defines into BLI_path_utils.h, BKE_utildefines is now unused but keep incase we want to add defines there later. 2012-09-03 22:04:14 +00:00
d6a92c9c31 Sequencer: proper cache invalidation when deleting sequences
Solves issue with effects not being recalculated when deleting their input.
2012-08-27 09:01:36 +00:00
699b23ecdb fix for type mismatch with SWAP() macro. 2012-08-25 19:43:15 +00:00
0fbd15df0f Sequencer: fix for incorrect proxies rendering after some recent refactor 2012-08-22 13:45:20 +00:00
ad647b2767 Sequencer: skip adding ImBuf to cache when it failed to render 2012-08-20 10:56:19 +00:00
0ae7286891 Sequencer: Python API for sequence modifiers 2012-08-20 10:15:32 +00:00
995a19a983 Sequencer: per-sequence modifier stack for color grading
This implements basic color grading modifiers in sequencer, supporting
color balance, RGB curves and HUE corrections.

Implementation is close to object modifiers, some details are there:

http://wiki.blender.org/index.php/User:Nazg-gul/SequencerModifiers

Modifiers supports multi-threaded calculation, masks and instant
parameter changes.

Also added cache for pre-processed image buffers for current frame,
so changing sequence properties does not require rendering of original
sequence (like rendering scene, loading file from disk and so)
2012-08-19 15:41:56 +00:00
7e2f557dba Typo fix: BKE_sequwnce_get_by_name -> BKE_sequence_get_by_name 2012-08-18 05:49:55 +00:00
c0539d267d draw ugly red bands on a sequence strip when its data cant be found (mask, clip, scene, sound) 2012-08-13 17:36:29 +00:00
be513d1b15 fix for missing NULL checks when sequence-strip pointers become NULL because of problems with library linking. 2012-08-13 17:25:03 +00:00
38541284c5 Resolve issues with color balance not updating properly in sequencer
when float images are used.
2012-08-12 18:38:01 +00:00
667e7ab348 Correction to one of previous commits 2012-08-12 18:24:01 +00:00
82688e61fc Sequencer: free cache used by sequence when removing strip
Before this removing and adding new strip could have been lead
into situations when new sequence would use old cache.
2012-08-12 13:29:57 +00:00
a794e19346 Sequencer: support for masked color balance
This implements option which could be used to color balance only
specified area. Currently done by adding Mask input to Adjustment
effect. Affects on color balance and multiply settings.

Supporting masked saturation control is in the list, not supported
in this commit.

Also show value slider in the right of color wheel.
2012-08-11 14:37:58 +00:00
0682c3f1ae Code cleanup and minor change to CMake's colalda detection to make
it detect directory structure used for libs in our svn (<root>/include/<component>/include)
2012-08-11 10:32:27 +00:00
fea0e60227 Fix building with audaspace disabled 2012-08-10 12:56:09 +00:00
f0951f58ca code cleanup: rename G.afbreek --> is_break, G.rendering --> is_rendering 2012-08-08 18:37:06 +00:00
748228d223 Sequencer: corrections to sequence cache invalidation 2012-08-08 16:46:47 +00:00
7483429e62 Sequencer: initial implementation of multithreaded effects
Added a framework to run effects in several threads. Port most
of effects to this new framework.

Still some work to be done here (some effects are not so easy to port)
2012-08-08 16:46:45 +00:00
e4b494ac3b Sequencer: do not invalidate sequences which are not blending with bottom machines 2012-08-08 16:46:43 +00:00
af81d7a4f1 Style cleanup: whitespace 2012-08-08 16:46:42 +00:00
a0a67d2984 Sequencer: initial support of refreshing only changed sequences
Before this the the whole sequencer cache would be invalidated
when hanging sequence settings.

This was completely annoying because changing color balance
settings would re-load image file for which color balance
is happening on every change,

In fact it's still an issue if color balance is changing for
image strip itself, but if this strip has got effect and
color balance is changing for it file wouldn't be reloaded.
2012-08-08 16:46:40 +00:00
572c82e74e Code cleanup: make some more functions more meaningful name 2012-08-08 11:56:58 +00:00
1bf893e9c8 Code cleanup: BKE_ prefix for public sequencer functions 2012-08-08 11:15:40 +00:00
03a3e4f165 Code cleanup: remove redundant struct and some space cleanup 2012-08-08 11:15:38 +00:00
2457e89481 Code cleanup: remove unused functions
The code would be in SVN anyway and having bunch of unused code
doesn't seems to be logical.
2012-08-08 11:15:36 +00:00
0b31218c85 Style cleanup: white space 2012-08-08 11:15:36 +00:00
1cdc39f49b Code cleanup: mark functions as static, ifdef 0 some unused functions 2012-08-08 11:15:32 +00:00
6cf1a9834b Made image buffer threaded processor generic function,
so color management could use the same routines.

Should be no functional changes.
2012-08-07 16:47:46 +00:00
95465e7a28 Made color balance in sequencer multi-threaded
Should give some more realtime update, but it's currently not the
biggest issue - changing color balance settings would imply reloading
of file which is slow. Would be investigated further.

This change shouldn't affect on pre-fetching job which is already
multi-threaded and doing threaded color balance would make things
only worse.
2012-08-07 16:09:42 +00:00
0a35e050f3 code cleanup: remove redundant calls to CTX_data_main() 2012-08-05 14:11:51 +00:00
9ff4fa6671 style cleanup 2012-08-04 12:30:16 +00:00
2e51811950 use the same rasterizer as the compositor for the sequencer. 2012-07-31 15:45:01 +00:00