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

Cleanup: VSE: Reorganize and clean up sequencer add code

Browse Source 
- Deduplicate `scale_fit_methods` enum
- Reorder functions, polls, and code to locations that make sense
- Rename some functions to remove `seq` terminology in favor of `strip`
- Renames `len` in `LoadData` to `count` for images
- Add clarifying comments and improve descriptions
This commit is contained in:
John Kiril Swenson
2025-08-01 12:57:57 -05:00
parent 4254730b20
commit 644fcd6bfb
9 changed files with 137 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

163
source/blender/editors/space_sequencer/sequencer_add.cc
View File

@@ -84,37 +84,47 @@ struct SequencerAddData {
/* Avoid passing multiple args and be more verbose. */
#define SEQPROP_STARTFRAME (1 << 0)
/* Defines length for image and effect strips. */
#define SEQPROP_ENDFRAME (1 << 1)
/* Skip pre-setting filepath to active strip media directory */
/* Skips setting filepath or directory properties to active strip media directory,
* since they have already been set by the file browser or by drag and drop. */
#define SEQPROP_NOPATHS (1 << 2)
/* Skips guessing channel for effect strips only. */
#define SEQPROP_NOCHAN (1 << 3)
#define SEQPROP_FIT_METHOD (1 << 4)
#define SEQPROP_VIEW_TRANSFORM (1 << 5)
#define SEQPROP_PLAYBACK_RATE (1 << 6)
#define SEQPROP_MOVE (1 << 7)
static const EnumPropertyItem scale_fit_methods[] = {
{SEQ_SCALE_TO_FIT, "FIT", 0, "Scale to Fit", "Scale image to fit within the canvas"},
{SEQ_SCALE_TO_FILL, "FILL", 0, "Scale to Fill", "Scale image to completely fill the canvas"},
{SEQ_STRETCH_TO_FILL, "STRETCH", 0, "Stretch to Fill", "Stretch image to fill the canvas"},
{SEQ_USE_ORIGINAL_SIZE, "ORIGINAL", 0, "Use Original Size", "Keep image at its original size"},
{0, nullptr, 0, nullptr, nullptr},
};
/* -------------------------------------------------------------------- */
/** \name Generic Add Functions
* \{ */
static void sequencer_add_init(bContext * /*C*/, wmOperator *op)
{
op->customdata = MEM_new<SequencerAddData>(__func__);
}
static void sequencer_add_free(bContext * /*C*/, wmOperator *op)
{
if (op->customdata) {
SequencerAddData *sad = reinterpret_cast<SequencerAddData *>(op->customdata);
MEM_delete(sad);
op->customdata = nullptr;
}
}
static void sequencer_generic_props__internal(wmOperatorType *ot, int flag)
{
PropertyRNA *prop;
if (flag & SEQPROP_MOVE) {
prop = RNA_def_boolean(ot->srna,
"move_strips",
true,
"Move Strips",
"Move strips after adding them to the timeline");
prop = RNA_def_boolean(
ot->srna,
"move_strips",
true,
"Move Strips",
"Automatically begin translating strips with the mouse after adding them to the timeline");
}
if (flag & SEQPROP_STARTFRAME) {
@@ -124,7 +134,7 @@ static void sequencer_generic_props__internal(wmOperatorType *ot, int flag)
INT_MIN,
INT_MAX,
"Start Frame",
"Start frame of the sequence strip",
"Start frame of the strip",
-MAXFRAME,
MAXFRAME);
}
@@ -137,7 +147,7 @@ static void sequencer_generic_props__internal(wmOperatorType *ot, int flag)
INT_MIN,
INT_MAX,
"End Frame",
"End frame for the color strip",
"End frame of the strip",
-MAXFRAME,
MAXFRAME);
}
@@ -152,12 +162,15 @@ static void sequencer_generic_props__internal(wmOperatorType *ot, int flag)
1,
seq::MAX_CHANNELS);
RNA_def_boolean(
ot->srna, "replace_sel", true, "Replace Selection", "Deselect previously selected strips");
RNA_def_boolean(ot->srna,
"replace_sel",
true,
"Replace Selection",
"Deselect previously selected strips after add operation completes");
/* Only for python scripts which import strips and place them after. */
prop = RNA_def_boolean(
ot->srna, "overlap", false, "Allow Overlap", "Don't correct overlap on new sequence strips");
ot->srna, "overlap", false, "Allow Overlap", "Don't correct overlap on new strips");
RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE);
prop = RNA_def_boolean(
@@ -178,10 +191,10 @@ static void sequencer_generic_props__internal(wmOperatorType *ot, int flag)
if (flag & SEQPROP_FIT_METHOD) {
ot->prop = RNA_def_enum(ot->srna,
"fit_method",
scale_fit_methods,
rna_enum_strip_scale_method_items,
SEQ_SCALE_TO_FIT,
"Fit Method",
"Scale fit method");
"Mode for fitting the image to the canvas");
}
if (flag & SEQPROP_VIEW_TRANSFORM) {
@@ -207,11 +220,11 @@ static void sequencer_generic_invoke_path__internal(bContext *C,
{
if (RNA_struct_find_property(op->ptr, identifier)) {
Scene *scene = CTX_data_sequencer_scene(C);
Strip *last_seq = seq::select_active_get(scene);
if (last_seq && last_seq->data && STRIP_HAS_PATH(last_seq)) {
Strip *last_strip = seq::select_active_get(scene);
if (last_strip && last_strip->data && STRIP_HAS_PATH(last_strip)) {
Main *bmain = CTX_data_main(C);
char dirpath[FILE_MAX];
STRNCPY(dirpath, last_seq->data->dirpath);
STRNCPY(dirpath, last_strip->data->dirpath);
BLI_path_abs(dirpath, BKE_main_blendfile_path(bmain));
RNA_string_set(op->ptr, identifier, dirpath);
}
@@ -345,7 +358,8 @@ static void sequencer_generic_invoke_xy__internal(
sequencer_file_drop_channel_frame_set(C, op, event);
}
/* Effect strips don't need a channel initialized from the mouse. */
/* Effect strips shouldn't have their channel guessed. Instead,
* it will be set to the first free channel above the input strips. */
if (!(flag & SEQPROP_NOCHAN) && !RNA_struct_property_is_set(op->ptr, "channel")) {
RNA_int_set(op->ptr, "channel", sequencer_generic_invoke_xy_guess_channel(C, type));
}
@@ -394,16 +408,14 @@ static bool load_data_init_from_operator(seq::LoadData *load_data, bContext *C,
const Main *bmain = CTX_data_main(C);
const ARegion *region = CTX_wm_region(C);
PropertyRNA *prop;
const bool relative = (prop = RNA_struct_find_property(op->ptr, "relative_path")) &&
RNA_property_boolean_get(op->ptr, prop);
memset(load_data, 0, sizeof(seq::LoadData));
load_data->start_frame = RNA_int_get(op->ptr, "frame_start");
load_data->channel = RNA_int_get(op->ptr, "channel");
load_data->image.end_frame = load_data->start_frame;
load_data->image.len = 1;
load_data->image.count = 1;
PropertyRNA *prop;
if ((prop = RNA_struct_find_property(op->ptr, "fit_method"))) {
load_data->fit_method = eSeqImageFitMethod(RNA_enum_get(op->ptr, "fit_method"));
seq::tool_settings_fit_method_set(CTX_data_sequencer_scene(C), load_data->fit_method);
@@ -444,6 +456,8 @@ static bool load_data_init_from_operator(seq::LoadData *load_data, bContext *C,
}
}
const bool relative = (prop = RNA_struct_find_property(op->ptr, "relative_path")) &&
RNA_property_boolean_get(op->ptr, prop);
if (relative) {
BLI_path_rel(load_data->path, BKE_main_blendfile_path(bmain));
}
@@ -584,26 +598,6 @@ static bool seq_load_apply_generic_options_only_test_overlap(bContext *C,
return seq::transform_test_overlap(scene, ed->current_strips(), strip);
}
static bool seq_effect_add_properties_poll(const bContext * /*C*/,
wmOperator *op,
const PropertyRNA *prop)
{
const char *prop_id = RNA_property_identifier(prop);
int type = RNA_enum_get(op->ptr, "type");
/* Hide start/end frames for effect strips that are locked to their parents' location. */
if (seq::effect_get_num_inputs(type) != 0) {
if (STR_ELEM(prop_id, "frame_start", "frame_end")) {
return false;
}
}
if ((type != STRIP_TYPE_COLOR) && STREQ(prop_id, "color")) {
return false;
}
return true;
}
static void sequencer_disable_one_time_properties(bContext *C, wmOperator *op)
{
Editing *ed = seq::editing_get(CTX_data_sequencer_scene(C));
@@ -1072,20 +1066,6 @@ void SEQUENCER_OT_mask_strip_add(wmOperatorType *ot)
/** \name Add Movie Strip
* \{ */
static void sequencer_add_init(bContext * /*C*/, wmOperator *op)
{
op->customdata = MEM_new<SequencerAddData>(__func__);
}
static void sequencer_add_free(bContext * /*C*/, wmOperator *op)
{
if (op->customdata) {
SequencerAddData *sad = reinterpret_cast<SequencerAddData *>(op->customdata);
MEM_delete(sad);
op->customdata = nullptr;
}
}
/* Strips are added in context of timeline which has different preview size than actual preview. We
* must search for preview area. In most cases there will be only one preview area, but there can
* be more with different preview sizes. */
@@ -1657,10 +1637,10 @@ void SEQUENCER_OT_sound_strip_add(wmOperatorType *ot)
/** \name Add Image Strip
* \{ */
int sequencer_image_seq_get_minmax_frame(wmOperator *op,
int sfra,
int *r_minframe,
int *r_numdigits)
int sequencer_image_strip_get_minmax_frame(wmOperator *op,
int sfra,
int *r_minframe,
int *r_numdigits)
{
int minframe = INT32_MAX, maxframe = INT32_MIN;
int numdigits = 0;
@@ -1689,7 +1669,7 @@ int sequencer_image_seq_get_minmax_frame(wmOperator *op,
return maxframe - minframe + 1;
}
void sequencer_image_seq_reserve_frames(
void sequencer_image_strip_reserve_frames(
wmOperator *op, StripElem *se, int len, int minframe, int numdigits)
{
char *filename = nullptr;
@@ -1715,15 +1695,15 @@ void sequencer_image_seq_reserve_frames(
}
}
static int sequencer_add_image_strip_calculate_length(wmOperator *op,
const int start_frame,
int *minframe,
int *numdigits)
static int sequencer_add_image_strip_calculate_count(wmOperator *op,
const int start_frame,
int *minframe,
int *numdigits)
{
const bool use_placeholders = RNA_boolean_get(op->ptr, "use_placeholders");
if (use_placeholders) {
return sequencer_image_seq_get_minmax_frame(op, start_frame, minframe, numdigits);
return sequencer_image_strip_get_minmax_frame(op, start_frame, minframe, numdigits);
}
return RNA_property_collection_length(op->ptr, RNA_struct_find_property(op->ptr, "files"));
}
@@ -1741,8 +1721,8 @@ static void sequencer_add_image_strip_load_files(wmOperator *op,
seq::add_image_set_directory(strip, dirpath);
if (use_placeholders) {
sequencer_image_seq_reserve_frames(
op, strip->data->stripdata, load_data->image.len, minframe, numdigits);
sequencer_image_strip_reserve_frames(
op, strip->data->stripdata, load_data->image.count, minframe, numdigits);
}
else {
size_t strip_frame = 0;
@@ -1772,9 +1752,9 @@ static wmOperatorStatus sequencer_add_image_strip_exec(bContext *C, wmOperator *
}
int minframe, numdigits;
load_data.image.len = sequencer_add_image_strip_calculate_length(
load_data.image.count = sequencer_add_image_strip_calculate_count(
op, load_data.start_frame, &minframe, &numdigits);
if (load_data.image.len == 0) {
if (load_data.image.count == 0) {
sequencer_add_free(C, op);
return OPERATOR_CANCELLED;
}
@@ -1800,7 +1780,7 @@ static wmOperatorStatus sequencer_add_image_strip_exec(bContext *C, wmOperator *
seq::add_image_init_alpha_mode(strip);
/* Adjust length. */
if (load_data.image.len == 1) {
if (load_data.image.count == 1) {
seq::time_right_handle_frame_set(scene, strip, load_data.image.end_frame);
}
@@ -1847,7 +1827,7 @@ static wmOperatorStatus sequencer_add_image_strip_invoke(bContext *C,
sequencer_generic_invoke_xy__internal(C, op, SEQPROP_ENDFRAME, STRIP_TYPE_IMAGE, event);
/* Show multiview save options only if scene use multiview. */
/* Show multiview save options only if the scene uses multiview. */
prop = RNA_struct_find_property(op->ptr, "show_multiview");
RNA_property_boolean_set(op->ptr, prop, (scene->r.scemode & R_MULTIVIEW) != 0);
@@ -1975,8 +1955,7 @@ static wmOperatorStatus sequencer_add_effect_strip_invoke(bContext *C,
type = RNA_enum_get(op->ptr, "type");
/* When invoking an effect strip which uses inputs, skip initializing the channel from the
* mouse. */
/* When invoking an effect strip which uses inputs, skip guessing of the channel. */
if (seq::effect_get_num_inputs(type) != 0) {
prop_flag |= SEQPROP_NOCHAN;
}
@@ -1991,6 +1970,26 @@ static wmOperatorStatus sequencer_add_effect_strip_invoke(bContext *C,
return sequencer_add_effect_strip_exec(C, op);
}
static bool sequencer_add_effect_strip_poll_property(const bContext * /*C*/,
wmOperator *op,
const PropertyRNA *prop)
{
const char *prop_id = RNA_property_identifier(prop);
int type = RNA_enum_get(op->ptr, "type");
/* Hide start/end frames for effect strips that are locked to their parents' location. */
if (seq::effect_get_num_inputs(type) != 0) {
if (STR_ELEM(prop_id, "frame_start", "frame_end")) {
return false;
}
}
if ((type != STRIP_TYPE_COLOR) && STREQ(prop_id, "color")) {
return false;
}
return true;
}
static std::string sequencer_add_effect_strip_get_description(bContext * /*C*/,
wmOperatorType * /*ot*/,
PointerRNA *ptr)
@@ -2059,7 +2058,7 @@ void SEQUENCER_OT_effect_strip_add(wmOperatorType *ot)
ot->invoke = sequencer_add_effect_strip_invoke;
ot->exec = sequencer_add_effect_strip_exec;
ot->poll = ED_operator_sequencer_active_editable;
ot->poll_property = seq_effect_add_properties_poll;
ot->poll_property = sequencer_add_effect_strip_poll_property;
ot->get_description = sequencer_add_effect_strip_get_description;
/* Flags. */

15
source/blender/editors/space_sequencer/sequencer_edit.cc
View File

@@ -2841,7 +2841,7 @@ static wmOperatorStatus sequencer_change_path_exec(bContext *C, wmOperator *op)
/* Need to find min/max frame for placeholders. */
if (use_placeholders) {
len = sequencer_image_seq_get_minmax_frame(op, strip->sfra, &minext_frameme, &numdigits);
len = sequencer_image_strip_get_minmax_frame(op, strip->sfra, &minext_frameme, &numdigits);
}
else {
len = RNA_property_collection_length(op->ptr, RNA_struct_find_property(op->ptr, "files"));
@@ -2865,7 +2865,7 @@ static wmOperatorStatus sequencer_change_path_exec(bContext *C, wmOperator *op)
strip->data->stripdata = se = MEM_calloc_arrayN<StripElem>(len, "stripelem");
if (use_placeholders) {
sequencer_image_seq_reserve_frames(op, se, len, minext_frameme, numdigits);
sequencer_image_strip_reserve_frames(op, se, len, minext_frameme, numdigits);
}
else {
RNA_BEGIN (op->ptr, itemptr, "files") {
@@ -3425,13 +3425,6 @@ void SEQUENCER_OT_strip_transform_clear(wmOperatorType *ot)
/** \name Transform Set Fit Operator
* \{ */
static const EnumPropertyItem scale_fit_methods[] = {
{SEQ_SCALE_TO_FIT, "FIT", 0, "Scale to Fit", "Scale image so fits in preview"},
{SEQ_SCALE_TO_FILL, "FILL", 0, "Scale to Fill", "Scale image so it fills preview completely"},
{SEQ_STRETCH_TO_FILL, "STRETCH", 0, "Stretch to Fill", "Stretch image so it fills preview"},
{0, nullptr, 0, nullptr, nullptr},
};
static wmOperatorStatus sequencer_strip_transform_fit_exec(bContext *C, wmOperator *op)
{
Scene *scene = CTX_data_sequencer_scene(C);
@@ -3476,10 +3469,10 @@ void SEQUENCER_OT_strip_transform_fit(wmOperatorType *ot)
ot->prop = RNA_def_enum(ot->srna,
"fit_method",
scale_fit_methods,
rna_enum_strip_scale_method_items,
SEQ_SCALE_TO_FIT,
"Fit Method",
"Scale fit fit_method");
"Mode for fitting the image to the canvas");
}
static wmOperatorStatus sequencer_strip_color_tag_set_exec(bContext *C, wmOperator *op)

10
source/blender/editors/space_sequencer/sequencer_intern.hh
View File

@@ -338,11 +338,11 @@ void sequencer_preview_add_sound(const bContext *C, const Strip *strip);
/* `sequencer_add.cc` */
int sequencer_image_seq_get_minmax_frame(wmOperator *op,
int sfra,
int *r_minframe,
int *r_numdigits);
void sequencer_image_seq_reserve_frames(
int sequencer_image_strip_get_minmax_frame(wmOperator *op,
int sfra,
int *r_minframe,
int *r_numdigits);
void sequencer_image_strip_reserve_frames(
wmOperator *op, StripElem *se, int len, int minframe, int numdigits);
/* `sequencer_retiming.cc` */

1
source/blender/makesrna/RNA_enum_items.hh
View File

@@ -47,6 +47,7 @@ DEF_ENUM(rna_enum_boidrule_type_items)
DEF_ENUM(rna_enum_strip_modifier_type_items)
DEF_ENUM(rna_enum_strip_video_modifier_type_items)
DEF_ENUM(rna_enum_strip_sound_modifier_type_items)
DEF_ENUM(rna_enum_strip_scale_method_items)
DEF_ENUM(rna_enum_object_shaderfx_type_items)
DEF_ENUM(rna_enum_modifier_triangulate_quad_method_items)

14
source/blender/makesrna/intern/rna_scene.cc
View File

@@ -4268,18 +4268,6 @@ static void rna_def_sequencer_tool_settings(BlenderRNA *brna)
StructRNA *srna;
PropertyRNA *prop;
static const EnumPropertyItem scale_fit_methods[] = {
{SEQ_SCALE_TO_FIT, "FIT", 0, "Scale to Fit", "Scale image to fit within the canvas"},
{SEQ_SCALE_TO_FILL, "FILL", 0, "Scale to Fill", "Scale image to completely fill the canvas"},
{SEQ_STRETCH_TO_FILL, "STRETCH", 0, "Stretch to Fill", "Stretch image to fill the canvas"},
{SEQ_USE_ORIGINAL_SIZE,
"ORIGINAL",
0,
"Use Original Size",
"Keep image at its original size"},
{0, nullptr, 0, nullptr, nullptr},
};
static const EnumPropertyItem scale_overlap_modes[] = {
{SEQ_OVERLAP_EXPAND, "EXPAND", 0, "Expand", "Move strips so transformed strips fit"},
{SEQ_OVERLAP_OVERWRITE,
@@ -4314,7 +4302,7 @@ static void rna_def_sequencer_tool_settings(BlenderRNA *brna)
/* Add strip settings. */
prop = RNA_def_property(srna, "fit_method", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_items(prop, scale_fit_methods);
RNA_def_property_enum_items(prop, rna_enum_strip_scale_method_items);
RNA_def_property_ui_text(prop, "Fit Method", "Scale fit method");
/* Transform snapping. */

24
source/blender/makesrna/intern/rna_sequencer.cc
View File

@@ -84,6 +84,30 @@ const EnumPropertyItem rna_enum_strip_color_items[] = {
{0, nullptr, 0, nullptr, nullptr},
};
const EnumPropertyItem rna_enum_strip_scale_method_items[] = {
{SEQ_SCALE_TO_FIT,
"FIT",
0,
"Scale to Fit",
"Fits the image bounds inside the canvas, avoiding crops while maintaining aspect ratio"},
{SEQ_SCALE_TO_FILL,
"FILL",
0,
"Scale to Fill",
"Fills the canvas edge-to-edge, cropping if needed, while maintaining aspect ratio"},
{SEQ_STRETCH_TO_FILL,
"STRETCH",
0,
"Stretch to Fill",
"Stretches image bounds to the canvas without preserving aspect ratio"},
{SEQ_USE_ORIGINAL_SIZE,
"ORIGINAL",
0,
"Use Original Size",
"Display image at its original size"},
{0, nullptr, 0, nullptr, nullptr},
};
#ifdef RNA_RUNTIME
# include <algorithm>

31
source/blender/makesrna/intern/rna_sequencer_api.cc
View File

@@ -14,6 +14,7 @@
#include "RNA_define.hh"
#include "RNA_enum_types.hh"
#include "SEQ_edit.hh"
#include "SEQ_sequencer.hh"
@@ -247,7 +248,7 @@ static Strip *rna_Strips_new_image(ID *id,
blender::seq::LoadData load_data;
blender::seq::add_load_data_init(&load_data, name, file, frame_start, channel);
load_data.image.len = 1;
load_data.image.count = 1;
load_data.fit_method = eSeqImageFitMethod(fit_method);
char vt_old[64];
@@ -836,18 +837,6 @@ void RNA_api_strips(StructRNA *srna, const bool metastrip)
{0, nullptr, 0, nullptr, nullptr},
};
static const EnumPropertyItem scale_fit_methods[] = {
{SEQ_SCALE_TO_FIT, "FIT", 0, "Scale to Fit", "Scale image so fits in preview"},
{SEQ_SCALE_TO_FILL,
"FILL",
0,
"Scale to Fill",
"Scale image so it fills preview completely"},
{SEQ_STRETCH_TO_FILL, "STRETCH", 0, "Stretch to Fill", "Stretch image so it fills preview"},
{SEQ_USE_ORIGINAL_SIZE, "ORIGINAL", 0, "Use Original Size", "Don't scale the image"},
{0, nullptr, 0, nullptr, nullptr},
};
const char *new_clip_func_name = "rna_Strips_editing_new_clip";
const char *new_mask_func_name = "rna_Strips_editing_new_mask";
const char *new_scene_func_name = "rna_Strips_editing_new_scene";
@@ -990,8 +979,12 @@ void RNA_api_strips(StructRNA *srna, const bool metastrip)
-MAXFRAME,
MAXFRAME);
RNA_def_parameter_flags(parm, PropertyFlag(0), PARM_REQUIRED);
parm = RNA_def_enum(
func, "fit_method", scale_fit_methods, SEQ_USE_ORIGINAL_SIZE, "Image Fit Method", nullptr);
parm = RNA_def_enum(func,
"fit_method",
rna_enum_strip_scale_method_items,
SEQ_USE_ORIGINAL_SIZE,
"Image Fit Method",
nullptr);
/* return type */
parm = RNA_def_pointer(func, "sequence", "Strip", "", "New Strip");
RNA_def_function_return(func, parm);
@@ -1023,8 +1016,12 @@ void RNA_api_strips(StructRNA *srna, const bool metastrip)
-MAXFRAME,
MAXFRAME);
RNA_def_parameter_flags(parm, PropertyFlag(0), PARM_REQUIRED);
parm = RNA_def_enum(
func, "fit_method", scale_fit_methods, SEQ_USE_ORIGINAL_SIZE, "Image Fit Method", nullptr);
parm = RNA_def_enum(func,
"fit_method",
rna_enum_strip_scale_method_items,
SEQ_USE_ORIGINAL_SIZE,
"Image Fit Method",
nullptr);
/* return type */
parm = RNA_def_pointer(func, "sequence", "Strip", "", "New Strip");
RNA_def_function_return(func, parm);

8
source/blender/sequencer/SEQ_add.hh
View File

@@ -31,15 +31,15 @@ enum eLoadFlags {
};
ENUM_OPERATORS(eLoadFlags, SEQ_LOAD_SET_VIEW_TRANSFORM)
/** API for adding new sequence strips. */
/** API for adding new strips. If multiple strips are added, data is updated for each one. */
struct LoadData {
int start_frame;
int channel;
char name[64]; /* Strip name. */
char name[64]; /* Strip name, including file extension. */
/** Typically a `filepath` but may reference any kind of path. */
char path[/*FILE_MAX*/ 1024];
struct {
int len;
int count; /* Number of images in this strip, 1 if not an image sequence. */
int end_frame;
} image; /* Only for image strips. */
Scene *scene; /* Only for scene strips. */
@@ -57,7 +57,7 @@ struct LoadData {
char views_format;
Stereo3dFormat *stereo3d_format;
bool allow_invalid_file; /* Used by RNA API to create placeholder strips. */
double r_video_stream_start; /* For AV synchronization. Set by `SEQ_add_movie_strip`. */
double r_video_stream_start; /* For AV synchronization. Set by `seq::add_movie_strip`. */
bool adjust_playback_rate;
bool allow_overlap;
};

6
source/blender/sequencer/intern/strip_add.cc
View File

@@ -240,9 +240,9 @@ Strip *add_image_strip(Main *bmain, Scene *scene, ListBase *seqbase, LoadData *l
{
Strip *strip = strip_alloc(
seqbase, load_data->start_frame, load_data->channel, STRIP_TYPE_IMAGE);
strip->len = load_data->image.len;
strip->len = load_data->image.count;
StripData *data = strip->data;
data->stripdata = MEM_calloc_arrayN<StripElem>(load_data->image.len, "stripelem");
data->stripdata = MEM_calloc_arrayN<StripElem>(load_data->image.count, "stripelem");
if (strip->len == 1) {
strip->flag |= SEQ_SINGLE_FRAME_CONTENT;
@@ -268,7 +268,7 @@ Strip *add_image_strip(Main *bmain, Scene *scene, ListBase *seqbase, LoadData *l
/* Set image resolution. Assume that all images in sequence are same size. This fields are only
* informative. */
StripElem *strip_elem = data->stripdata;
for (int i = 0; i < load_data->image.len; i++) {
for (int i = 0; i < load_data->image.count; i++) {
strip_elem->orig_width = ibuf->x;
strip_elem->orig_height = ibuf->y;
strip_elem++;