X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Ftypes.h;h=0702c873405c07a823bb13ccbe03150052bf6fe4;hp=cc4cd9296b077edc53f04e11e1a0cc3d3871d668;hb=f80e2f7b370c3a6dfa8a78c9665a8eaf43a05f03;hpb=e8c1880a2b9a40eb11ee259feee3edd799139a43 diff --git a/src/lib/types.h b/src/lib/types.h index cc4cd9296..0702c8734 100644 --- a/src/lib/types.h +++ b/src/lib/types.h @@ -1,78 +1,106 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2016 Carl Hetherington - 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 . */ #ifndef DCPOMATIC_TYPES_H #define DCPOMATIC_TYPES_H +#include "position.h" +#include "rect.h" +#include +#include #include #include -#include -#include class Content; class VideoContent; class AudioContent; class SubtitleContent; class FFmpegContent; -class AudioBuffers; + +namespace cxml { + class Node; +} + +namespace xmlpp { + class Node; +} /** The version number of the protocol used to communicate * with servers. Intended to be bumped when incompatibilities - * are introduced. + * are introduced. v2 uses 64+n */ -#define SERVER_LINK_VERSION 1 - -typedef int64_t DCPTime; -#define TIME_MAX INT64_MAX -#define TIME_HZ ((DCPTime) 96000) -typedef int64_t ContentTime; -typedef int64_t AudioFrame; -typedef int VideoFrame; +#define SERVER_LINK_VERSION (64+0) + +/** A film of F seconds at f FPS will be Ff frames; + Consider some delta FPS d, so if we run the same + film at (f + d) FPS it will last F(f + d) seconds. + + Hence the difference in length over the length of the film will + be F(f + d) - Ff frames + = Ff + Fd - Ff frames + = Fd frames + = Fd/f seconds + + So if we accept a difference of 1 frame, ie 1/f seconds, we can + say that + + 1/f = Fd/f + ie 1 = Fd + ie d = 1/F + + So for a 3hr film, ie F = 3 * 60 * 60 = 10800, the acceptable + FPS error is 1/F ~= 0.0001 ~= 1e-4 +*/ +#define VIDEO_FRAME_RATE_EPSILON (1e-4) + +/** Port on which EncodeServer listens for frame encoding requests */ +#define ENCODE_FRAME_PORT (Config::instance()->server_port_base()) +/** Port on which EncodeServer listens for DCPOMATIC_HELLO from masters */ +#define HELLO_PORT (Config::instance()->server_port_base()+1) +/** Port on which EncodeServerFinder listens for replies to DCPOMATIC_HELLO from servers */ +#define SERVER_PRESENCE_PORT (Config::instance()->server_port_base()+2) +/** Port on which batch converter listens for job requests */ +#define BATCH_JOB_PORT (Config::instance()->server_port_base()+3) + typedef std::vector > ContentList; -typedef std::vector > VideoContentList; -typedef std::vector > AudioContentList; -typedef std::vector > SubtitleContentList; typedef std::vector > FFmpegContentList; -template -struct TimedAudioBuffers -{ - TimedAudioBuffers () - : time (0) - {} - - TimedAudioBuffers (boost::shared_ptr a, T t) - : audio (a) - , time (t) - {} - - boost::shared_ptr audio; - T time; -}; +typedef int64_t Frame; enum VideoFrameType { VIDEO_FRAME_TYPE_2D, + /** `True' 3D content, e.g. 3D DCPs */ + VIDEO_FRAME_TYPE_3D, VIDEO_FRAME_TYPE_3D_LEFT_RIGHT, - VIDEO_FRAME_TYPE_3D_TOP_BOTTOM + VIDEO_FRAME_TYPE_3D_TOP_BOTTOM, + VIDEO_FRAME_TYPE_3D_ALTERNATE, + /** This content is all the left frames of some 3D */ + VIDEO_FRAME_TYPE_3D_LEFT, + /** This content is all the right frames of some 3D */ + VIDEO_FRAME_TYPE_3D_RIGHT }; +std::string video_frame_type_to_string (VideoFrameType); +VideoFrameType string_to_video_frame_type (std::string); + enum Eyes { EYES_BOTH, @@ -81,6 +109,22 @@ enum Eyes EYES_COUNT }; +enum Part +{ + PART_LEFT_HALF, + PART_RIGHT_HALF, + PART_TOP_HALF, + PART_BOTTOM_HALF, + PART_WHOLE +}; + +enum ReelType +{ + REELTYPE_SINGLE, + REELTYPE_BY_VIDEO_CONTENT, + REELTYPE_BY_LENGTH +}; + /** @struct Crop * @brief A description of the crop of an image or video. */ @@ -88,6 +132,7 @@ struct Crop { Crop () : left (0), right (0), top (0), bottom (0) {} Crop (int l, int r, int t, int b) : left (l), right (r), top (t), bottom (b) {} + Crop (boost::shared_ptr); /** Number of pixels to remove from the left-hand side */ int left; @@ -109,9 +154,26 @@ struct Crop if (s.height < minimum) { s.height = minimum; } - + return s; } + + void as_xml (xmlpp::Node *) const; +}; + +struct CPLSummary +{ + CPLSummary (std::string d, std::string i, std::string a, boost::filesystem::path f) + : dcp_directory (d) + , cpl_id (i) + , cpl_annotation_text (a) + , cpl_file (f) + {} + + std::string dcp_directory; + std::string cpl_id; + std::string cpl_annotation_text; + boost::filesystem::path cpl_file; }; extern bool operator== (Crop const & a, Crop const & b); @@ -125,4 +187,9 @@ enum Resolution { std::string resolution_to_string (Resolution); Resolution string_to_resolution (std::string); +enum Protocol { + PROTOCOL_SCP, + PROTOCOL_FTP +}; + #endif