Move position variables into the video/audio/subtitle decoder classes.

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

diff --git a/src/lib/j2k_image_proxy.h b/src/lib/j2k_image_proxy.h
index 1d34e7f84e1a218ebc40b052e78a1b6b1cb1feb6..96a776f2a5333bc6100a41629a4cf2919f24f7c6 100644 (file)
--- a/src/lib/j2k_image_proxy.h
+++ b/src/lib/j2k_image_proxy.h
@@ -1,39 +1,38 @@
 /*
     Copyright (C) 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 "image_proxy.h"
-#include "data.h"
 #include <dcp/util.h>
+#include <dcp/data.h>
 
 namespace dcp {
        class MonoPictureFrame;
        class StereoPictureFrame;
 }
 
-class Data;
-
 class J2KImageProxy : public ImageProxy
 {
 public:
-       J2KImageProxy (boost::filesystem::path path, dcp::Size);
-       J2KImageProxy (boost::shared_ptr<const dcp::MonoPictureFrame> frame, dcp::Size);
-       J2KImageProxy (boost::shared_ptr<const dcp::StereoPictureFrame> frame, dcp::Size, dcp::Eye);
+       J2KImageProxy (boost::filesystem::path path, dcp::Size, AVPixelFormat pixel_format);
+       J2KImageProxy (boost::shared_ptr<const dcp::MonoPictureFrame> frame, dcp::Size, AVPixelFormat pixel_format);
+       J2KImageProxy (boost::shared_ptr<const dcp::StereoPictureFrame> frame, dcp::Size, dcp::Eye, AVPixelFormat pixel_format);
        J2KImageProxy (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket);
 
        boost::shared_ptr<Image> image (boost::optional<dcp::NoteHandler> note = boost::optional<dcp::NoteHandler> ()) const;
@@ -41,9 +40,11 @@ public:
        void send_binary (boost::shared_ptr<Socket>) const;
        /** @return true if our image is definitely the same as another, false if it is probably not */
        bool same (boost::shared_ptr<const ImageProxy>) const;
-       AVPixelFormat pixel_format () const;
+       AVPixelFormat pixel_format () const {
+               return _pixel_format;
+       }
 
-       Data j2k () const {
+       dcp::Data j2k () const {
                return _data;
        }
 
@@ -55,11 +56,12 @@ private:
        friend struct client_server_test_j2k;
 
        /* For tests */
-       J2KImageProxy (Data data, dcp::Size size);
+       J2KImageProxy (dcp::Data data, dcp::Size size, AVPixelFormat pixel_format);
        void ensure_j2k () const;
 
-       Data _data;
+       dcp::Data _data;
        dcp::Size _size;
        boost::optional<dcp::Eye> _eye;
        mutable boost::shared_ptr<dcp::OpenJPEGImage> _j2k;
+       AVPixelFormat _pixel_format;
 };