summaryrefslogtreecommitdiff
path: root/src/lib/dcp_video.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2023-10-18 13:47:29 +0200
committerCarl Hetherington <cth@carlh.net>2023-10-18 13:47:29 +0200
commit1baae6f052775956bab33a8d9ae9f94066227225 (patch)
tree9c634a1b2914d4bf889e171b73c770469415f799 /src/lib/dcp_video.h
parent6eba9bffa2371aa71b8981b1a7bcde0448d7623e (diff)
parentb0c1482f98c7e00634c1bc3dd801e76ce69907e2 (diff)
Merge branch 'grok2' into v2.17.xv2.17.8
This is the DoM support for Aaron Boxer's "grok" GPU J2K encoder, with some cleanups and other assorted/related DoM changes.
Diffstat (limited to 'src/lib/dcp_video.h')
-rw-r--r--src/lib/dcp_video.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/lib/dcp_video.h b/src/lib/dcp_video.h
index 33df0942c..5f43dabb8 100644
--- a/src/lib/dcp_video.h
+++ b/src/lib/dcp_video.h
@@ -17,6 +17,8 @@
along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifndef DCPOMATIC_DCP_VIDEO_H
+#define DCPOMATIC_DCP_VIDEO_H
#include "encode_server_description.h"
@@ -66,6 +68,9 @@ public:
static std::shared_ptr<dcp::OpenJPEGImage> convert_to_xyz (std::shared_ptr<const PlayerVideo> frame, dcp::NoteHandler note);
+ void convert_to_xyz(uint16_t* dst) const;
+ dcp::Size get_size() const;
+
private:
void add_metadata (xmlpp::Element *) const;
@@ -76,3 +81,5 @@ private:
int _j2k_bandwidth; ///< J2K bandwidth to use
Resolution _resolution; ///< Resolution (2K or 4K)
};
+
+#endif