diff options
author | Richard Antalik <richardantalik@gmail.com> | 2020-11-05 16:05:25 +0300 |
---|---|---|
committer | Richard Antalik <richardantalik@gmail.com> | 2020-11-05 16:05:25 +0300 |
commit | 2a6a26bbd77071ee475c440f59c1b52b231fad5d (patch) | |
tree | 3e9b6ccdde270e8deaec5e8456b5d647de082267 | |
parent | 0f43fe7fa66b94cf3cb5033223c1d96b89372ecc (diff) |
Rename extern rendering and proxy functions
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
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 2 | ||||
-rw-r--r-- | source/blender/blenloader/intern/versioning_290.c | 6 | ||||
-rw-r--r-- | source/blender/editors/render/render_opengl.c | 18 | ||||
-rw-r--r-- | source/blender/editors/space_sequencer/sequencer_add.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_sequencer/sequencer_draw.c | 8 | ||||
-rw-r--r-- | source/blender/editors/space_sequencer/sequencer_edit.c | 26 | ||||
-rw-r--r-- | source/blender/editors/util/ed_util_imbuf.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_sequencer.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_sequencer_api.c | 4 | ||||
-rw-r--r-- | source/blender/render/intern/source/pipeline.c | 20 | ||||
-rw-r--r-- | source/blender/sequencer/SEQ_sequencer.h | 60 | ||||
-rw-r--r-- | source/blender/sequencer/intern/effects.c | 2 | ||||
-rw-r--r-- | source/blender/sequencer/intern/modifier.c | 2 | ||||
-rw-r--r-- | source/blender/sequencer/intern/prefetch.c | 34 | ||||
-rw-r--r-- | source/blender/sequencer/intern/proxy.c | 46 | ||||
-rw-r--r-- | source/blender/sequencer/intern/render.c | 34 |
16 files changed, 134 insertions, 134 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index c2a18033b44..28d39a35014 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -4393,7 +4393,7 @@ static void direct_link_scene(BlendDataReader *reader, Scene *sce) seq->strip->proxy->anim = NULL; } else if (seq->flag & SEQ_USE_PROXY) { - BKE_sequencer_proxy_set(seq, true); + SEQ_proxy_set(seq, true); } /* need to load color balance to it could be converted to modifier */ diff --git a/source/blender/blenloader/intern/versioning_290.c b/source/blender/blenloader/intern/versioning_290.c index d3d6eeeb3dd..fab4ce6727f 100644 --- a/source/blender/blenloader/intern/versioning_290.c +++ b/source/blender/blenloader/intern/versioning_290.c @@ -105,14 +105,14 @@ static void seq_convert_transform_crop(const Scene *scene, const uint32_t use_transform_flag = (1 << 16); const uint32_t use_crop_flag = (1 << 17); - const StripElem *s_elem = BKE_sequencer_give_stripelem(seq, seq->start); + const StripElem *s_elem = SEQ_render_give_stripelem(seq, seq->start); if (s_elem != NULL) { image_size_x = s_elem->orig_width; image_size_y = s_elem->orig_height; if (SEQ_can_use_proxy(seq, SEQ_rendersize_to_proxysize(render_size))) { - image_size_x /= BKE_sequencer_rendersize_to_scale_factor(render_size); - image_size_y /= BKE_sequencer_rendersize_to_scale_factor(render_size); + image_size_x /= SEQ_rendersize_to_scale_factor(render_size); + image_size_y /= SEQ_rendersize_to_scale_factor(render_size); } } diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c index 5d355ada77c..79eaf007fcb 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -489,19 +489,19 @@ static void screen_opengl_render_apply(const bContext *C, OGLRender *oglrender) SpaceSeq *sseq = oglrender->sseq; int chanshown = sseq ? sseq->chanshown : 0; - BKE_sequencer_new_render_data(oglrender->bmain, - oglrender->depsgraph, - scene, - oglrender->sizex, - oglrender->sizey, - 100, - false, - &context); + SEQ_render_new_render_data(oglrender->bmain, + oglrender->depsgraph, + scene, + oglrender->sizex, + oglrender->sizey, + 100, + false, + &context); for (view_id = 0; view_id < oglrender->views_len; view_id++) { context.view_id = view_id; context.gpu_offscreen = oglrender->ofs; - oglrender->seq_data.ibufs_arr[view_id] = BKE_sequencer_give_ibuf(&context, CFRA, chanshown); + oglrender->seq_data.ibufs_arr[view_id] = SEQ_render_give_ibuf(&context, CFRA, chanshown); } } diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index 7cf5218cfaa..e16004639fe 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -903,7 +903,7 @@ static int sequencer_add_image_strip_exec(bContext *C, wmOperator *op) } } - BKE_sequence_init_colorspace(seq); + SEQ_render_init_colorspace(seq); BKE_sequence_calc_disp(scene, seq); BKE_sequencer_sort(scene); diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index eb35cced95b..c4fd167b0ee 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -1259,13 +1259,13 @@ ImBuf *sequencer_ibuf_get(struct Main *bmain, render_size = scene->r.size / 100.0; } else { - render_size = BKE_sequencer_rendersize_to_scale_factor(sseq->render_size); + render_size = SEQ_rendersize_to_scale_factor(sseq->render_size); } rectx = roundf(render_size * scene->r.xsch); recty = roundf(render_size * scene->r.ysch); - BKE_sequencer_new_render_data( + SEQ_render_new_render_data( bmain, depsgraph, scene, rectx, recty, sseq->render_size, false, &context); context.view_id = BKE_scene_multiview_view_id_get(&scene->r, viewname); @@ -1285,10 +1285,10 @@ ImBuf *sequencer_ibuf_get(struct Main *bmain, } if (special_seq_update) { - ibuf = BKE_sequencer_give_ibuf_direct(&context, cfra + frame_ofs, special_seq_update); + ibuf = SEQ_render_give_ibuf_direct(&context, cfra + frame_ofs, special_seq_update); } else { - ibuf = BKE_sequencer_give_ibuf(&context, cfra + frame_ofs, sseq->chanshown); + ibuf = SEQ_render_give_ibuf(&context, cfra + frame_ofs, sseq->chanshown); } if (viewport) { diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index e405864432a..a3f80e08a11 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -154,7 +154,7 @@ static void proxy_startjob(void *pjv, short *stop, short *do_update, float *prog for (link = pj->queue.first; link; link = link->next) { struct SeqIndexBuildContext *context = link->data; - BKE_sequencer_proxy_rebuild(context, stop, do_update, progress); + SEQ_proxy_rebuild(context, stop, do_update, progress); if (*stop) { pj->stop = 1; @@ -171,7 +171,7 @@ static void proxy_endjob(void *pjv) LinkData *link; for (link = pj->queue.first; link; link = link->next) { - BKE_sequencer_proxy_rebuild_finish(link->data, pj->stop); + SEQ_proxy_rebuild_finish(link->data, pj->stop); } BKE_sequencer_free_imbuf(pj->scene, &ed->seqbase, false); @@ -234,7 +234,7 @@ static void seq_proxy_build_job(const bContext *C, ReportList *reports) continue; } - bool success = BKE_sequencer_proxy_rebuild_context( + bool success = SEQ_proxy_rebuild_context( pj->main, pj->depsgraph, pj->scene, seq, file_list, &pj->queue); if (!success && (seq->strip->proxy->build_flags & SEQ_PROXY_SKIP_EXISTING) != 0) { @@ -1106,7 +1106,7 @@ static int sequencer_gap_remove_exec(bContext *C, wmOperator *op) /* Check if the current frame has a gap already. */ for (cfra = CFRA; cfra >= sfra; cfra--) { - if (BKE_sequencer_evaluate_frame(scene, cfra)) { + if (SEQ_render_evaluate_frame(scene, cfra)) { first = true; break; } @@ -1115,13 +1115,13 @@ static int sequencer_gap_remove_exec(bContext *C, wmOperator *op) for (; cfra < efra; cfra++) { /* There's still no strip to remove a gap for. */ if (first == false) { - if (BKE_sequencer_evaluate_frame(scene, cfra)) { + if (SEQ_render_evaluate_frame(scene, cfra)) { first = true; } } - else if (BKE_sequencer_evaluate_frame(scene, cfra) == 0) { + else if (SEQ_render_evaluate_frame(scene, cfra) == 0) { done = true; - while (BKE_sequencer_evaluate_frame(scene, cfra) == 0) { + while (SEQ_render_evaluate_frame(scene, cfra) == 0) { done = sequence_offset_after_frame(scene, -1, cfra); if (done == false) { break; @@ -2681,7 +2681,7 @@ static int sequencer_separate_images_exec(bContext *C, wmOperator *op) while (cfra < frame_end) { /* New seq. */ - se = BKE_sequencer_give_stripelem(seq, cfra); + se = SEQ_render_give_stripelem(seq, cfra); seq_new = BKE_sequence_dupli_recursive( scene, scene, ed->seqbasep, seq, SEQ_DUPE_UNIQUE_NAME); @@ -3221,7 +3221,7 @@ static int sequencer_rendersize_exec(bContext *C, wmOperator *UNUSED(op)) if (active_seq->strip) { switch (active_seq->type) { case SEQ_TYPE_IMAGE: - se = BKE_sequencer_give_stripelem(active_seq, scene->r.cfra); + se = SEQ_render_give_stripelem(active_seq, scene->r.cfra); break; case SEQ_TYPE_MOVIE: se = active_seq->strip->stripdata; @@ -3505,12 +3505,12 @@ static int sequencer_rebuild_proxy_exec(bContext *C, wmOperator *UNUSED(op)) short stop = 0, do_update; float progress; - BKE_sequencer_proxy_rebuild_context(bmain, depsgraph, scene, seq, file_list, &queue); + SEQ_proxy_rebuild_context(bmain, depsgraph, scene, seq, file_list, &queue); for (link = queue.first; link; link = link->next) { struct SeqIndexBuildContext *context = link->data; - BKE_sequencer_proxy_rebuild(context, &stop, &do_update, &progress); - BKE_sequencer_proxy_rebuild_finish(context, 0); + SEQ_proxy_rebuild(context, &stop, &do_update, &progress); + SEQ_proxy_rebuild_finish(context, 0); } BKE_sequencer_free_imbuf(scene, &ed->seqbase, false); } @@ -3569,7 +3569,7 @@ static int sequencer_enable_proxies_exec(bContext *C, wmOperator *op) SEQ_CURRENT_BEGIN (ed, seq) { if ((seq->flag & SELECT)) { if (ELEM(seq->type, SEQ_TYPE_MOVIE, SEQ_TYPE_IMAGE, SEQ_TYPE_META)) { - BKE_sequencer_proxy_set(seq, turnon); + SEQ_proxy_set(seq, turnon); if (seq->strip->proxy == NULL) { continue; } diff --git a/source/blender/editors/util/ed_util_imbuf.c b/source/blender/editors/util/ed_util_imbuf.c index 9ae5cbbdfe9..b832d9a1d86 100644 --- a/source/blender/editors/util/ed_util_imbuf.c +++ b/source/blender/editors/util/ed_util_imbuf.c @@ -370,7 +370,7 @@ static void sequencer_sample_apply(bContext *C, wmOperator *op, const wmEvent *e /* sequencer's image buffers are in non-linear space, need to make them linear */ copy_v4_v4(info->linearcol, info->colf); - BKE_sequencer_pixel_from_sequencer_space_v4(scene, info->linearcol); + SEQ_render_pixel_from_sequencer_space_v4(scene, info->linearcol); info->color_manage = true; } diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c index eed30b05c82..7f58fb49338 100644 --- a/source/blender/makesrna/intern/rna_sequencer.c +++ b/source/blender/makesrna/intern/rna_sequencer.c @@ -470,7 +470,7 @@ static void rna_Sequence_channel_set(PointerRNA *ptr, int value) static void rna_Sequence_use_proxy_set(PointerRNA *ptr, bool value) { Sequence *seq = (Sequence *)ptr->data; - BKE_sequencer_proxy_set(seq, value != 0); + SEQ_proxy_set(seq, value != 0); } static int transform_seq_cmp_fn(Sequence *seq, void *arg_pt) diff --git a/source/blender/makesrna/intern/rna_sequencer_api.c b/source/blender/makesrna/intern/rna_sequencer_api.c index 1ee84ef080c..9b8386dd1b1 100644 --- a/source/blender/makesrna/intern/rna_sequencer_api.c +++ b/source/blender/makesrna/intern/rna_sequencer_api.c @@ -93,7 +93,7 @@ static Sequence *alloc_generic_sequence( strip->stripdata = se = MEM_callocN(sizeof(StripElem), "stripelem"); BLI_split_dirfile(file, strip->dir, se->name, sizeof(strip->dir), sizeof(se->name)); - BKE_sequence_init_colorspace(seq); + SEQ_render_init_colorspace(seq); } else { strip->stripdata = NULL; @@ -477,7 +477,7 @@ void RNA_api_sequence_strip(StructRNA *srna) RNA_def_function_ui_description(func, "Update the strip dimensions"); parm = RNA_def_boolean(func, "data", false, "Data", "Update strip data"); - func = RNA_def_function(srna, "strip_elem_from_frame", "BKE_sequencer_give_stripelem"); + func = RNA_def_function(srna, "strip_elem_from_frame", "SEQ_render_give_stripelem"); RNA_def_function_ui_description(func, "Return the strip element from a given frame or None"); parm = RNA_def_int(func, "frame", diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index fee1a26ca85..edf627c4e54 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -1498,27 +1498,27 @@ static void do_render_seq(Render *re) tot_views = BKE_scene_multiview_num_views_get(&re->r); ibuf_arr = MEM_mallocN(sizeof(ImBuf *) * tot_views, "Sequencer Views ImBufs"); - BKE_sequencer_new_render_data(re->main, - re->pipeline_depsgraph, - re->scene, - re_x, - re_y, - SEQ_RENDER_SIZE_SCENE, - true, - &context); + SEQ_render_new_render_data(re->main, + re->pipeline_depsgraph, + re->scene, + re_x, + re_y, + SEQ_RENDER_SIZE_SCENE, + true, + &context); /* the renderresult gets destroyed during the rendering, so we first collect all ibufs * and then we populate the final renderesult */ for (view_id = 0; view_id < tot_views; view_id++) { context.view_id = view_id; - out = BKE_sequencer_give_ibuf(&context, cfra, 0); + out = SEQ_render_give_ibuf(&context, cfra, 0); if (out) { ibuf_arr[view_id] = IMB_dupImBuf(out); IMB_metadata_copy(ibuf_arr[view_id], out); IMB_freeImBuf(out); - BKE_sequencer_imbuf_from_sequencer_space(re->pipeline_scene_eval, ibuf_arr[view_id]); + SEQ_render_imbuf_from_sequencer_space(re->pipeline_scene_eval, ibuf_arr[view_id]); } else { ibuf_arr[view_id] = NULL; diff --git a/source/blender/sequencer/SEQ_sequencer.h b/source/blender/sequencer/SEQ_sequencer.h index b38f92e7b01..194041a3211 100644 --- a/source/blender/sequencer/SEQ_sequencer.h +++ b/source/blender/sequencer/SEQ_sequencer.h @@ -142,21 +142,21 @@ typedef struct SeqRenderData { // bool gpu_full_samples; } SeqRenderData; -struct ImBuf *BKE_sequencer_give_ibuf(const SeqRenderData *context, float cfra, int chanshown); -struct ImBuf *BKE_sequencer_give_ibuf_direct(const SeqRenderData *context, - float cfra, - struct Sequence *seq); -void BKE_sequence_init_colorspace(struct Sequence *seq); -void BKE_sequencer_new_render_data(struct Main *bmain, - struct Depsgraph *depsgraph, - struct Scene *scene, - int rectx, - int recty, - int preview_render_size, - int for_render, - SeqRenderData *r_context); -int BKE_sequencer_evaluate_frame(struct Scene *scene, int cfra); -struct StripElem *BKE_sequencer_give_stripelem(struct Sequence *seq, int cfra); +struct ImBuf *SEQ_render_give_ibuf(const SeqRenderData *context, float cfra, int chanshown); +struct ImBuf *SEQ_render_give_ibuf_direct(const SeqRenderData *context, + float cfra, + struct Sequence *seq); +void SEQ_render_init_colorspace(struct Sequence *seq); +void SEQ_render_new_render_data(struct Main *bmain, + struct Depsgraph *depsgraph, + struct Scene *scene, + int rectx, + int recty, + int preview_render_size, + int for_render, + SeqRenderData *r_context); +int SEQ_render_evaluate_frame(struct Scene *scene, int cfra); +struct StripElem *SEQ_render_give_stripelem(struct Sequence *seq, int cfra); /* ********************************************************************** * render.c @@ -164,8 +164,8 @@ struct StripElem *BKE_sequencer_give_stripelem(struct Sequence *seq, int cfra); * Sequencer color space functions * ********************************************************************** */ -void BKE_sequencer_imbuf_from_sequencer_space(struct Scene *scene, struct ImBuf *ibuf); -void BKE_sequencer_pixel_from_sequencer_space_v4(struct Scene *scene, float pixel[4]); +void SEQ_render_imbuf_from_sequencer_space(struct Scene *scene, struct ImBuf *ibuf); +void SEQ_render_pixel_from_sequencer_space_v4(struct Scene *scene, float pixel[4]); /* ********************************************************************** * sequencer.c @@ -229,21 +229,21 @@ int BKE_sequencer_cmp_time_startdisp(const void *a, const void *b); * Proxy functions * ********************************************************************** */ -bool BKE_sequencer_proxy_rebuild_context(struct Main *bmain, - struct Depsgraph *depsgraph, - struct Scene *scene, - struct Sequence *seq, - struct GSet *file_list, - ListBase *queue); -void BKE_sequencer_proxy_rebuild(struct SeqIndexBuildContext *context, - short *stop, - short *do_update, - float *progress); -void BKE_sequencer_proxy_rebuild_finish(struct SeqIndexBuildContext *context, bool stop); -void BKE_sequencer_proxy_set(struct Sequence *seq, bool value); +bool SEQ_proxy_rebuild_context(struct Main *bmain, + struct Depsgraph *depsgraph, + struct Scene *scene, + struct Sequence *seq, + struct GSet *file_list, + ListBase *queue); +void SEQ_proxy_rebuild(struct SeqIndexBuildContext *context, + short *stop, + short *do_update, + float *progress); +void SEQ_proxy_rebuild_finish(struct SeqIndexBuildContext *context, bool stop); +void SEQ_proxy_set(struct Sequence *seq, bool value); bool SEQ_can_use_proxy(struct Sequence *seq, int psize); int SEQ_rendersize_to_proxysize(int render_size); -double BKE_sequencer_rendersize_to_scale_factor(int size); +double SEQ_rendersize_to_scale_factor(int size); /* ********************************************************************** * image_cache.c diff --git a/source/blender/sequencer/intern/effects.c b/source/blender/sequencer/intern/effects.c index 06bd6022607..039c18bf51d 100644 --- a/source/blender/sequencer/intern/effects.c +++ b/source/blender/sequencer/intern/effects.c @@ -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 */ diff --git a/source/blender/sequencer/intern/modifier.c b/source/blender/sequencer/intern/modifier.c index 4a922e9ce9f..f912fd50f0d 100644 --- a/source/blender/sequencer/intern/modifier.c +++ b/source/blender/sequencer/intern/modifier.c @@ -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) { diff --git a/source/blender/sequencer/intern/prefetch.c b/source/blender/sequencer/intern/prefetch.c index cc4c335f9af..6eac15dec52 100644 --- a/source/blender/sequencer/intern/prefetch.c +++ b/source/blender/sequencer/intern/prefetch.c @@ -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); diff --git a/source/blender/sequencer/intern/proxy.c b/source/blender/sequencer/intern/proxy.c index caa0ecb4ad7..94d5f5b701d 100644 --- a/source/blender/sequencer/intern/proxy.c +++ b/source/blender/sequencer/intern/proxy.c @@ -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; diff --git a/source/blender/sequencer/intern/render.c b/source/blender/sequencer/intern/render.c index d59fdabe504..c2e04ebeff8 100644 --- a/source/blender/sequencer/intern/render.c +++ b/source/blender/sequencer/intern/render.c @@ -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); |