X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer_video.cc;h=b7fb52e3aa8d8b2c27645a5688b5c96aae62bf06;hb=36e42b01e3209f0e80dde2ac3813ca71cc605b6f;hp=765896a0eb532d9c314143b6ce6929408bf82b85;hpb=5ce9c7026366d82233e8852b9b949362ed2f6191;p=dcpomatic.git

diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc
index 765896a0e..b7fb52e3a 100644
--- a/src/lib/player_video.cc
+++ b/src/lib/player_video.cc
@@ -1,19 +1,20 @@
 /*
     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/>.
 
 */
 
@@ -22,19 +23,26 @@
 #include "image_proxy.h"
 #include "j2k_image_proxy.h"
 #include "film.h"
-#include "raw_convert.h"
+#include <dcp/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;
+using dcp::raw_convert;
 
 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,
@@ -42,7 +50,6 @@ PlayerVideo::PlayerVideo (
 	optional<ColourConversion> colour_conversion
 	)
 	: _in (in)
-	, _time (time)
 	, _crop (crop)
 	, _fade (fade)
 	, _inter_size (inter_size)
@@ -56,9 +63,8 @@ PlayerVideo::PlayerVideo (
 
 PlayerVideo::PlayerVideo (shared_ptr<cxml::Node> node, shared_ptr<Socket> socket)
 {
-	_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"));
@@ -73,7 +79,7 @@ PlayerVideo::PlayerVideo (shared_ptr<cxml::Node> node, shared_ptr<Socket> socket
 	if (node->optional_number_child<int> ("SubtitleX")) {
 
 		shared_ptr<Image> image (
-			new Image (PIX_FMT_RGBA, dcp::Size (node->number_child<int> ("SubtitleWidth"), node->number_child<int> ("SubtitleHeight")), true)
+			new Image (AV_PIX_FMT_RGBA, dcp::Size (node->number_child<int> ("SubtitleWidth"), node->number_child<int> ("SubtitleHeight")), true)
 			);
 
 		image->read_from_socket (socket);
@@ -88,10 +94,16 @@ PlayerVideo::set_subtitle (PositionImage image)
 	_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, 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));
+	shared_ptr<Image> im = _in->image (optional<dcp::NoteHandler> (note), _inter_size);
 
 	Crop total_crop = _crop;
 	switch (_part) {
@@ -116,7 +128,9 @@ PlayerVideo::image (AVPixelFormat pixel_format, dcp::NoteHandler note) const
 		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 (_subtitle) {
 		out->alpha_blend (_subtitle->image, _subtitle->position);
@@ -132,7 +146,6 @@ PlayerVideo::image (AVPixelFormat pixel_format, dcp::NoteHandler note) const
 void
 PlayerVideo::add_metadata (xmlpp::Node* node) const
 {
-	node->add_child("Time")->add_child_text (raw_convert<string> (_time.get ()));
 	_crop.as_xml (node);
 	if (_fade) {
 		node->add_child("Fade")->add_child_text (raw_convert<string> (_fade.get ()));
@@ -142,8 +155,8 @@ PlayerVideo::add_metadata (xmlpp::Node* node) const
 	node->add_child("InterHeight")->add_child_text (raw_convert<string> (_inter_size.height));
 	node->add_child("OutWidth")->add_child_text (raw_convert<string> (_out_size.width));
 	node->add_child("OutHeight")->add_child_text (raw_convert<string> (_out_size.height));
-	node->add_child("Eyes")->add_child_text (raw_convert<string> (_eyes));
-	node->add_child("Part")->add_child_text (raw_convert<string> (_part));
+	node->add_child("Eyes")->add_child_text (raw_convert<string> (static_cast<int> (_eyes)));
+	node->add_child("Part")->add_child_text (raw_convert<string> (static_cast<int> (_part)));
 	if (_colour_conversion) {
 		_colour_conversion.get().as_xml (node);
 	}
@@ -167,14 +180,14 @@ PlayerVideo::send_binary (shared_ptr<Socket> socket) const
 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 () && _out_size == j2k->size() && !_subtitle && !_fade && !_colour_conversion;
 }
 
 Data
@@ -191,9 +204,7 @@ PlayerVideo::inter_position () const
 	return Position<int> ((_out_size.width - _inter_size.width) / 2, (_out_size.height - _inter_size.height) / 2);
 }
 
-/** @return true if this PlayerVideo is definitely the same as another
- * (apart from _time), false if it is probably not
- */
+/** @return true if this PlayerVideo is definitely the same as another, false if it is probably not */
 bool
 PlayerVideo::same (shared_ptr<const PlayerVideo> other) const
 {
@@ -221,3 +232,15 @@ PlayerVideo::same (shared_ptr<const PlayerVideo> other) const
 
 	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;
+}