summaryrefslogtreecommitdiff
path: root/src/lib/jpeg2000_encoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-05-02 20:43:11 +0100
committerCarl Hetherington <cth@carlh.net>2016-03-21 16:41:07 +0000
commita405e599c422db81886ff7a12155aa285cd9719e (patch)
treef89fbbb3eef01c1fce75db5cdd9e02782aaed02e /src/lib/jpeg2000_encoder.cc
parentf6a12c7e9f862bdd47d7e80448bb2a44830c2826 (diff)
A few fixes to poznan setup.
Diffstat (limited to 'src/lib/jpeg2000_encoder.cc')
-rw-r--r--src/lib/jpeg2000_encoder.cc12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/lib/jpeg2000_encoder.cc b/src/lib/jpeg2000_encoder.cc
index fd0780a38..617e9fa7b 100644
--- a/src/lib/jpeg2000_encoder.cc
+++ b/src/lib/jpeg2000_encoder.cc
@@ -37,15 +37,15 @@ void
JPEG2000Encoder::setup_encoders ()
{
try {
- _encoders.push_back (shared_ptr<JPEG2000Encoder> (new OpenJPEGEncoder ()));
- } catch (JPEG2000EncoderUnavailableException &) {
-
+ _encoders.push_back (shared_ptr<JPEG2000Encoder> (new PoznanEncoder ()));
+ } catch (JPEG2000EncoderUnavailableException& e) {
+ std::cerr << e.what() << "\n";
}
try {
- _encoders.push_back (shared_ptr<JPEG2000Encoder> (new PoznanEncoder ()));
+ _encoders.push_back (shared_ptr<JPEG2000Encoder> (new OpenJPEGEncoder ()));
} catch (JPEG2000EncoderUnavailableException &) {
-
+
}
}
@@ -70,6 +70,8 @@ JPEG2000Encoder::from_id (string id)
shared_ptr<EncodedData>
JPEG2000Encoder::encode (shared_ptr<const dcp::XYZImage> input, dcp::NoteHandler note, int bandwidth, int frame_rate, Resolution resolution, bool threed)
{
+ std::cout << "Encoding with " << name() << "\n";
+
if (!_bandwidth || _bandwidth.get() != bandwidth ||
!_frame_rate || _frame_rate.get() != frame_rate ||
!_resolution || _resolution.get() != resolution ||