projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't seek during timeline drags.
[dcpomatic.git]
/
src
/
lib
/
dcp_video.cc
diff --git
a/src/lib/dcp_video.cc
b/src/lib/dcp_video.cc
index acc389d96cba5d684be4c79fe3c3de53fd4a72f6..655c373822ea750aedda3669a52fcccec4db913c 100644
(file)
--- a/
src/lib/dcp_video.cc
+++ b/
src/lib/dcp_video.cc
@@
-1,20
+1,20
@@
/*
/*
- Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
- Taken from code Copyright (C) 2010-2011 Terrence Meiczinger
+ Copyright (C) 2012-2016 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/>.
*/
*/
@@
-31,19
+31,18
@@
#include "dcp_video.h"
#include "config.h"
#include "exceptions.h"
#include "dcp_video.h"
#include "config.h"
#include "exceptions.h"
-#include "server_description.h"
+#include "
encode_
server_description.h"
#include "dcpomatic_socket.h"
#include "image.h"
#include "log.h"
#include "cross.h"
#include "player_video.h"
#include "dcpomatic_socket.h"
#include "image.h"
#include "log.h"
#include "cross.h"
#include "player_video.h"
-#include "raw_convert.h"
#include "compose.hpp"
#include <libcxml/cxml.h>
#include "compose.hpp"
#include <libcxml/cxml.h>
+#include <dcp/raw_convert.h>
#include <dcp/openjpeg_image.h>
#include <dcp/rgb_xyz.h>
#include <dcp/j2k.h>
#include <dcp/openjpeg_image.h>
#include <dcp/rgb_xyz.h>
#include <dcp/j2k.h>
-#include <dcp/colour_matrix.h>
#include <libxml++/libxml++.h>
#include <boost/asio.hpp>
#include <boost/thread.hpp>
#include <libxml++/libxml++.h>
#include <boost/asio.hpp>
#include <boost/thread.hpp>
@@
-62,6
+61,7
@@
using std::cout;
using boost::shared_ptr;
using dcp::Size;
using dcp::Data;
using boost::shared_ptr;
using dcp::Size;
using dcp::Data;
+using dcp::raw_convert;
#define DCI_COEFFICENT (48.0 / 52.37)
#define DCI_COEFFICENT (48.0 / 52.37)
@@
-99,7
+99,7
@@
DCPVideo::convert_to_xyz (shared_ptr<const PlayerVideo> frame, dcp::NoteHandler
{
shared_ptr<dcp::OpenJPEGImage> xyz;
{
shared_ptr<dcp::OpenJPEGImage> xyz;
- shared_ptr<Image> image = frame->image (note);
+ shared_ptr<Image> image = frame->image (note
, bind (&PlayerVideo::keep_xyz_or_rgb, _1), true, false
);
if (frame->colour_conversion()) {
xyz = dcp::rgb_to_xyz (
image->data()[0],
if (frame->colour_conversion()) {
xyz = dcp::rgb_to_xyz (
image->data()[0],
@@
-109,7
+109,7
@@
DCPVideo::convert_to_xyz (shared_ptr<const PlayerVideo> frame, dcp::NoteHandler
note
);
} else {
note
);
} else {
- xyz
= dcp::xyz_to_xyz (image->data()[0], image->size(), image->stride()[0]
);
+ xyz
.reset (new dcp::OpenJPEGImage (image->data()[0], image->size(), image->stride()[0])
);
}
return xyz;
}
return xyz;
@@
-121,8
+121,6
@@
DCPVideo::convert_to_xyz (shared_ptr<const PlayerVideo> frame, dcp::NoteHandler
Data
DCPVideo::encode_locally (dcp::NoteHandler note)
{
Data
DCPVideo::encode_locally (dcp::NoteHandler note)
{
- shared_ptr<dcp::OpenJPEGImage> xyz = convert_to_xyz (_frame, note);
-
Data enc = compress_j2k (
convert_to_xyz (_frame, note),
_j2k_bandwidth,
Data enc = compress_j2k (
convert_to_xyz (_frame, note),
_j2k_bandwidth,
@@
-150,17
+148,18
@@
DCPVideo::encode_locally (dcp::NoteHandler note)
/** Send this frame to a remote server for J2K encoding, then read the result.
* @param serv Server to send to.
/** Send this frame to a remote server for J2K encoding, then read the result.
* @param serv Server to send to.
+ * @param timeout timeout in seconds.
* @return Encoded data.
*/
Data
* @return Encoded data.
*/
Data
-DCPVideo::encode_remotely (
ServerDescription serv
)
+DCPVideo::encode_remotely (
EncodeServerDescription serv, int timeout
)
{
boost::asio::io_service io_service;
boost::asio::ip::tcp::resolver resolver (io_service);
{
boost::asio::io_service io_service;
boost::asio::ip::tcp::resolver resolver (io_service);
- boost::asio::ip::tcp::resolver::query query (serv.host_name(), raw_convert<string> (
Config::instance()->server_port_base ()
));
+ boost::asio::ip::tcp::resolver::query query (serv.host_name(), raw_convert<string> (
ENCODE_FRAME_PORT
));
boost::asio::ip::tcp::resolver::iterator endpoint_iterator = resolver.resolve (query);
boost::asio::ip::tcp::resolver::iterator endpoint_iterator = resolver.resolve (query);
- shared_ptr<Socket> socket (new Socket);
+ shared_ptr<Socket> socket (new Socket
(timeout)
);
socket->connect (*endpoint_iterator);
socket->connect (*endpoint_iterator);
@@
-178,17
+177,17
@@
DCPVideo::encode_remotely (ServerDescription serv)
socket->write ((uint8_t *) xml.c_str(), xml.length() + 1);
/* Send binary data */
socket->write ((uint8_t *) xml.c_str(), xml.length() + 1);
/* Send binary data */
- LOG_TIMING("start-remote-send thread=%1",
boost::this_thread::get_id
());
+ LOG_TIMING("start-remote-send thread=%1",
thread_id
());
_frame->send_binary (socket);
/* Read the response (JPEG2000-encoded data); this blocks until the data
is ready and sent back.
*/
_frame->send_binary (socket);
/* Read the response (JPEG2000-encoded data); this blocks until the data
is ready and sent back.
*/
- LOG_TIMING("start-remote-encode thread=%1",
boost::this_thread::get
_id ());
+ LOG_TIMING("start-remote-encode thread=%1",
thread
_id ());
Data e (socket->read_uint32 ());
Data e (socket->read_uint32 ());
- LOG_TIMING("start-remote-receive thread=%1",
boost::this_thread::get
_id ());
+ LOG_TIMING("start-remote-receive thread=%1",
thread
_id ());
socket->read (e.data().get(), e.size());
socket->read (e.data().get(), e.size());
- LOG_TIMING("finish-remote-receive thread=%1",
boost::this_thread::get
_id ());
+ LOG_TIMING("finish-remote-receive thread=%1",
thread
_id ());
LOG_DEBUG_ENCODE (N_("Finished remotely-encoded frame %1"), _index);
LOG_DEBUG_ENCODE (N_("Finished remotely-encoded frame %1"), _index);