#include "j2k_image_proxy.h"
#include "dcpomatic_socket.h"
#include "image.h"
+#include "dcpomatic_assert.h"
#include <dcp/raw_convert.h>
#include <dcp/openjpeg_image.h>
#include <dcp/mono_picture_frame.h>
using std::string;
using std::cout;
using std::max;
+using std::pair;
+using std::make_pair;
using boost::shared_ptr;
using boost::optional;
using boost::dynamic_pointer_cast;
, _size (size)
, _pixel_format (pixel_format)
{
-
+ /* ::image assumes 16bpp */
+ DCPOMATIC_ASSERT (_pixel_format == AV_PIX_FMT_RGB48 || _pixel_format == AV_PIX_FMT_XYZ12LE);
}
J2KImageProxy::J2KImageProxy (
, _pixel_format (pixel_format)
, _forced_reduction (forced_reduction)
{
+ /* ::image assumes 16bpp */
+ DCPOMATIC_ASSERT (_pixel_format == AV_PIX_FMT_RGB48 || _pixel_format == AV_PIX_FMT_XYZ12LE);
memcpy (_data.data().get(), frame->j2k_data(), _data.size ());
}
, _pixel_format (pixel_format)
, _forced_reduction (forced_reduction)
{
+ /* ::image assumes 16bpp */
+ DCPOMATIC_ASSERT (_pixel_format == AV_PIX_FMT_RGB48 || _pixel_format == AV_PIX_FMT_XYZ12LE);
switch (eye) {
case dcp::EYE_LEFT:
_data = Data (frame->left_j2k_size ());
socket->read (_data.data().get (), _data.size ());
}
-void
+int
J2KImageProxy::prepare (optional<dcp::Size> target_size) const
{
boost::mutex::scoped_lock lm (_mutex);
if (_decompressed && target_size == _target_size) {
- return;
+ DCPOMATIC_ASSERT (_reduce);
+ return *_reduce;
}
int reduce = 0;
}
_target_size = target_size;
+ _reduce = reduce;
+
+ return reduce;
}
-shared_ptr<Image>
+pair<shared_ptr<Image>, int>
J2KImageProxy::image (optional<dcp::NoteHandler>, optional<dcp::Size> target_size) const
{
- prepare (target_size);
+ int const reduce = prepare (target_size);
shared_ptr<Image> image (new Image (_pixel_format, _decompressed->size(), true));
}
}
- return image;
+ return make_pair (image, reduce);
}
void
, _size (size)
, _pixel_format (pixel_format)
{
+ /* ::image assumes 16bpp */
+ DCPOMATIC_ASSERT (_pixel_format == AV_PIX_FMT_RGB48 || _pixel_format == AV_PIX_FMT_XYZ12LE);
+}
+size_t
+J2KImageProxy::memory_used () const
+{
+ size_t m = _data.size();
+ if (_decompressed) {
+ /* 3 components, 16-bits per pixel */
+ m += 3 * 2 * _decompressed->size().width * _decompressed->size().height;
+ }
+ return m;
}