projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
C++11 and whitespace cleanups.
[dcpomatic.git]
/
src
/
lib
/
image_decoder.cc
diff --git
a/src/lib/image_decoder.cc
b/src/lib/image_decoder.cc
index 2f7416c62630eaf740e4039532d71fb87e9d6ea4..59dc4e873fd92fcaa5a0723351b6fda862ff51ad 100644
(file)
--- a/
src/lib/image_decoder.cc
+++ b/
src/lib/image_decoder.cc
@@
-18,35
+18,38
@@
*/
*/
+
+#include "exceptions.h"
+#include "ffmpeg_image_proxy.h"
+#include "film.h"
+#include "frame_interval_checker.h"
+#include "image.h"
#include "image_content.h"
#include "image_decoder.h"
#include "image_content.h"
#include "image_decoder.h"
-#include "video_decoder.h"
-#include "image.h"
-#include "ffmpeg_image_proxy.h"
#include "j2k_image_proxy.h"
#include "j2k_image_proxy.h"
-#include "film.h"
-#include "exceptions.h"
#include "video_content.h"
#include "video_content.h"
-#include "
frame_interval_check
er.h"
+#include "
video_decod
er.h"
#include <boost/filesystem.hpp>
#include <iostream>
#include "i18n.h"
#include <boost/filesystem.hpp>
#include <iostream>
#include "i18n.h"
+
using std::cout;
using std::make_shared;
using std::shared_ptr;
using dcp::Size;
using namespace dcpomatic;
using std::cout;
using std::make_shared;
using std::shared_ptr;
using dcp::Size;
using namespace dcpomatic;
+
ImageDecoder::ImageDecoder (shared_ptr<const Film> film, shared_ptr<const ImageContent> c)
: Decoder (film)
, _image_content (c)
ImageDecoder::ImageDecoder (shared_ptr<const Film> film, shared_ptr<const ImageContent> c)
: Decoder (film)
, _image_content (c)
- , _frame_video_position (0)
{
video = make_shared<VideoDecoder>(this, c);
}
{
video = make_shared<VideoDecoder>(this, c);
}
+
bool
ImageDecoder::pass ()
{
bool
ImageDecoder::pass ()
{
@@
-71,7
+74,7
@@
ImageDecoder::pass ()
*/
_image = make_shared<J2KImageProxy>(path, _image_content->video->size(), pf);
} else {
*/
_image = make_shared<J2KImageProxy>(path, _image_content->video->size(), pf);
} else {
- _image = make_shared<FFmpegImageProxy>(path
, _image_content->video->range()
);
+ _image = make_shared<FFmpegImageProxy>(path);
}
}
}
}
@@
-80,6
+83,7
@@
ImageDecoder::pass ()
return false;
}
return false;
}
+
void
ImageDecoder::seek (ContentTime time, bool accurate)
{
void
ImageDecoder::seek (ContentTime time, bool accurate)
{