#include "log.h"
#include "subtitle.h"
+#include "i18n.h"
+
using std::string;
using std::stringstream;
using std::ofstream;
* @param out Required size of output, in pixels (including any padding).
* @param s Scaler to use.
* @param p Number of pixels of padding either side of the image.
- * @param f Index of the frame within the DCP's intrinsic duration.
+ * @param f Index of the frame within the DCP.
* @param fps Frames per second of the Film's source.
* @param pp FFmpeg post-processing string to use.
* @param clut Colour look-up table to use (see Config::colour_lut_index ())
DCPVideoFrame::DCPVideoFrame (
shared_ptr<const Image> yuv, shared_ptr<Subtitle> sub,
Size out, int p, int subtitle_offset, float subtitle_scale,
- Scaler const * s, int f, float fps, string pp, int clut, int bw, Log* l
+ Scaler const * s, int f, int dcp_fps, string pp, int clut, int bw, shared_ptr<Log> l
)
: _input (yuv)
, _subtitle (sub)
, _subtitle_scale (subtitle_scale)
, _scaler (s)
, _frame (f)
- , _frames_per_second (DCPFrameRate(fps).frames_per_second)
+ , _frames_per_second (dcp_fps)
, _post_process (pp)
, _colour_lut (clut)
, _j2k_bandwidth (bw)
_image = opj_image_create (3, &_cmptparm[0], CLRSPC_SRGB);
if (_image == 0) {
- throw EncodeError ("could not create libopenjpeg image");
+ throw EncodeError (N_("could not create libopenjpeg image"));
}
_image->x0 = 0;
_parameters->tcp_numlayers++;
_parameters->cp_disto_alloc = 1;
_parameters->cp_rsiz = CINEMA2K;
- _parameters->cp_comment = strdup ("DVD-o-matic");
+ _parameters->cp_comment = strdup (N_("DVD-o-matic"));
_parameters->cp_cinema = CINEMA2K_24;
/* 3 components, so use MCT */
/* get a J2K compressor handle */
_cinfo = opj_create_compress (CODEC_J2K);
if (_cinfo == 0) {
- throw EncodeError ("could not create JPEG2000 encoder");
+ throw EncodeError (N_("could not create JPEG2000 encoder"));
}
/* Set event manager to null (openjpeg 1.3 bug) */
_cio = opj_cio_open ((opj_common_ptr) _cinfo, 0, 0);
if (_cio == 0) {
- throw EncodeError ("could not open JPEG2000 stream");
+ throw EncodeError (N_("could not open JPEG2000 stream"));
}
int const r = opj_encode (_cinfo, _cio, _image, 0);
if (r == 0) {
- throw EncodeError ("JPEG2000 encoding failed");
+ throw EncodeError (N_("JPEG2000 encoding failed"));
}
- _log->log (String::compose ("Finished locally-encoded frame %1", _frame));
+ _log->log (String::compose (N_("Finished locally-encoded frame %1"), _frame));
return shared_ptr<EncodedData> (new LocallyEncodedData (_cio->buffer, cio_tell (_cio)));
}
shared_ptr<Socket> socket (new Socket);
- socket->connect (*endpoint_iterator, 30);
+ socket->connect (*endpoint_iterator);
stringstream s;
- s << "encode please\n"
- << "input_width " << _input->size().width << "\n"
- << "input_height " << _input->size().height << "\n"
- << "input_pixel_format " << _input->pixel_format() << "\n"
- << "output_width " << _out_size.width << "\n"
- << "output_height " << _out_size.height << "\n"
- << "padding " << _padding << "\n"
- << "subtitle_offset " << _subtitle_offset << "\n"
- << "subtitle_scale " << _subtitle_scale << "\n"
- << "scaler " << _scaler->id () << "\n"
- << "frame " << _frame << "\n"
- << "frames_per_second " << _frames_per_second << "\n";
+ s << N_("encode please\n")
+ << N_("input_width ") << _input->size().width << N_("\n")
+ << N_("input_height ") << _input->size().height << N_("\n")
+ << N_("input_pixel_format ") << _input->pixel_format() << N_("\n")
+ << N_("output_width ") << _out_size.width << N_("\n")
+ << N_("output_height ") << _out_size.height << N_("\n")
+ << N_("padding ") << _padding << N_("\n")
+ << N_("subtitle_offset ") << _subtitle_offset << N_("\n")
+ << N_("subtitle_scale ") << _subtitle_scale << N_("\n")
+ << N_("scaler ") << _scaler->id () << N_("\n")
+ << N_("frame ") << _frame << N_("\n")
+ << N_("frames_per_second ") << _frames_per_second << N_("\n");
if (!_post_process.empty()) {
- s << "post_process " << _post_process << "\n";
+ s << N_("post_process ") << _post_process << N_("\n");
}
- s << "colour_lut " << _colour_lut << "\n"
- << "j2k_bandwidth " << _j2k_bandwidth << "\n";
+ s << N_("colour_lut ") << _colour_lut << N_("\n")
+ << N_("j2k_bandwidth ") << _j2k_bandwidth << N_("\n");
if (_subtitle) {
- s << "subtitle_x " << _subtitle->position().x << "\n"
- << "subtitle_y " << _subtitle->position().y << "\n"
- << "subtitle_width " << _subtitle->image()->size().width << "\n"
- << "subtitle_height " << _subtitle->image()->size().height << "\n";
+ s << N_("subtitle_x ") << _subtitle->position().x << N_("\n")
+ << N_("subtitle_y ") << _subtitle->position().y << N_("\n")
+ << N_("subtitle_width ") << _subtitle->image()->size().width << N_("\n")
+ << N_("subtitle_height ") << _subtitle->image()->size().height << N_("\n");
}
_log->log (String::compose (
- "Sending to remote; pixel format %1, components %2, lines (%3,%4,%5), line sizes (%6,%7,%8)",
+ N_("Sending to remote; pixel format %1, components %2, lines (%3,%4,%5), line sizes (%6,%7,%8)"),
_input->pixel_format(), _input->components(),
_input->lines(0), _input->lines(1), _input->lines(2),
_input->line_size()[0], _input->line_size()[1], _input->line_size()[2]
));
-
- socket->write ((uint8_t *) s.str().c_str(), s.str().length() + 1, 30);
+
+ socket->write (s.str().length() + 1);
+ socket->write ((uint8_t *) s.str().c_str(), s.str().length() + 1);
_input->write_to_socket (socket);
if (_subtitle) {
_subtitle->image()->write_to_socket (socket);
}
- char buffer[32];
- socket->read_indefinite ((uint8_t *) buffer, sizeof (buffer), 30);
- socket->consume (strlen (buffer) + 1);
- shared_ptr<EncodedData> e (new RemotelyEncodedData (atoi (buffer)));
-
- /* now read the rest */
- socket->read_definite_and_consume (e->data(), e->size(), 30);
+ shared_ptr<EncodedData> e (new RemotelyEncodedData (socket->read_uint32 ()));
+ socket->read (e->data(), e->size());
- _log->log (String::compose ("Finished remotely-encoded frame %1", _frame));
+ _log->log (String::compose (N_("Finished remotely-encoded frame %1"), _frame));
return e;
}
_size = boost::filesystem::file_size (file);
_data = new uint8_t[_size];
- FILE* f = fopen (file.c_str(), "rb");
+ FILE* f = fopen (file.c_str(), N_("rb"));
if (!f) {
- throw FileError ("could not open file for reading", file);
+ throw FileError (_("could not open file for reading"), file);
}
fread (_data, 1, _size, f);
}
/** Write this data to a J2K file.
- * @param opt Options.
- * @param frame DCP Frame index.
+ * @param Film Film.
+ * @param frame DCP frame index.
*/
void
EncodedData::write (shared_ptr<const Film> film, int frame) const
{
- string const tmp_j2k = film->frame_out_path (frame, true);
+ string const tmp_j2c = film->j2c_path (frame, true);
- FILE* f = fopen (tmp_j2k.c_str (), "wb");
+ FILE* f = fopen (tmp_j2c.c_str (), N_("wb"));
if (!f) {
- throw WriteFileError (tmp_j2k, errno);
+ throw WriteFileError (tmp_j2c, errno);
}
fwrite (_data, 1, _size, f);
fclose (f);
- string const real_j2k = film->frame_out_path (frame, false);
+ string const real_j2c = film->j2c_path (frame, false);
/* Rename the file from foo.j2c.tmp to foo.j2c now that it is complete */
- boost::filesystem::rename (tmp_j2k, real_j2k);
+ boost::filesystem::rename (tmp_j2c, real_j2c);
+}
- /* Write a file containing the hash */
- string const hash = film->hash_out_path (frame, false);
- ofstream h (hash.c_str());
- h << md5_digest (_data, _size) << "\n";
- h.close ();
+void
+EncodedData::write_info (shared_ptr<const Film> film, int frame, libdcp::FrameInfo fin) const
+{
+ string const info = film->info_path (frame);
+ ofstream h (info.c_str());
+ fin.write (h);
}
/** Send this data to a socket.
void
EncodedData::send (shared_ptr<Socket> socket)
{
- stringstream s;
- s << _size;
- socket->write ((uint8_t *) s.str().c_str(), s.str().length() + 1, 30);
- socket->write (_data, _size, 30);
+ socket->write (_size);
+ socket->write (_data, _size);
}
LocallyEncodedData::LocallyEncodedData (uint8_t* d, int s)