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
/
dcp_video.cc
diff --git
a/src/lib/dcp_video.cc
b/src/lib/dcp_video.cc
index 1f9f76771c3282c96fa2437765e22eba2d652a9d..4a41e17b9c514fe728a081d0e9f7c453fb05c76b 100644
(file)
--- a/
src/lib/dcp_video.cc
+++ b/
src/lib/dcp_video.cc
@@
-47,7
+47,7
@@
#include <dcp/raw_convert.h>
#include <dcp/openjpeg_image.h>
#include <dcp/rgb_xyz.h>
#include <dcp/raw_convert.h>
#include <dcp/openjpeg_image.h>
#include <dcp/rgb_xyz.h>
-#include <dcp/j2k.h>
+#include <dcp/j2k
_transcode
.h>
DCPOMATIC_DISABLE_WARNINGS
#include <libxml++/libxml++.h>
DCPOMATIC_ENABLE_WARNINGS
DCPOMATIC_DISABLE_WARNINGS
#include <libxml++/libxml++.h>
DCPOMATIC_ENABLE_WARNINGS
@@
-59,19
+59,21
@@
DCPOMATIC_ENABLE_WARNINGS
#include "i18n.h"
#include "i18n.h"
+
using std::cout;
using std::make_shared;
using std::shared_ptr;
using std::string;
using std::cout;
using std::make_shared;
using std::shared_ptr;
using std::string;
-using dcp::Size;
using dcp::ArrayData;
using dcp::raw_convert;
#if BOOST_VERSION >= 106100
using namespace boost::placeholders;
#endif
using dcp::ArrayData;
using dcp::raw_convert;
#if BOOST_VERSION >= 106100
using namespace boost::placeholders;
#endif
+
#define DCI_COEFFICENT (48.0 / 52.37)
#define DCI_COEFFICENT (48.0 / 52.37)
+
/** Construct a DCP video frame.
* @param frame Input frame.
* @param index Index of the frame within the DCP.
/** Construct a DCP video frame.
* @param frame Input frame.
* @param index Index of the frame within the DCP.
@@
-103,7
+105,7
@@
DCPVideo::convert_to_xyz (shared_ptr<const PlayerVideo> frame, dcp::NoteHandler
{
shared_ptr<dcp::OpenJPEGImage> xyz;
{
shared_ptr<dcp::OpenJPEGImage> xyz;
- auto image = frame->image (bind(&PlayerVideo::keep_xyz_or_rgb, _1), VideoRange::FULL,
true,
false);
+ auto image = frame->image (bind(&PlayerVideo::keep_xyz_or_rgb, _1), VideoRange::FULL, 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],
@@
-123,15
+125,18
@@
DCPVideo::convert_to_xyz (shared_ptr<const PlayerVideo> frame, dcp::NoteHandler
* @return Encoded data.
*/
ArrayData
* @return Encoded data.
*/
ArrayData
-DCPVideo::encode_locally ()
+DCPVideo::encode_locally ()
const
{
auto const comment = Config::instance()->dcp_j2k_comment();
ArrayData enc = {};
{
auto const comment = Config::instance()->dcp_j2k_comment();
ArrayData enc = {};
- int constexpr minimum_size = 65536;
+ /* This was empirically derived by a user: see #1902 */
+ int const minimum_size = 16384;
+ LOG_GENERAL ("Using minimum frame size %1", minimum_size);
auto xyz = convert_to_xyz (_frame, boost::bind(&Log::dcp_log, dcpomatic_log.get(), _1, _2));
int noise_amount = 2;
auto xyz = convert_to_xyz (_frame, boost::bind(&Log::dcp_log, dcpomatic_log.get(), _1, _2));
int noise_amount = 2;
+ int pixel_skip = 16;
while (true) {
enc = dcp::compress_j2k (
xyz,
while (true) {
enc = dcp::compress_j2k (
xyz,
@@
-143,10
+148,11
@@
DCPVideo::encode_locally ()
);
if (enc.size() >= minimum_size) {
);
if (enc.size() >= minimum_size) {
+ LOG_GENERAL (N_("Frame %1 encoded size was OK (%2)"), _index, enc.size());
break;
}
break;
}
- LOG_GENERAL (N_("Frame %1 encoded size was small (%2); adding noise at level %3
"), _index, enc.size(), noise_amount
);
+ LOG_GENERAL (N_("Frame %1 encoded size was small (%2); adding noise at level %3
with pixel skip %4"), _index, enc.size(), noise_amount, pixel_skip
);
/* The JPEG2000 is too low-bitrate for some decoders <cough>DSS200</cough> so add some noise
* and try again. This is slow but hopefully won't happen too often. We have to do
/* The JPEG2000 is too low-bitrate for some decoders <cough>DSS200</cough> so add some noise
* and try again. This is slow but hopefully won't happen too often. We have to do
@@
-159,13
+165,18
@@
DCPVideo::encode_locally ()
dcpomatic::RNG rng(42);
for (auto c = 0; c < 3; ++c) {
auto p = xyz->data(c);
dcpomatic::RNG rng(42);
for (auto c = 0; c < 3; ++c) {
auto p = xyz->data(c);
- for (auto i = 0; i < pixels; ++i) {
+ auto e = xyz->data(c) + pixels;
+ while (p < e) {
*p = std::min(4095, std::max(0, *p + (rng.get() % noise_amount)));
*p = std::min(4095, std::max(0, *p + (rng.get() % noise_amount)));
-
++
p;
+
p += pixel_ski
p;
}
}
}
}
- ++noise_amount;
+ if (pixel_skip > 1) {
+ --pixel_skip;
+ } else {
+ ++noise_amount;
+ }
/* Something's gone badly wrong if this much noise doesn't help */
DCPOMATIC_ASSERT (noise_amount < 16);
}
/* Something's gone badly wrong if this much noise doesn't help */
DCPOMATIC_ASSERT (noise_amount < 16);
}
@@
-193,7
+204,7
@@
DCPVideo::encode_locally ()
* @return Encoded data.
*/
ArrayData
* @return Encoded data.
*/
ArrayData
-DCPVideo::encode_remotely (EncodeServerDescription serv, int timeout)
+DCPVideo::encode_remotely (EncodeServerDescription serv, int timeout)
const
{
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);
@@
-218,7
+229,7
@@
DCPVideo::encode_remotely (EncodeServerDescription serv, int timeout)
/* Send XML metadata */
auto xml = doc.write_to_string ("UTF-8");
socket->write (xml.length() + 1);
/* Send XML metadata */
auto xml = doc.write_to_string ("UTF-8");
socket->write (xml.length() + 1);
- socket->write ((uint8_t *) xml.c_str(), xml.
length
() + 1);
+ socket->write ((uint8_t *) xml.c_str(), xml.
bytes
() + 1);
/* Send binary data */
LOG_TIMING("start-remote-send thread=%1", thread_id ());
/* Send binary data */
LOG_TIMING("start-remote-send thread=%1", thread_id ());