X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=core%2Fvideo_format.h;h=fdbe1bd3ee49fff95159360fd029fa9a0d5eaaaa;hb=f054618ec557df435df17047f6d72b5d36e4b496;hp=ee510e2f627ebf3f08bd4be0299b77fd2d29f0fb;hpb=b894c11dacb36ed21a4bf1b352bcc9cf823b709b;p=casparcg diff --git a/core/video_format.h b/core/video_format.h index ee510e2f6..fdbe1bd3e 100644 --- a/core/video_format.h +++ b/core/video_format.h @@ -51,16 +51,17 @@ struct video_format }; }; -struct video_mode +struct field_mode { enum type { + empty = 0, lower = 1, upper = 2, progressive = 3 // NOTE: progressive == lower | upper; }; - static std::wstring print(video_mode::type value) + static std::wstring print(field_mode::type value) { switch(value) { @@ -82,7 +83,9 @@ struct video_format_desc size_t width; // output frame width size_t height; // output frame height - video_mode::type mode; // progressive, interlaced upper field first, interlaced lower field first + size_t square_width; + size_t square_height; + field_mode::type field_mode; // progressive, interlaced upper field first, interlaced lower field first double fps; // actual framerate, e.g. i50 = 25 fps, p50 = 50 fps size_t time_scale; size_t duration;