No-op; fix GPL address and use the explicit-program-name version.

[dcpomatic.git] / src / lib / player_video.h

diff --git a/src/lib/player_video.h b/src/lib/player_video.h
index 0dcc2eeec422295e1bd5e2c8ac108a90ea99c68e..50848cde7d65a1c0121550bb654ef25116726780 100644 (file)
--- a/src/lib/player_video.h
+++ b/src/lib/player_video.h
@@ -1,24 +1,26 @@
 /*
     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 "types.h"
 #include "position.h"
+#include "dcpomatic_time.h"
 #include "colour_conversion.h"
 #include "position_image.h"
 extern "C" {
@@ -29,7 +31,6 @@ extern "C" {
 class Image;
 class ImageProxy;
 class Socket;
-class Data;
 
 /** Everything needed to describe a video frame coming out of the player, but with the
  *  bits still their raw form.  We may want to combine the bits on a remote machine,
@@ -42,7 +43,7 @@ public:
                boost::shared_ptr<const ImageProxy>,
                DCPTime,
                Crop,
-               boost::optional<float>,
+               boost::optional<double>,
                dcp::Size,
                dcp::Size,
                Eyes,
@@ -54,13 +55,16 @@ public:
 
        void set_subtitle (PositionImage);
 
-       boost::shared_ptr<Image> image (AVPixelFormat pix_fmt, dcp::NoteHandler note) const;
+       boost::shared_ptr<Image> image (dcp::NoteHandler note, boost::function<AVPixelFormat (AVPixelFormat)> pixel_format, bool aligned, bool fast) const;
+
+       static AVPixelFormat always_rgb (AVPixelFormat);
+       static AVPixelFormat keep_xyz_or_rgb (AVPixelFormat);
 
        void add_metadata (xmlpp::Node* node) const;
        void send_binary (boost::shared_ptr<Socket> socket) const;
 
        bool has_j2k () const;
-       Data j2k () const;
+       dcp::Data j2k () const;
 
        DCPTime time () const {
                return _time;
@@ -88,7 +92,7 @@ private:
        boost::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;