Sergey Sharybin
a73dd3476e
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!
152 lines
4.4 KiB
C++
152 lines
4.4 KiB
C++
/*
|
|
* ***** BEGIN GPL LICENSE BLOCK *****
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*
|
|
* The Original Code is Copyright (C) 2006 Blender Foundation.
|
|
* All rights reserved.
|
|
*
|
|
* The Original Code is: all of this file.
|
|
*
|
|
* Contributor(s): none yet.
|
|
*
|
|
* ***** END GPL LICENSE BLOCK *****
|
|
*/
|
|
|
|
#ifndef __BLI_THREADS_H__
|
|
#define __BLI_THREADS_H__
|
|
|
|
/** \file BLI_threads.h
|
|
* \ingroup bli
|
|
*/
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
#include <pthread.h>
|
|
|
|
/* for tables, button in UI, etc */
|
|
#define BLENDER_MAX_THREADS 64
|
|
|
|
struct ListBase;
|
|
|
|
/* Threading API */
|
|
|
|
/*this is run once at startup*/
|
|
void BLI_threadapi_init(void);
|
|
|
|
void BLI_init_threads(struct ListBase *threadbase, void *(*do_thread)(void *), int tot);
|
|
int BLI_available_threads(struct ListBase *threadbase);
|
|
int BLI_available_thread_index(struct ListBase *threadbase);
|
|
void BLI_insert_thread(struct ListBase *threadbase, void *callerdata);
|
|
void BLI_remove_thread(struct ListBase *threadbase, void *callerdata);
|
|
void BLI_remove_thread_index(struct ListBase *threadbase, int index);
|
|
void BLI_remove_threads(struct ListBase *threadbase);
|
|
void BLI_end_threads(struct ListBase *threadbase);
|
|
int BLI_thread_is_main(void);
|
|
|
|
|
|
void BLI_begin_threaded_malloc(void);
|
|
void BLI_end_threaded_malloc(void);
|
|
|
|
/* System Information */
|
|
|
|
int BLI_system_thread_count(void); /* gets the number of threads the system can make use of */
|
|
|
|
/* Global Mutex Locks
|
|
*
|
|
* One custom lock available now. can be extended. */
|
|
|
|
#define LOCK_IMAGE 0
|
|
#define LOCK_DRAW_IMAGE 1
|
|
#define LOCK_VIEWER 2
|
|
#define LOCK_CUSTOM1 3
|
|
#define LOCK_RCACHE 4
|
|
#define LOCK_OPENGL 5
|
|
#define LOCK_NODES 6
|
|
#define LOCK_MOVIECLIP 7
|
|
#define LOCK_COLORMANAGE 8
|
|
|
|
void BLI_lock_thread(int type);
|
|
void BLI_unlock_thread(int type);
|
|
|
|
/* Mutex Lock */
|
|
|
|
typedef pthread_mutex_t ThreadMutex;
|
|
#define BLI_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER
|
|
|
|
void BLI_mutex_init(ThreadMutex *mutex);
|
|
void BLI_mutex_lock(ThreadMutex *mutex);
|
|
void BLI_mutex_unlock(ThreadMutex *mutex);
|
|
void BLI_mutex_end(ThreadMutex *mutex);
|
|
|
|
/* Read/Write Mutex Lock */
|
|
|
|
#define THREAD_LOCK_READ 1
|
|
#define THREAD_LOCK_WRITE 2
|
|
|
|
typedef pthread_rwlock_t ThreadRWMutex;
|
|
|
|
void BLI_rw_mutex_init(ThreadRWMutex *mutex);
|
|
void BLI_rw_mutex_lock(ThreadRWMutex *mutex, int mode);
|
|
void BLI_rw_mutex_unlock(ThreadRWMutex *mutex);
|
|
void BLI_rw_mutex_end(ThreadRWMutex *mutex);
|
|
|
|
/* ThreadedWorker
|
|
*
|
|
* A simple tool for dispatching work to a limited number of threads
|
|
* in a transparent fashion from the caller's perspective. */
|
|
|
|
struct ThreadedWorker;
|
|
|
|
/* Create a new worker supporting tot parallel threads.
|
|
* When new work in inserted and all threads are busy, sleep(sleep_time) before checking again
|
|
*/
|
|
struct ThreadedWorker *BLI_create_worker(void *(*do_thread)(void *), int tot, int sleep_time);
|
|
|
|
/* join all working threads */
|
|
void BLI_end_worker(struct ThreadedWorker *worker);
|
|
|
|
/* also ends all working threads */
|
|
void BLI_destroy_worker(struct ThreadedWorker *worker);
|
|
|
|
/* Spawns a new work thread if possible, sleeps until one is available otherwise
|
|
* NOTE: inserting work is NOT thread safe, so make sure it is only done from one thread */
|
|
void BLI_insert_work(struct ThreadedWorker *worker, void *param);
|
|
|
|
/* ThreadWorkQueue
|
|
*
|
|
* Thread-safe work queue to push work/pointers between threads. */
|
|
|
|
typedef struct ThreadQueue ThreadQueue;
|
|
|
|
ThreadQueue *BLI_thread_queue_init(void);
|
|
void BLI_thread_queue_free(ThreadQueue *queue);
|
|
|
|
void BLI_thread_queue_push(ThreadQueue *queue, void *work);
|
|
void *BLI_thread_queue_pop(ThreadQueue *queue);
|
|
void *BLI_thread_queue_pop_timeout(ThreadQueue *queue, int ms);
|
|
int BLI_thread_queue_size(ThreadQueue *queue);
|
|
|
|
void BLI_thread_queue_wait_finish(ThreadQueue *queue);
|
|
void BLI_thread_queue_nowait(ThreadQueue *queue);
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif
|
|
|