[Bf-blender-cvs] [fdc918c32c2] master: Cleanup: Better const-correctness in MovieClip
Sergey Sharybin
noreply at git.blender.org
Thu Jan 5 12:40:42 CET 2023
Commit: fdc918c32c2ef9b392f3d6879485b571118c8db3
Author: Sergey Sharybin
Date: Thu Jan 5 12:33:55 2023 +0100
Branches: master
https://developer.blender.org/rBfdc918c32c2ef9b392f3d6879485b571118c8db3
Cleanup: Better const-correctness in MovieClip
Mainly make MovieClipUser constant.
===================================================================
M source/blender/blenkernel/BKE_movieclip.h
M source/blender/blenkernel/intern/movieclip.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_movieclip.h b/source/blender/blenkernel/BKE_movieclip.h
index 4667aa17131..fb68847f210 100644
--- a/source/blender/blenkernel/BKE_movieclip.h
+++ b/source/blender/blenkernel/BKE_movieclip.h
@@ -39,40 +39,42 @@ void BKE_movieclip_clear_proxy_cache(struct MovieClip *clip);
*/
void BKE_movieclip_convert_multilayer_ibuf(struct ImBuf *ibuf);
-struct ImBuf *BKE_movieclip_get_ibuf(struct MovieClip *clip, struct MovieClipUser *user);
+struct ImBuf *BKE_movieclip_get_ibuf(struct MovieClip *clip, const struct MovieClipUser *user);
struct ImBuf *BKE_movieclip_get_postprocessed_ibuf(struct MovieClip *clip,
- struct MovieClipUser *user,
+ const struct MovieClipUser *user,
int postprocess_flag);
struct ImBuf *BKE_movieclip_get_stable_ibuf(struct MovieClip *clip,
- struct MovieClipUser *user,
+ const struct MovieClipUser *user,
float loc[2],
float *scale,
float *angle,
int postprocess_flag);
struct ImBuf *BKE_movieclip_get_ibuf_flag(struct MovieClip *clip,
- struct MovieClipUser *user,
+ const struct MovieClipUser *user,
int flag,
int cache_flag);
void BKE_movieclip_get_size(struct MovieClip *clip,
- struct MovieClipUser *user,
+ const struct MovieClipUser *user,
int *width,
int *height);
-void BKE_movieclip_get_size_fl(struct MovieClip *clip, struct MovieClipUser *user, float size[2]);
+void BKE_movieclip_get_size_fl(struct MovieClip *clip,
+ const struct MovieClipUser *user,
+ float size[2]);
int BKE_movieclip_get_duration(struct MovieClip *clip);
float BKE_movieclip_get_fps(struct MovieClip *clip);
void BKE_movieclip_get_aspect(struct MovieClip *clip, float *aspx, float *aspy);
-bool BKE_movieclip_has_frame(struct MovieClip *clip, struct MovieClipUser *user);
+bool BKE_movieclip_has_frame(struct MovieClip *clip, const struct MovieClipUser *user);
void BKE_movieclip_user_set_frame(struct MovieClipUser *user, int framenr);
void BKE_movieclip_update_scopes(struct MovieClip *clip,
- struct MovieClipUser *user,
+ const struct MovieClipUser *user,
struct MovieClipScopes *scopes);
/**
* Get segments of cached frames. useful for debugging cache policies.
*/
void BKE_movieclip_get_cache_segments(struct MovieClip *clip,
- struct MovieClipUser *user,
+ const struct MovieClipUser *user,
int *r_totseg,
int **r_points);
@@ -105,7 +107,7 @@ float BKE_movieclip_remap_scene_to_clip_frame(const struct MovieClip *clip, floa
float BKE_movieclip_remap_clip_to_scene_frame(const struct MovieClip *clip, float framenr);
void BKE_movieclip_filename_for_frame(struct MovieClip *clip,
- struct MovieClipUser *user,
+ const struct MovieClipUser *user,
char *name);
/**
@@ -113,11 +115,11 @@ void BKE_movieclip_filename_for_frame(struct MovieClip *clip,
* Used by a prefetch job which takes care of creating a local copy of the clip.
*/
struct ImBuf *BKE_movieclip_anim_ibuf_for_frame_no_lock(struct MovieClip *clip,
- struct MovieClipUser *user);
+ const struct MovieClipUser *user);
-bool BKE_movieclip_has_cached_frame(struct MovieClip *clip, struct MovieClipUser *user);
+bool BKE_movieclip_has_cached_frame(struct MovieClip *clip, const struct MovieClipUser *user);
bool BKE_movieclip_put_frame_if_possible(struct MovieClip *clip,
- struct MovieClipUser *user,
+ const struct MovieClipUser *user,
struct ImBuf *ibuf);
struct GPUTexture *BKE_movieclip_get_gpu_texture(struct MovieClip *clip,
diff --git a/source/blender/blenkernel/intern/movieclip.c b/source/blender/blenkernel/intern/movieclip.c
index 2e95866d642..726f5591703 100644
--- a/source/blender/blenkernel/intern/movieclip.c
+++ b/source/blender/blenkernel/intern/movieclip.c
@@ -884,7 +884,7 @@ static ImBuf *get_imbuf_cache(MovieClip *clip, const MovieClipUser *user, int fl
return NULL;
}
-static bool has_imbuf_cache(MovieClip *clip, MovieClipUser *user, int flag)
+static bool has_imbuf_cache(MovieClip *clip, const MovieClipUser *user, int flag)
{
if (clip->cache) {
MovieClipImBufCacheKey key;
@@ -1372,25 +1372,31 @@ static ImBuf *movieclip_get_postprocessed_ibuf(
return ibuf;
}
-ImBuf *BKE_movieclip_get_ibuf(MovieClip *clip, MovieClipUser *user)
+ImBuf *BKE_movieclip_get_ibuf(MovieClip *clip, const MovieClipUser *user)
{
return BKE_movieclip_get_ibuf_flag(clip, user, clip->flag, 0);
}
-ImBuf *BKE_movieclip_get_ibuf_flag(MovieClip *clip, MovieClipUser *user, int flag, int cache_flag)
+ImBuf *BKE_movieclip_get_ibuf_flag(MovieClip *clip,
+ const MovieClipUser *user,
+ const int flag,
+ const int cache_flag)
{
return movieclip_get_postprocessed_ibuf(clip, user, flag, 0, cache_flag);
}
ImBuf *BKE_movieclip_get_postprocessed_ibuf(MovieClip *clip,
- MovieClipUser *user,
- int postprocess_flag)
+ const MovieClipUser *user,
+ const int postprocess_flag)
{
return movieclip_get_postprocessed_ibuf(clip, user, clip->flag, postprocess_flag, 0);
}
-static ImBuf *get_stable_cached_frame(
- MovieClip *clip, MovieClipUser *user, ImBuf *reference_ibuf, int framenr, int postprocess_flag)
+static ImBuf *get_stable_cached_frame(MovieClip *clip,
+ const MovieClipUser *user,
+ ImBuf *reference_ibuf,
+ const int framenr,
+ const int postprocess_flag)
{
MovieClipCache *cache = clip->cache;
MovieTracking *tracking = &clip->tracking;
@@ -1448,8 +1454,11 @@ static ImBuf *get_stable_cached_frame(
return stableibuf;
}
-static ImBuf *put_stabilized_frame_to_cache(
- MovieClip *clip, MovieClipUser *user, ImBuf *ibuf, int framenr, int postprocess_flag)
+static ImBuf *put_stabilized_frame_to_cache(MovieClip *clip,
+ const MovieClipUser *user,
+ ImBuf *ibuf,
+ const int framenr,
+ const int postprocess_flag)
{
MovieClipCache *cache = clip->cache;
MovieTracking *tracking = &clip->tracking;
@@ -1491,11 +1500,11 @@ static ImBuf *put_stabilized_frame_to_cache(
}
ImBuf *BKE_movieclip_get_stable_ibuf(MovieClip *clip,
- MovieClipUser *user,
+ const MovieClipUser *user,
float loc[2],
float *scale,
float *angle,
- int postprocess_flag)
+ const int postprocess_flag)
{
ImBuf *ibuf, *stableibuf = NULL;
int framenr = user->framenr;
@@ -1551,7 +1560,7 @@ ImBuf *BKE_movieclip_get_stable_ibuf(MovieClip *clip,
return ibuf;
}
-bool BKE_movieclip_has_frame(MovieClip *clip, MovieClipUser *user)
+bool BKE_movieclip_has_frame(MovieClip *clip, const MovieClipUser *user)
{
ImBuf *ibuf = BKE_movieclip_get_ibuf(clip, user);
@@ -1563,7 +1572,7 @@ bool BKE_movieclip_has_frame(MovieClip *clip, MovieClipUser *user)
return false;
}
-void BKE_movieclip_get_size(MovieClip *clip, MovieClipUser *user, int *width, int *height)
+void BKE_movieclip_get_size(MovieClip *clip, const MovieClipUser *user, int *width, int *height)
{
/* TODO(sergey): Support reading sequences of different resolution. */
if (clip->lastsize[0] != 0 && clip->lastsize[1] != 0) {
@@ -1586,7 +1595,7 @@ void BKE_movieclip_get_size(MovieClip *clip, MovieClipUser *user, int *width, in
}
}
}
-void BKE_movieclip_get_size_fl(MovieClip *clip, MovieClipUser *user, float size[2])
+void BKE_movieclip_get_size_fl(MovieClip *clip, const MovieClipUser *user, float size[2])
{
int width, height;
BKE_movieclip_get_size(clip, user, &width, &height);
@@ -1630,7 +1639,7 @@ void BKE_movieclip_get_aspect(MovieClip *clip, float *aspx, float *aspy)
}
void BKE_movieclip_get_cache_segments(MovieClip *clip,
- MovieClipUser *user,
+ const MovieClipUser *user,
int *r_totseg,
int **r_points)
{
@@ -1717,7 +1726,9 @@ void BKE_movieclip_reload(Main *bmain, MovieClip *clip)
BKE_ntree_update_tag_id_changed(bmain, &clip->id);
}
-void BKE_movieclip_update_scopes(MovieClip *clip, MovieClipUser *user, MovieClipScopes *scopes)
+void BKE_movieclip_update_scopes(MovieClip *clip,
+ const MovieClipUser *user,
+ MovieClipScopes *scopes)
{
if (scopes->ok) {
return;
@@ -1934,17 +1945,17 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list