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 41a4949ba34bc8397db266d746b7e08163e3b252..15187b11b6aa27ef084e24ea759c27163603194f 100644
(file)
--- a/
src/lib/image_decoder.cc
+++ b/
src/lib/image_decoder.cc
@@
-22,12
+22,12
@@
#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
"frame_interval_checker.h"
#include <boost/filesystem.hpp>
#include <iostream>
#include <boost/filesystem.hpp>
#include <iostream>
@@
-36,24
+36,26
@@
using std::cout;
using boost::shared_ptr;
using dcp::Size;
using std::cout;
using boost::shared_ptr;
using dcp::Size;
+using namespace dcpomatic;
-ImageDecoder::ImageDecoder (shared_ptr<const ImageContent> c, shared_ptr<Log> log)
- : _image_content (c)
- , _video_position (0)
+ImageDecoder::ImageDecoder (shared_ptr<const Film> film, shared_ptr<const ImageContent> c)
+ : Decoder (film)
+ , _image_content (c)
+ , _frame_video_position (0)
{
{
- video.reset (new VideoDecoder (this, c
, log
));
+ video.reset (new VideoDecoder (this, c));
}
bool
}
bool
-ImageDecoder::pass (
PassReason, bool
)
+ImageDecoder::pass ()
{
{
- if (_video_position >= _image_content->video->length()) {
+ if (_
frame_
video_position >= _image_content->video->length()) {
return true;
}
if (!_image_content->still() || !_image) {
/* Either we need an image or we are using moving images, so load one */
return true;
}
if (!_image_content->still() || !_image) {
/* Either we need an image or we are using moving images, so load one */
- boost::filesystem::path path = _image_content->path (_image_content->still() ? 0 : _video_position);
+ boost::filesystem::path path = _image_content->path (_image_content->still() ? 0 : _
frame_
video_position);
if (valid_j2k_file (path)) {
AVPixelFormat pf;
if (_image_content->video->colour_conversion()) {
if (valid_j2k_file (path)) {
AVPixelFormat pf;
if (_image_content->video->colour_conversion()) {
@@
-68,19
+70,18
@@
ImageDecoder::pass (PassReason, bool)
*/
_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));
}
}
}
}
- _position = ContentTime::from_frames (_video_position, _image_content->active_video_frame_rate ());
- video->give (_image, _video_position);
- ++_video_position;
+ video->emit (film(), _image, _frame_video_position);
+ ++_frame_video_position;
return false;
}
void
ImageDecoder::seek (ContentTime time, bool accurate)
{
return false;
}
void
ImageDecoder::seek (ContentTime time, bool accurate)
{
-
video->
seek (time, accurate);
- _
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()
));
}
}