griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: rename index_context -> proxy_builder in movie proxy builder code

Browse Source
This commit is contained in:
Aras Pranckevicius
2024-12-20 14:30:13 +02:00
parent e99252d7fd
commit 560caf63fd
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/editors/space_clip/clip_ops.cc
View File

@@ -1180,7 +1180,7 @@ struct ProxyJob {
MovieClip *clip;
int clip_flag;
bool stop;
MovieProxyBuilder *index_context;
MovieProxyBuilder *proxy_builder;
};
static void proxy_freejob(void *pjv)
@@ -1234,8 +1234,8 @@ static void do_movie_proxy(void *pjv,
MovieClip *clip = pj->clip;
MovieDistortion *distortion = nullptr;
if (pj->index_context) {
MOV_proxy_builder_process(pj->index_context, stop, do_update, progress);
if (pj->proxy_builder) {
MOV_proxy_builder_process(pj->proxy_builder, stop, do_update, progress);
}
if (!build_undistort_count) {
@@ -1502,8 +1502,8 @@ static void proxy_endjob(void *pjv)
MOV_close_proxies(pj->clip->anim);
}
if (pj->index_context) {
MOV_proxy_builder_finish(pj->index_context, pj->stop);
if (pj->proxy_builder) {
MOV_proxy_builder_finish(pj->proxy_builder, pj->stop);
}
if (pj->clip->source == MCLIP_SRC_MOVIE) {
@@ -1545,7 +1545,7 @@ static int clip_rebuild_proxy_exec(bContext *C, wmOperator * /*op*/)
pj->clip_flag = clip->flag & MCLIP_TIMECODE_FLAGS;
if (clip->anim) {
pj->index_context = MOV_proxy_builder_start(clip->anim,
pj->proxy_builder = MOV_proxy_builder_start(clip->anim,
IMB_Timecode_Type(clip->proxy.build_tc_flag),
IMB_Proxy_Size(clip->proxy.build_size_flag),
clip->proxy.quality,

14
source/blender/sequencer/intern/proxy.cc
View File

@@ -51,7 +51,7 @@
#include "utils.hh"
struct SeqIndexBuildContext {
MovieProxyBuilder *index_context;
MovieProxyBuilder *proxy_builder;
int tc_flags;
int size_flags;
@@ -483,7 +483,7 @@ bool SEQ_proxy_rebuild_context(Main *bmain,
sanim = static_cast<StripAnim *>(BLI_findlink(&nseq->anims, i));
if (sanim->anim) {
context->index_context = MOV_proxy_builder_start(sanim->anim,
context->proxy_builder = MOV_proxy_builder_start(sanim->anim,
IMB_Timecode_Type(context->tc_flags),
context->size_flags,
context->quality,
@@ -491,7 +491,7 @@ bool SEQ_proxy_rebuild_context(Main *bmain,
file_list,
build_only_on_bad_performance);
}
if (!context->index_context) {
if (!context->proxy_builder) {
MEM_freeN(context);
return false;
}
@@ -514,8 +514,8 @@ void SEQ_proxy_rebuild(SeqIndexBuildContext *context, wmJobWorkerStatus *worker_
int timeline_frame;
if (seq->type == SEQ_TYPE_MOVIE) {
if (context->index_context) {
MOV_proxy_builder_process(context->index_context,
if (context->proxy_builder) {
MOV_proxy_builder_process(context->proxy_builder,
&worker_status->stop,
&worker_status->do_update,
&worker_status->progress);
@@ -576,12 +576,12 @@ void SEQ_proxy_rebuild(SeqIndexBuildContext *context, wmJobWorkerStatus *worker_
void SEQ_proxy_rebuild_finish(SeqIndexBuildContext *context, bool stop)
{
if (context->index_context) {
if (context->proxy_builder) {
LISTBASE_FOREACH (StripAnim *, sanim, &context->seq->anims) {
MOV_close_proxies(sanim->anim);
}
MOV_proxy_builder_finish(context->index_context, stop);
MOV_proxy_builder_finish(context->proxy_builder, stop);
}
seq_free_sequence_recurse(nullptr, context->seq, true);