projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pot/merge.
[dcpomatic.git]
/
src
/
lib
/
image_decoder.cc
diff --git
a/src/lib/image_decoder.cc
b/src/lib/image_decoder.cc
index b0841688fb23d11114b5af019636f9ab5c301f16..a9e473f25e52e500d807d59a4a662552c28c4a7c 100644
(file)
--- a/
src/lib/image_decoder.cc
+++ b/
src/lib/image_decoder.cc
@@
-22,12
+22,11
@@
#include "image_decoder.h"
#include "video_decoder.h"
#include "image.h"
#include "image_decoder.h"
#include "video_decoder.h"
#include "image.h"
-#include "
magick
_image_proxy.h"
+#include "
ffmpeg
_image_proxy.h"
#include "j2k_image_proxy.h"
#include "film.h"
#include "exceptions.h"
#include "video_content.h"
#include "j2k_image_proxy.h"
#include "film.h"
#include "exceptions.h"
#include "video_content.h"
-#include <Magick++.h>
#include <boost/filesystem.hpp>
#include <iostream>
#include <boost/filesystem.hpp>
#include <iostream>
@@
-37,18
+36,19
@@
using std::cout;
using boost::shared_ptr;
using dcp::Size;
using boost::shared_ptr;
using dcp::Size;
-ImageDecoder::ImageDecoder (shared_ptr<const ImageContent> c, shared_ptr<Log> log)
- : _image_content (c)
+ImageDecoder::ImageDecoder (shared_ptr<const Film> film, shared_ptr<const ImageContent> c)
+ : Decoder (film)
+ , _image_content (c)
, _frame_video_position (0)
{
, _frame_video_position (0)
{
- video.reset (new VideoDecoder (this, c
, log
));
+ video.reset (new VideoDecoder (this, c));
}
}
-void
+bool
ImageDecoder::pass ()
{
if (_frame_video_position >= _image_content->video->length()) {
ImageDecoder::pass ()
{
if (_frame_video_position >= _image_content->video->length()) {
- return;
+ return
true
;
}
if (!_image_content->still() || !_image) {
}
if (!_image_content->still() || !_image) {
@@
-68,18
+68,19
@@
ImageDecoder::pass ()
*/
_image.reset (new J2KImageProxy (path, _image_content->video->size(), pf));
} else {
*/
_image.reset (new J2KImageProxy (path, _image_content->video->size(), pf));
} else {
- _image.reset (new
Magick
ImageProxy (path));
+ _image.reset (new
FFmpeg
ImageProxy (path));
}
}
}
}
- video->set_position (ContentTime::from_frames (_frame_video_position, _image_content->active_video_frame_rate ()));
- video->emit (_image, _frame_video_position);
+ video->emit (film(), _image, _frame_video_position);
++_frame_video_position;
++_frame_video_position;
- return;
+ return
false
;
}
void
}
void
-ImageDecoder::seek (ContentTime time, bool)
+ImageDecoder::seek (ContentTime time, bool
accurate
)
{
{
- _frame_video_position = time.frames_round (_image_content->active_video_frame_rate ());
+ Decoder::seek (
+ time, accurate);
+ _frame_video_position = time.frames_round (_image_content->active_video_frame_rate(film()));
}
}