Fix #29824: Error writing frame if 3D scene starts after first frame of animation...

Issue was caused by incorrectly set PTS value frames came form Scene strip renderer.
This value used to be calculated from RenderData current and start frame which
lead to non-uniformuly counting which totally confuses encoder.

Switch append_avi and append_ffmpeg to use current frame from rendering scene
(which was already passing to this functions and was used mostly for logging)
and start frame of rendering scene (it's new parameter added). This allowed to
calculate correct PTS value easily and get rid of global static sframe variable
in writeavi.c file.

diff --git a/source/blender/blenkernel/BKE_writeavi.h b/source/blender/blenkernel/BKE_writeavi.h
index 01a16be18ca2985cbbe827dfb001a270f9a70717..c906761f3d75043cb0d60e005275105834237055 100644 (file)
--- a/source/blender/blenkernel/BKE_writeavi.h
+++ b/source/blender/blenkernel/BKE_writeavi.h
@@ -44,7 +44,8 @@ struct Scene;
 
 typedef struct bMovieHandle {
        int (*start_movie)(struct Scene *scene, struct RenderData *rd, int rectx, int recty, struct ReportList *reports);
-       int (*append_movie)(struct RenderData *rd, int frame, int *pixels, int rectx, int recty, struct ReportList *reports);
+       int (*append_movie)(struct RenderData *rd, int start_frame, int frame, int *pixels,
+                           int rectx, int recty, struct ReportList *reports);
        void (*end_movie)(void);
        int (*get_next_frame)(struct RenderData *rd, struct ReportList *reports); /* optional */
        void (*get_movie_path)(char *string, struct RenderData *rd); /* optional */

diff --git a/source/blender/blenkernel/BKE_writeffmpeg.h b/source/blender/blenkernel/BKE_writeffmpeg.h
index 257ed0ba15fa895100282c1ee35c6edd6784b238..d1babc7ac9a22477f20287c5d46245d9a622e9b4 100644 (file)
--- a/source/blender/blenkernel/BKE_writeffmpeg.h
+++ b/source/blender/blenkernel/BKE_writeffmpeg.h
@@ -68,7 +68,8 @@ struct Scene;
 
 extern int start_ffmpeg(struct Scene *scene, struct RenderData *rd, int rectx, int recty, struct ReportList *reports);
 extern void end_ffmpeg(void);
-extern int append_ffmpeg(struct RenderData *rd, int frame, int *pixels, int rectx, int recty, struct ReportList *reports);
+extern int append_ffmpeg(struct RenderData *rd, int start_frame, int frame, int *pixels,
+                         int rectx, int recty, struct ReportList *reports);
 void filepath_ffmpeg(char* string, struct RenderData* rd);
 
 extern void ffmpeg_set_preset(struct RenderData *rd, int preset);

diff --git a/source/blender/blenkernel/BKE_writeframeserver.h b/source/blender/blenkernel/BKE_writeframeserver.h
index 2117a23b938d079e4d992dccbe7f513dc5db9dad..040550d8faaf81a4e90a8b8a5c1b84860b126f2b 100644 (file)
--- a/source/blender/blenkernel/BKE_writeframeserver.h
+++ b/source/blender/blenkernel/BKE_writeframeserver.h
@@ -42,7 +42,8 @@ struct Scene;
 
 extern int start_frameserver(struct Scene *scene, struct RenderData *rd, int rectx, int recty, struct ReportList *reports);
 extern void end_frameserver(void);
-extern int append_frameserver(struct RenderData *rd, int frame, int *pixels, int rectx, int recty, struct ReportList *reports);
+extern int append_frameserver(struct RenderData *rd, int start_frame, int frame, int *pixels,
+                              int rectx, int recty, struct ReportList *reports);
 extern int frameserver_loop(struct RenderData *rd, struct ReportList *reports);
 
 #ifdef __cplusplus

diff --git a/source/blender/blenkernel/intern/writeavi.c b/source/blender/blenkernel/intern/writeavi.c
index da64c464dceb14d50e58ed51ebfbf0bc89a97d27..dbb37ad9c1d78ca0b112a03d29b112dfedde6584 100644 (file)
--- a/source/blender/blenkernel/intern/writeavi.c
+++ b/source/blender/blenkernel/intern/writeavi.c
@@ -52,7 +52,8 @@
 /* callbacks */
 static int start_avi(Scene *scene, RenderData *rd, int rectx, int recty, ReportList *reports);
 static void end_avi(void);
-static int append_avi(RenderData *rd, int frame, int *pixels, int rectx, int recty, ReportList *reports);
+static int append_avi(RenderData *rd, int start_frame, int frame, int *pixels,
+                      int rectx, int recty, ReportList *reports);
 static void filepath_avi(char *string, RenderData *rd);
 
 /* ********************** general blender movie support ***************************** */
@@ -121,7 +122,6 @@ bMovieHandle *BKE_get_movie_handle(const char imtype)
 
 
 static AviMovie *avi=NULL;
-static int sframe;
 
 static void filepath_avi (char *string, RenderData *rd)
 {
@@ -150,7 +150,6 @@ static int start_avi(Scene *scene, RenderData *rd, int rectx, int recty, ReportL
        
        filepath_avi(name, rd);
 
-       sframe = (rd->sfra);
        x = rectx;
        y = recty;
 
@@ -183,7 +182,8 @@ static int start_avi(Scene *scene, RenderData *rd, int rectx, int recty, ReportL
        return 1;
 }
 
-static int append_avi(RenderData *UNUSED(rd), int frame, int *pixels, int rectx, int recty, ReportList *UNUSED(reports))
+static int append_avi(RenderData *UNUSED(rd), int start_frame, int frame, int *pixels,
+                      int rectx, int recty, ReportList *UNUSED(reports))
 {
        unsigned int *rt1, *rt2, *rectot;
        int x, y;
@@ -212,8 +212,8 @@ static int append_avi(RenderData *UNUSED(rd), int frame, int *pixels, int rectx,
                }
        }
        
-       AVI_write_frame (avi, (frame-sframe), AVI_FORMAT_RGB32, rectot, rectx*recty*4);
-//     printf ("added frame %3d (frame %3d in avi): ", frame, frame-sframe);
+       AVI_write_frame (avi, (frame-start_frame), AVI_FORMAT_RGB32, rectot, rectx*recty*4);
+//     printf ("added frame %3d (frame %3d in avi): ", frame, frame-start_frame);
 
        return 1;
 }

diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c
index bcdd93ed70be1bd8093a3a154eeec2c4c5882228..25b6a3faf0b7d750ecf9ed307d12c9515786c379 100644 (file)
--- a/source/blender/blenkernel/intern/writeffmpeg.c
+++ b/source/blender/blenkernel/intern/writeffmpeg.c
@@ -236,13 +236,13 @@ static const char** get_file_extensions(int format)
 }
 
 /* Write a frame to the output file */
-static int write_video_frame(RenderData *rd, AVFrame* frame, ReportList *reports)
+static int write_video_frame(RenderData *rd, int cfra, AVFrame* frame, ReportList *reports)
 {
        int outsize = 0;
        int ret, success= 1;
        AVCodecContext* c = video_stream->codec;
 
-       frame->pts = rd->cfra - rd->sfra;
+       frame->pts = cfra;
 
        if (rd->mode & R_FIELDS) {
                frame->top_field_first = ((rd->mode & R_ODDFIELD) != 0);
@@ -918,7 +918,7 @@ static void write_audio_frames(double to_pts)
 }
 #endif
 
-int append_ffmpeg(RenderData *rd, int frame, int *pixels, int rectx, int recty, ReportList *reports) 
+int append_ffmpeg(RenderData *rd, int start_frame, int frame, int *pixels, int rectx, int recty, ReportList *reports)
 {
        AVFrame* avframe;
        int success = 1;
@@ -933,7 +933,7 @@ int append_ffmpeg(RenderData *rd, int frame, int *pixels, int rectx, int recty,
        if(video_stream)
        {
                avframe= generate_video_frame((unsigned char*) pixels, reports);
-               success= (avframe && write_video_frame(rd, avframe, reports));
+               success= (avframe && write_video_frame(rd, frame - start_frame, avframe, reports));
 
                if (ffmpeg_autosplit) {
                        if (avio_tell(outfile->pb) > FFMPEG_AUTOSPLIT_SIZE) {

diff --git a/source/blender/blenkernel/intern/writeframeserver.c b/source/blender/blenkernel/intern/writeframeserver.c
index df908aaa00617f87cef5dd72dddc38f305268962..c163155c8fb933b98b5472cbd313302e03753a5d 100644 (file)
--- a/source/blender/blenkernel/intern/writeframeserver.c
+++ b/source/blender/blenkernel/intern/writeframeserver.c
@@ -362,7 +362,8 @@ static void serve_ppm(int *pixels, int rectx, int recty)
        connsock = -1;
 }
 
-int append_frameserver(RenderData *UNUSED(rd), int frame, int *pixels, int rectx, int recty, ReportList *UNUSED(reports))
+int append_frameserver(RenderData *UNUSED(rd), int UNUSED(start_frame), int frame, int *pixels,
+                       int rectx, int recty, ReportList *UNUSED(reports))
 {
        fprintf(stderr, "Serving frame: %d\n", frame);
        if (write_ppm) {

diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c
index a3783bdb342cac5155c7f34d02d3c83532f09593..90e988c030a1d8ed4def04c3985116e8ee45222b 100644 (file)
--- a/source/blender/editors/render/render_opengl.c
+++ b/source/blender/editors/render/render_opengl.c
@@ -488,7 +488,8 @@ static int screen_opengl_render_anim_step(bContext *C, wmOperator *op)
                }
 
                if(BKE_imtype_is_movie(scene->r.im_format.imtype)) {
-                       ok= oglrender->mh->append_movie(&scene->r, CFRA, (int*)ibuf->rect, oglrender->sizex, oglrender->sizey, oglrender->reports);
+                       ok= oglrender->mh->append_movie(&scene->r, SFRA, CFRA, (int*)ibuf->rect,
+                                                       oglrender->sizex, oglrender->sizey, oglrender->reports);
                        if(ok) {
                                printf("Append frame %d", scene->r.cfra);
                                BKE_reportf(op->reports, RPT_INFO, "Appended frame: %d", scene->r.cfra);

diff --git a/source/blender/editors/screen/screendump.c b/source/blender/editors/screen/screendump.c
index 043def31a23ac21a1e9fa93501c2a4e667572d14..e32277e3789b9101c0d57773b045df0d5259a315 100644 (file)
--- a/source/blender/editors/screen/screendump.c
+++ b/source/blender/editors/screen/screendump.c
@@ -302,7 +302,9 @@ static void screenshot_startjob(void *sjv, short *stop, short *do_update, float
                if(sj->dumprect) {
                        
                        if(mh) {
-                               if(mh->append_movie(&rd, rd.cfra, (int *)sj->dumprect, sj->dumpsx, sj->dumpsy, &sj->reports)) {
+                               if(mh->append_movie(&rd, rd.sfra, rd.cfra, (int *)sj->dumprect,
+                                                   sj->dumpsx, sj->dumpsy, &sj->reports))
+                               {
                                        BKE_reportf(&sj->reports, RPT_INFO, "Appended frame: %d", rd.cfra);
                                        printf("Appended frame %d\n", rd.cfra);
                                } else

diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 1d238015e2109478edd68b349bc61c1a06a13133..f585912c18c3e2f9316d620f01aecae9513074c2 100644 (file)
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -2047,7 +2047,8 @@ static int do_write_image_or_movie(Render *re, Main *bmain, Scene *scene, bMovie
                        dofree = 1;
                }
 
-               ok= mh->append_movie(&re->r, scene->r.cfra, (int *)rect32, rres.rectx, rres.recty, re->reports);
+               ok= mh->append_movie(&re->r, scene->r.sfra, scene->r.cfra, (int *)rect32,
+                                    rres.rectx, rres.recty, re->reports);
                if(dofree) {
                        MEM_freeN(rect32);
                }