#include "image_proxy.h"
#include "j2k_image_proxy.h"
#include "film.h"
+#include "timer.h"
#include <dcp/raw_convert.h>
extern "C" {
#include <libavutil/pixfmt.h>
using boost::function;
using dcp::Data;
using dcp::raw_convert;
+using namespace dcpomatic;
PlayerVideo::PlayerVideo (
shared_ptr<const ImageProxy> in,
boost::mutex::scoped_lock lm (_mutex);
if (!_image || _crop != _image_crop || _inter_size != _image_inter_size || _out_size != _image_out_size || _fade != _image_fade) {
+ //timestamped_printf("_________________!!! make_image() for %d [%d]\n", time.frames_round(24), !_image);
make_image (pixel_format, aligned, fast);
}
return _image;
}
void
-PlayerVideo::send_binary (shared_ptr<Socket> socket) const
+PlayerVideo::write_to_socket (shared_ptr<Socket> socket) const
{
- _in->send_binary (socket);
+ _in->write_to_socket (socket);
if (_text) {
_text->image->write_to_socket (socket);
}
_crop = content->video->crop();
_fade = content->video->fade(film, _video_frame.get());
- _inter_size = content->video->scale().size(content->video, video_container_size, film_frame_size);
+ _inter_size = scale_for_display(content->video->scaled_size(film_frame_size), video_container_size, film_frame_size);
_out_size = video_container_size;
_colour_conversion = content->video->colour_conversion();
_video_range = content->video->range();