sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Show error when unsupported movie format used

Browse Source 
Was silently failing.
This commit is contained in:
Campbell Barton 2015-09-23 02:40:08 +10:00
parent ad873ca92d
commit 1a59b63e1c
4 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/blenkernel/intern/writeavi.c
View File

@ -147,7 +147,9 @@ bMovieHandle *BKE_movie_handle_get(const char imtype)
#endif #endif
/* in case all above are disabled */ /* in case all above are disabled */
(void)imtype;return &mh; (void)imtype;
return (mh.append_movie != append_stub) ? &mh : NULL;
} }
/* ****************************************************************** */ /* ****************************************************************** */
@ -298,8 +300,10 @@ static void context_free_avi(void *context_v)
void BKE_movie_filepath_get(char *string, RenderData *rd, bool preview, const char *suffix) void BKE_movie_filepath_get(char *string, RenderData *rd, bool preview, const char *suffix)
{ {
bMovieHandle *mh = BKE_movie_handle_get(rd->im_format.imtype); bMovieHandle *mh = BKE_movie_handle_get(rd->im_format.imtype);
if (mh->get_movie_path) if (mh && mh->get_movie_path) {
mh->get_movie_path(string, rd, preview, suffix); mh->get_movie_path(string, rd, preview, suffix);
else }
else {
string[0] = '\0'; string[0] = '\0';
}
} }

15
source/blender/editors/render/render_opengl.c
View File

@ -706,7 +706,7 @@ static void screen_opengl_render_cancel(bContext *C, wmOperator *op)
} }
/* share between invoke and exec */ /* share between invoke and exec */
static int screen_opengl_render_anim_initialize(bContext *C, wmOperator *op) static bool screen_opengl_render_anim_initialize(bContext *C, wmOperator *op)
{ {
/* initialize animation */ /* initialize animation */
OGLRender *oglrender; OGLRender *oglrender;
@ -722,9 +722,16 @@ static int screen_opengl_render_anim_initialize(bContext *C, wmOperator *op)
size_t i, width, height; size_t i, width, height;
BKE_scene_multiview_videos_dimensions_get(&scene->r, oglrender->sizex, oglrender->sizey, &width, &height); BKE_scene_multiview_videos_dimensions_get(&scene->r, oglrender->sizex, oglrender->sizey, &width, &height);
oglrender->movie_ctx_arr = MEM_mallocN(sizeof(void *) * oglrender->totvideos, "Movies");
oglrender->mh = BKE_movie_handle_get(scene->r.im_format.imtype); oglrender->mh = BKE_movie_handle_get(scene->r.im_format.imtype);
if (oglrender->mh == NULL) {
BKE_report(oglrender->reports, RPT_ERROR, "Movie format unsupported");
screen_opengl_render_end(C, oglrender);
return false;
}
oglrender->movie_ctx_arr = MEM_mallocN(sizeof(void *) * oglrender->totvideos, "Movies");
for (i = 0; i < oglrender->totvideos; i++) { for (i = 0; i < oglrender->totvideos; i++) {
const char *suffix = BKE_scene_multiview_view_id_suffix_get(&scene->r, i); const char *suffix = BKE_scene_multiview_view_id_suffix_get(&scene->r, i);
@ -733,7 +740,7 @@ static int screen_opengl_render_anim_initialize(bContext *C, wmOperator *op)
oglrender->sizey, oglrender->reports, PRVRANGEON != 0, suffix)) oglrender->sizey, oglrender->reports, PRVRANGEON != 0, suffix))
{ {
screen_opengl_render_end(C, oglrender); screen_opengl_render_end(C, oglrender);
return 0; return false;
} }
} }
} }
@ -742,7 +749,7 @@ static int screen_opengl_render_anim_initialize(bContext *C, wmOperator *op)
oglrender->nfra = PSFRA; oglrender->nfra = PSFRA;
scene->r.cfra = PSFRA; scene->r.cfra = PSFRA;
return 1; return true;
} }
static bool screen_opengl_render_anim_step(bContext *C, wmOperator *op) static bool screen_opengl_render_anim_step(bContext *C, wmOperator *op)

4
source/blender/editors/screen/screendump.c
View File

@ -354,6 +354,10 @@ static void screenshot_startjob(void *sjv, short *stop, short *do_update, float
if (BKE_imtype_is_movie(rd.im_format.imtype)) { if (BKE_imtype_is_movie(rd.im_format.imtype)) {
mh = BKE_movie_handle_get(sj->scene->r.im_format.imtype); mh = BKE_movie_handle_get(sj->scene->r.im_format.imtype);
if (mh == NULL) {
printf("Movie format unsupported\n");
return;
}
sj->movie_ctx = mh->context_create(); sj->movie_ctx = mh->context_create();
sj->movie_handle = mh; sj->movie_handle = mh;

5
source/blender/render/intern/source/pipeline.c
View File

@ -3517,6 +3517,11 @@ void RE_BlenderAnim(Render *re, Main *bmain, Scene *scene, Object *camera_overri
get_videos_dimensions(re, &rd, &width, &height); get_videos_dimensions(re, &rd, &width, &height);
mh = BKE_movie_handle_get(scene->r.im_format.imtype); mh = BKE_movie_handle_get(scene->r.im_format.imtype);
if (mh == NULL) {
BKE_report(re->reports, RPT_ERROR, "Movie format unsupported");
return;
}
re->movie_ctx_arr = MEM_mallocN(sizeof(void *) * totvideos, "Movies' Context"); re->movie_ctx_arr = MEM_mallocN(sizeof(void *) * totvideos, "Movies' Context");
for (i = 0; i < totvideos; i++) { for (i = 0; i < totvideos; i++) {