projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
imagemagick_decoder.cc
diff --git
a/src/lib/imagemagick_decoder.cc
b/src/lib/imagemagick_decoder.cc
index 279c8bf3290ab36276fa7afb1627e3cfced1b3e3..7049b7d6e31945ace55eadd9e16bc4ef6f04a170 100644
(file)
--- a/
src/lib/imagemagick_decoder.cc
+++ b/
src/lib/imagemagick_decoder.cc
@@
-52,15
+52,23
@@
ImageMagickDecoder::native_size () const
return s;
}
return s;
}
+int
+ImageMagickDecoder::video_length () const
+{
+ return _imagemagick_content->video_length ();
+}
+
bool
ImageMagickDecoder::pass ()
{
bool
ImageMagickDecoder::pass ()
{
- if (_position > 0 && _position < _imagemagick_content->video_length ()) {
- repeat_last_video ();
+ if (_position < 0 || _position >= _imagemagick_content->video_length ()) {
+ return true;
+ }
+
+ if (have_last_video ()) {
+ repeat_last_video (double (_position) / 24);
_position++;
return false;
_position++;
return false;
- } else if (_position >= _imagemagick_content->video_length ()) {
- return true;
}
Magick::Image* magick_image = new Magick::Image (_imagemagick_content->file().string ());
}
Magick::Image* magick_image = new Magick::Image (_imagemagick_content->file().string ());
@@
-84,7
+92,7
@@
ImageMagickDecoder::pass ()
image = image->crop (_film->crop(), true);
image = image->crop (_film->crop(), true);
- emit_video (image,
0
);
+ emit_video (image,
double (_position) / 24
);
++_position;
return false;
++_position;
return false;
@@
-97,16
+105,6
@@
ImageMagickDecoder::pixel_format () const
return PIX_FMT_RGB24;
}
return PIX_FMT_RGB24;
}
-bool
-ImageMagickDecoder::seek_to_last ()
-{
- if (_position > 0) {
- --_position;
- }
-
- return false;
-}
-
bool
ImageMagickDecoder::seek (double t)
{
bool
ImageMagickDecoder::seek (double t)
{
@@
-120,11
+118,3
@@
ImageMagickDecoder::seek (double t)
_position = f;
return false;
}
_position = f;
return false;
}
-
-void
-ImageMagickDecoder::film_changed (Film::Property p)
-{
- if (p == Film::CROP) {
- OutputChanged ();
- }
-}