- signal_video (_last_image, true, _last_subtitle, t);
-}
-
-/** Emit our signal to say that some video data is ready.
- * @param image Video frame.
- * @param same true if `image' is the same as the last one we emitted.
- * @param sub Subtitle for this frame, or 0.
- */
-void
-VideoDecoder::signal_video (shared_ptr<Image> image, bool same, shared_ptr<Subtitle> sub, double t)
-{
- TIMING (N_("Decoder emits %1"), _video_frame);
- Video (image, same, sub);
- ++_video_frame;
+ if (image_size != container_size) {
+ assert (image_size.width <= container_size.width);
+ assert (image_size.height <= container_size.height);
+ shared_ptr<Image> im (new SimpleImage (PIX_FMT_RGB24, container_size, true));
+ im->make_black ();
+ im->copy (out, Position ((container_size.width - image_size.width) / 2, (container_size.height - image_size.height) / 2));
+ out = im;
+ }
+
+ Video (out, same, t);
+
+ if (_frame_rate_conversion.repeat) {
+ Video (image, true, t + film->video_frames_to_time (1));
+ _next_video = t + film->video_frames_to_time (2);
+ } else {
+ _next_video = t + film->video_frames_to_time (1);
+ }