archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Rename extern rendering and proxy functions

Browse Source 
Replace BKE_sequencer wirh SEQ_render or SEQ_proxy prefixes.
In cases where function is very generic, only SEQ prefix is used.

Reviewed By: sergey

Differential Revision: https://developer.blender.org/D9439
This commit is contained in:
Richard Antalik
2020-11-05 14:05:25 +01:00
parent 0f43fe7fa6
commit 2a6a26bbd7
16 changed files with 134 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/sequencer/intern/effects.c
View File

@@ -3906,7 +3906,7 @@ static ImBuf *do_text_effect(const SeqRenderData *context,
/* Compensate text size for preview render size. */
proxy_size_comp = context->scene->r.size / 100.0;
if (context->preview_render_size != SEQ_RENDER_SIZE_SCENE) {
proxy_size_comp *= BKE_sequencer_rendersize_to_scale_factor(context->preview_render_size);
proxy_size_comp *= SEQ_rendersize_to_scale_factor(context->preview_render_size);
}
/* set before return */

2
source/blender/sequencer/intern/modifier.c
View File

@@ -1415,7 +1415,7 @@ ImBuf *BKE_sequence_modifier_apply_stack(const SeqRenderData *context,
if (seq->modifiers.first && (seq->flag & SEQ_USE_LINEAR_MODIFIERS)) {
processed_ibuf = IMB_dupImBuf(ibuf);
BKE_sequencer_imbuf_from_sequencer_space(context->scene, processed_ibuf);
SEQ_render_imbuf_from_sequencer_space(context->scene, processed_ibuf);
}
for (smd = seq->modifiers.first; smd; smd = smd->next) {

34
source/blender/sequencer/intern/prefetch.c
View File

@@ -287,25 +287,25 @@ static void seq_prefetch_update_context(const SeqRenderData *context)
PrefetchJob *pfjob;
pfjob = seq_prefetch_job_get(context->scene);
BKE_sequencer_new_render_data(pfjob->bmain_eval,
pfjob->depsgraph,
pfjob->scene_eval,
context->rectx,
context->recty,
context->preview_render_size,
false,
&pfjob->context_cpy);
SEQ_render_new_render_data(pfjob->bmain_eval,
pfjob->depsgraph,
pfjob->scene_eval,
context->rectx,
context->recty,
context->preview_render_size,
false,
&pfjob->context_cpy);
pfjob->context_cpy.is_prefetch_render = true;
pfjob->context_cpy.task_id = SEQ_TASK_PREFETCH_RENDER;
BKE_sequencer_new_render_data(pfjob->bmain,
pfjob->depsgraph,
pfjob->scene,
context->rectx,
context->recty,
context->preview_render_size,
false,
&pfjob->context);
SEQ_render_new_render_data(pfjob->bmain,
pfjob->depsgraph,
pfjob->scene,
context->rectx,
context->recty,
context->preview_render_size,
false,
&pfjob->context);
pfjob->context.is_prefetch_render = false;
/* Same ID as prefetch context, because context will be swapped, but we still
@@ -461,7 +461,7 @@ static void *seq_prefetch_frames(void *job)
continue;
}
ImBuf *ibuf = BKE_sequencer_give_ibuf(&pfjob->context_cpy, seq_prefetch_cfra(pfjob), 0);
ImBuf *ibuf = SEQ_render_give_ibuf(&pfjob->context_cpy, seq_prefetch_cfra(pfjob), 0);
BKE_sequencer_cache_free_temp_cache(
pfjob->scene, pfjob->context.task_id, seq_prefetch_cfra(pfjob));
IMB_freeImBuf(ibuf);

46
source/blender/sequencer/intern/proxy.c
View File

@@ -90,7 +90,7 @@ int SEQ_rendersize_to_proxysize(int render_size)
return IMB_PROXY_NONE;
}
double BKE_sequencer_rendersize_to_scale_factor(int render_size)
double SEQ_rendersize_to_scale_factor(int render_size)
{
switch (render_size) {
case SEQ_RENDER_SIZE_PROXY_25:
@@ -179,14 +179,14 @@ static bool seq_proxy_get_fname(Editing *ed,
}
/* Proxy size number to be used in path. */
int proxy_size_number = BKE_sequencer_rendersize_to_scale_factor(render_size) * 100;
int proxy_size_number = SEQ_rendersize_to_scale_factor(render_size) * 100;
BLI_snprintf(name,
PROXY_MAXFILE,
"%s/images/%d/%s_proxy%s",
dir,
proxy_size_number,
BKE_sequencer_give_stripelem(seq, cfra)->name,
SEQ_render_give_stripelem(seq, cfra)->name,
suffix);
BLI_path_abs(name, BKE_main_blendfile_path_from_global());
strcat(name, ".jpg");
@@ -390,12 +390,12 @@ static int seq_proxy_context_count(Sequence *seq, Scene *scene)
return num_views;
}
bool BKE_sequencer_proxy_rebuild_context(Main *bmain,
Depsgraph *depsgraph,
Scene *scene,
Sequence *seq,
struct GSet *file_list,
ListBase *queue)
bool SEQ_proxy_rebuild_context(Main *bmain,
Depsgraph *depsgraph,
Scene *scene,
Sequence *seq,
struct GSet *file_list,
ListBase *queue)
{
SeqIndexBuildContext *context;
Sequence *nseq;
@@ -461,10 +461,10 @@ bool BKE_sequencer_proxy_rebuild_context(Main *bmain,
return true;
}
void BKE_sequencer_proxy_rebuild(SeqIndexBuildContext *context,
short *stop,
short *do_update,
float *progress)
void SEQ_proxy_rebuild(SeqIndexBuildContext *context,
short *stop,
short *do_update,
float *progress)
{
const bool overwrite = context->overwrite;
SeqRenderData render_context;
@@ -492,14 +492,14 @@ void BKE_sequencer_proxy_rebuild(SeqIndexBuildContext *context,
/* fail safe code */
BKE_sequencer_new_render_data(bmain,
context->depsgraph,
context->scene,
roundf((scene->r.size * (float)scene->r.xsch) / 100.0f),
roundf((scene->r.size * (float)scene->r.ysch) / 100.0f),
100,
false,
&render_context);
SEQ_render_new_render_data(bmain,
context->depsgraph,
context->scene,
roundf((scene->r.size * (float)scene->r.xsch) / 100.0f),
roundf((scene->r.size * (float)scene->r.ysch) / 100.0f),
100,
false,
&render_context);
render_context.skip_cache = true;
render_context.is_proxy_render = true;
@@ -532,7 +532,7 @@ void BKE_sequencer_proxy_rebuild(SeqIndexBuildContext *context,
}
}
void BKE_sequencer_proxy_rebuild_finish(SeqIndexBuildContext *context, bool stop)
void SEQ_proxy_rebuild_finish(SeqIndexBuildContext *context, bool stop)
{
if (context->index_context) {
StripAnim *sanim;
@@ -553,7 +553,7 @@ void BKE_sequencer_proxy_rebuild_finish(SeqIndexBuildContext *context, bool stop
MEM_freeN(context);
}
void BKE_sequencer_proxy_set(struct Sequence *seq, bool value)
void SEQ_proxy_set(struct Sequence *seq, bool value)
{
if (value) {
seq->flag |= SEQ_USE_PROXY;

34
source/blender/sequencer/intern/render.c
View File

@@ -161,7 +161,7 @@ void seq_imbuf_to_sequencer_space(Scene *scene, ImBuf *ibuf, bool make_float)
seq_imbuf_assign_spaces(scene, ibuf);
}
void BKE_sequencer_imbuf_from_sequencer_space(Scene *scene, ImBuf *ibuf)
void SEQ_render_imbuf_from_sequencer_space(Scene *scene, ImBuf *ibuf)
{
const char *from_colorspace = scene->sequencer_colorspace_settings.name;
const char *to_colorspace = IMB_colormanagement_role_colorspace_name_get(
@@ -178,7 +178,7 @@ void BKE_sequencer_imbuf_from_sequencer_space(Scene *scene, ImBuf *ibuf)
}
}
void BKE_sequencer_pixel_from_sequencer_space_v4(struct Scene *scene, float pixel[4])
void SEQ_render_pixel_from_sequencer_space_v4(struct Scene *scene, float pixel[4])
{
const char *from_colorspace = scene->sequencer_colorspace_settings.name;
const char *to_colorspace = IMB_colormanagement_role_colorspace_name_get(
@@ -193,7 +193,7 @@ void BKE_sequencer_pixel_from_sequencer_space_v4(struct Scene *scene, float pixe
}
}
void BKE_sequence_init_colorspace(Sequence *seq)
void SEQ_render_init_colorspace(Sequence *seq)
{
if (seq->strip && seq->strip->stripdata) {
char name[FILE_MAX];
@@ -226,14 +226,14 @@ void BKE_sequence_init_colorspace(Sequence *seq)
/* -------------------------------------------------------------------- */
/** \name Rendering utility functions
* \{ */
void BKE_sequencer_new_render_data(Main *bmain,
struct Depsgraph *depsgraph,
Scene *scene,
int rectx,
int recty,
int preview_render_size,
int for_render,
SeqRenderData *r_context)
void SEQ_render_new_render_data(Main *bmain,
struct Depsgraph *depsgraph,
Scene *scene,
int rectx,
int recty,
int preview_render_size,
int for_render,
SeqRenderData *r_context)
{
r_context->bmain = bmain;
r_context->depsgraph = depsgraph;
@@ -306,7 +306,7 @@ float seq_give_stripelem_index(Sequence *seq, float cfra)
return nr;
}
StripElem *BKE_sequencer_give_stripelem(Sequence *seq, int cfra)
StripElem *SEQ_render_give_stripelem(Sequence *seq, int cfra)
{
StripElem *se = seq->strip->stripdata;
@@ -378,7 +378,7 @@ static int evaluate_seq_frame_gen(Sequence **seq_arr, ListBase *seqbase, int cfr
return totseq;
}
int BKE_sequencer_evaluate_frame(Scene *scene, int cfra)
int SEQ_render_evaluate_frame(Scene *scene, int cfra)
{
Editing *ed = BKE_sequencer_editing_get(scene, false);
Sequence *seq_arr[MAXSEQ + 1];
@@ -674,7 +674,7 @@ static ImBuf *input_preprocess(const SeqRenderData *context,
preview_scale_factor = (float)scene->r.size / 100;
}
else {
preview_scale_factor = BKE_sequencer_rendersize_to_scale_factor(context->preview_render_size);
preview_scale_factor = SEQ_rendersize_to_scale_factor(context->preview_render_size);
}
if (sequencer_use_crop(seq)) {
@@ -1070,7 +1070,7 @@ static ImBuf *seq_render_image_strip(const SeqRenderData *context,
char prefix[FILE_MAX];
ImBuf *ibuf = NULL;
StripElem *s_elem = BKE_sequencer_give_stripelem(seq, cfra);
StripElem *s_elem = SEQ_render_give_stripelem(seq, cfra);
if (s_elem == NULL) {
return NULL;
}
@@ -2025,7 +2025,7 @@ static ImBuf *seq_render_strip_stack(const SeqRenderData *context,
* you have to free after usage!
*/
ImBuf *BKE_sequencer_give_ibuf(const SeqRenderData *context, float cfra, int chanshown)
ImBuf *SEQ_render_give_ibuf(const SeqRenderData *context, float cfra, int chanshown)
{
Scene *scene = context->scene;
Editing *ed = BKE_sequencer_editing_get(scene, false);
@@ -2094,7 +2094,7 @@ ImBuf *seq_render_give_ibuf_seqbase(const SeqRenderData *context,
return seq_render_strip_stack(context, &state, seqbasep, cfra, chan_shown);
}
ImBuf *BKE_sequencer_give_ibuf_direct(const SeqRenderData *context, float cfra, Sequence *seq)
ImBuf *SEQ_render_give_ibuf_direct(const SeqRenderData *context, float cfra, Sequence *seq)
{
SeqRenderState state;
seq_render_state_init(&state);