/*
Copyright (C) 2013-2015 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.
- 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
- 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/>.
*/
#include "j2k_image_proxy.h"
#include "film.h"
#include "raw_convert.h"
+extern "C" {
+#include <libavutil/pixfmt.h>
+}
+#include <libxml++/libxml++.h>
+#include <iostream>
using std::string;
using std::cout;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
using boost::optional;
+using boost::function;
+using dcp::Data;
PlayerVideo::PlayerVideo (
shared_ptr<const ImageProxy> in,
DCPTime time,
Crop crop,
- boost::optional<float> fade,
+ boost::optional<double> fade,
dcp::Size inter_size,
dcp::Size out_size,
Eyes eyes,
{
_time = DCPTime (node->number_child<DCPTime::Type> ("Time"));
_crop = Crop (node);
- _fade = node->optional_number_child<float> ("Fade");
+ _fade = node->optional_number_child<double> ("Fade");
_inter_size = dcp::Size (node->number_child<int> ("InterWidth"), node->number_child<int> ("InterHeight"));
_out_size = dcp::Size (node->number_child<int> ("OutWidth"), node->number_child<int> ("OutHeight"));
if (node->optional_number_child<int> ("SubtitleX")) {
- _subtitle.position = Position<int> (node->number_child<int> ("SubtitleX"), node->number_child<int> ("SubtitleY"));
-
- _subtitle.image.reset (
- new Image (PIX_FMT_RGBA, dcp::Size (node->number_child<int> ("SubtitleWidth"), node->number_child<int> ("SubtitleHeight")), true)
+ shared_ptr<Image> image (
+ new Image (AV_PIX_FMT_RGBA, dcp::Size (node->number_child<int> ("SubtitleWidth"), node->number_child<int> ("SubtitleHeight")), true)
);
- _subtitle.image->read_from_socket (socket);
+ image->read_from_socket (socket);
+
+ _subtitle = PositionImage (image, Position<int> (node->number_child<int> ("SubtitleX"), node->number_child<int> ("SubtitleY")));
}
}
_subtitle = image;
}
+/** Create an image for this frame.
+ * @param note Handler for any notes that are made during the process.
+ * @param pixel_format Function which is called to decide what pixel format the output image should be;
+ * it is passed the pixel format of the input image from the ImageProxy, and should return the desired
+ * output pixel format. Two functions always_rgb and keep_xyz_or_rgb are provided for use here.
+ */
shared_ptr<Image>
-PlayerVideo::image (AVPixelFormat pixel_format, bool burn_subtitle, dcp::NoteHandler note) const
+PlayerVideo::image (dcp::NoteHandler note, function<AVPixelFormat (AVPixelFormat)> pixel_format, bool aligned, bool fast) const
{
shared_ptr<Image> im = _in->image (optional<dcp::NoteHandler> (note));
yuv_to_rgb = _colour_conversion.get().yuv_to_rgb();
}
- shared_ptr<Image> out = im->crop_scale_window (total_crop, _inter_size, _out_size, yuv_to_rgb, pixel_format, true);
+ shared_ptr<Image> out = im->crop_scale_window (
+ total_crop, _inter_size, _out_size, yuv_to_rgb, pixel_format (_in->pixel_format()), aligned, fast
+ );
- if (burn_subtitle && _subtitle.image) {
- out->alpha_blend (_subtitle.image, _subtitle.position);
+ if (_subtitle) {
+ out->alpha_blend (_subtitle->image, _subtitle->position);
}
if (_fade) {
}
void
-PlayerVideo::add_metadata (xmlpp::Node* node, bool send_subtitles) const
+PlayerVideo::add_metadata (xmlpp::Node* node) const
{
node->add_child("Time")->add_child_text (raw_convert<string> (_time.get ()));
_crop.as_xml (node);
if (_colour_conversion) {
_colour_conversion.get().as_xml (node);
}
- if (send_subtitles && _subtitle.image) {
- node->add_child ("SubtitleWidth")->add_child_text (raw_convert<string> (_subtitle.image->size().width));
- node->add_child ("SubtitleHeight")->add_child_text (raw_convert<string> (_subtitle.image->size().height));
- node->add_child ("SubtitleX")->add_child_text (raw_convert<string> (_subtitle.position.x));
- node->add_child ("SubtitleY")->add_child_text (raw_convert<string> (_subtitle.position.y));
+ if (_subtitle) {
+ node->add_child ("SubtitleWidth")->add_child_text (raw_convert<string> (_subtitle->image->size().width));
+ node->add_child ("SubtitleHeight")->add_child_text (raw_convert<string> (_subtitle->image->size().height));
+ node->add_child ("SubtitleX")->add_child_text (raw_convert<string> (_subtitle->position.x));
+ node->add_child ("SubtitleY")->add_child_text (raw_convert<string> (_subtitle->position.y));
}
}
void
-PlayerVideo::send_binary (shared_ptr<Socket> socket, bool send_subtitles) const
+PlayerVideo::send_binary (shared_ptr<Socket> socket) const
{
_in->send_binary (socket);
- if (send_subtitles && _subtitle.image) {
- _subtitle.image->write_to_socket (socket);
+ if (_subtitle) {
+ _subtitle->image->write_to_socket (socket);
}
}
bool
PlayerVideo::has_j2k () const
{
- /* XXX: burnt-in subtitle; maybe other things */
+ /* XXX: maybe other things */
shared_ptr<const J2KImageProxy> j2k = dynamic_pointer_cast<const J2KImageProxy> (_in);
if (!j2k) {
return false;
}
- return _crop == Crop () && _inter_size == j2k->size();
+ return _crop == Crop () && _inter_size == j2k->size() && !_subtitle && !_fade && !_colour_conversion;
}
Data
_out_size != other->_out_size ||
_eyes != other->_eyes ||
_part != other->_part ||
- _colour_conversion != other->_colour_conversion ||
- !_subtitle.same (other->_subtitle)) {
+ _colour_conversion != other->_colour_conversion) {
+ return false;
+ }
+ if ((!_subtitle && other->_subtitle) || (_subtitle && !other->_subtitle)) {
+ /* One has a subtitle and the other doesn't */
return false;
}
+ if (_subtitle && other->_subtitle && !_subtitle->same (other->_subtitle.get ())) {
+ /* They both have subtitles but they are different */
+ return false;
+ }
+
+ /* Now neither has subtitles */
+
return _in->same (other->_in);
}
+
+AVPixelFormat
+PlayerVideo::always_rgb (AVPixelFormat)
+{
+ return AV_PIX_FMT_RGB24;
+}
+
+AVPixelFormat
+PlayerVideo::keep_xyz_or_rgb (AVPixelFormat p)
+{
+ return p == AV_PIX_FMT_XYZ12LE ? AV_PIX_FMT_XYZ12LE : AV_PIX_FMT_RGB48LE;
+}
projects / dcpomatic.git / blobdiff