projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use $HOME rather than hard-coded user name.
[dcpomatic.git]
/
src
/
lib
/
image_examiner.cc
diff --git
a/src/lib/image_examiner.cc
b/src/lib/image_examiner.cc
index 7a93b5cd1439a9bfa0757d6946e965ffa32c5788..15a0b043d56543c8451cfd243c27204afc336f16 100644
(file)
--- a/
src/lib/image_examiner.cc
+++ b/
src/lib/image_examiner.cc
@@
-1,94
+1,108
@@
/*
/*
- Copyright (C) 2013-20
15
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-20
21
Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
+
+#include "compose.hpp"
+#include "config.h"
+#include "cross.h"
+#include "exceptions.h"
+#include "ffmpeg_image_proxy.h"
+#include "film.h"
+#include "image.h"
#include "image_content.h"
#include "image_examiner.h"
#include "image_content.h"
#include "image_examiner.h"
-#include "film.h"
#include "job.h"
#include "job.h"
-#include "exceptions.h"
-#include "config.h"
-#include "cross.h"
-#include "compose.hpp"
#include <dcp/openjpeg_image.h>
#include <dcp/exceptions.h>
#include <dcp/openjpeg_image.h>
#include <dcp/exceptions.h>
-#include <Magick++.h>
+#include <dcp/filesystem.h>
+#include <dcp/j2k_transcode.h>
#include <iostream>
#include "i18n.h"
#include <iostream>
#include "i18n.h"
+
using std::cout;
using std::list;
using std::cout;
using std::list;
+using std::shared_ptr;
using std::sort;
using std::sort;
-using boost::shared_ptr;
using boost::optional;
using boost::optional;
+
ImageExaminer::ImageExaminer (shared_ptr<const Film> film, shared_ptr<const ImageContent> content, shared_ptr<Job>)
: _film (film)
, _image_content (content)
{
ImageExaminer::ImageExaminer (shared_ptr<const Film> film, shared_ptr<const ImageContent> content, shared_ptr<Job>)
: _film (film)
, _image_content (content)
{
-#ifdef DCPOMATIC_IMAGE_MAGICK
- using namespace MagickCore;
-#endif
- boost::filesystem::path path = content->path(0).string ();
+ auto path = content->path(0);
if (valid_j2k_file (path)) {
if (valid_j2k_file (path)) {
-
boost::uintmax_t size = boost::filesystem::file_size
(path);
-
FILE* f = fopen_boost
(path, "rb");
+
auto size = dcp::filesystem::file_size
(path);
+
dcp::File f
(path, "rb");
if (!f) {
throw FileError ("Could not open file for reading", path);
}
if (!f) {
throw FileError ("Could not open file for reading", path);
}
-
uint8_t* buffer = new uint8_t[size]
;
- f
read (buffer, 1, size, f
);
- f
close (f
);
+
std::vector<uint8_t> buffer(size)
;
+ f
.checked_read(buffer.data(), size
);
+ f
.close(
);
try {
try {
- _video_size = dcp::decompress_j2k (buffer, size, 0)->size ();
- } catch (dcp::DCPReadError& e) {
- delete[] buffer;
+ _video_size = dcp::decompress_j2k(buffer.data(), size, 0)->size();
+ } catch (dcp::ReadError& e) {
throw DecodeError (String::compose (_("Could not decode JPEG2000 file %1 (%2)"), path, e.what ()));
}
throw DecodeError (String::compose (_("Could not decode JPEG2000 file %1 (%2)"), path, e.what ()));
}
- delete[] buffer;
} else {
} else {
- Magick::Image* image = new Magick::Image (content->path(0).string());
- _video_size = dcp::Size (image->columns(), image->rows());
- delete image;
+ FFmpegImageProxy proxy(content->path(0));
+ _video_size = proxy.image(Image::Alignment::COMPACT).image->size();
}
if (content->still ()) {
}
if (content->still ()) {
- _video_length = Config::instance()->default_still_length() * video_frame_rate().get_value_or (
24
);
+ _video_length = Config::instance()->default_still_length() * video_frame_rate().get_value_or (
film->video_frame_rate ()
);
} else {
_video_length = _image_content->number_of_paths ();
}
}
} else {
_video_length = _image_content->number_of_paths ();
}
}
-dcp::Size
+
+optional<dcp::Size>
ImageExaminer::video_size () const
{
ImageExaminer::video_size () const
{
- return _video_size
.get ()
;
+ return _video_size;
}
}
+
optional<double>
ImageExaminer::video_frame_rate () const
{
optional<double>
ImageExaminer::video_frame_rate () const
{
- if (_image_content->video_frame_rate()
!= 0
) {
+ if (_image_content->video_frame_rate()) {
/* The content already knows what frame rate it should be */
/* The content already knows what frame rate it should be */
- return _image_content->video_frame_rate();
+ return _image_content->video_frame_rate()
.get()
;
}
/* Don't know */
}
/* Don't know */
- return optional<double> ();
+ return {};
+}
+
+
+bool
+ImageExaminer::yuv () const
+{
+ /* We never convert ImageSource from YUV to RGB (though maybe sometimes we should)
+ so it makes sense to just say they are never YUV so the option of a conversion
+ to RGB is not offered.
+ */
+ return false;
}
}