X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=core%2Fvideo_format.h;h=0016f2d24b47449a20db02b235e498d9066775ee;hb=e05a326e32e82cd89ecdcf58a481d835f9c1fca8;hp=90ff1f806ecd640a55ade16b7dc0796206e603bc;hpb=e21b90217d8da42369477942139a8c4146236488;p=casparcg diff --git a/core/video_format.h b/core/video_format.h index 90ff1f806..0016f2d24 100644 --- a/core/video_format.h +++ b/core/video_format.h @@ -27,6 +27,8 @@ #include +#include + namespace caspar { namespace core { enum class video_format @@ -83,22 +85,23 @@ ENUM_ENABLE_BITWISE(field_mode); struct video_format_desc final { - video_format format; + video_format format; - int width; - int height; - int square_width; - int square_height; - core::field_mode field_mode; // progressive, interlaced upper field first, interlaced lower field first - double fps; // actual framerate = duration/time_scale, e.g. i50 = 25 fps, p50 = 50 fps - int time_scale; - int duration; - int field_count; - std::size_t size; // frame size in bytes - std::wstring name; // name of output format + int width; + int height; + int square_width; + int square_height; + core::field_mode field_mode; // progressive, interlaced upper field first, interlaced lower field first + double fps; // actual framerate = duration/time_scale, e.g. i50 = 25 fps, p50 = 50 fps + boost::rational framerate; + int time_scale; + int duration; + int field_count; + std::size_t size; // frame size in bytes + std::wstring name; // name of output format - int audio_sample_rate; - std::vector audio_cadence; // rotating optimal number of samples per frame + int audio_sample_rate; + std::vector audio_cadence; // rotating optimal number of samples per frame video_format_desc(video_format format, int width,