namespace caspar { namespace core {
const std::vector<video_format_desc> format_descs = boost::assign::list_of
- (video_format_desc(video_format::pal, 720, 576, 1024, 576, field_mode::upper, 25, 1, L"PAL", boost::assign::list_of<int>(3840)))
+ (video_format_desc(video_format::pal, 720, 576, 1024, 576, field_mode::upper, 25, 1, L"PAL", boost::assign::list_of<int>(3840) ))
(video_format_desc(video_format::ntsc, 720, 486, 720, 540, field_mode::lower, 30000, 1001, L"NTSC", boost::assign::list_of<int>(3204)(3202)(3204)(3202)(3204)))
- (video_format_desc(video_format::x576p2500, 720, 576, 720, 576, field_mode::progressive, 25, 1, L"576p2500", boost::assign::list_of<int>(3840) ))
- (video_format_desc(video_format::x720p2500, 1280, 720, 1280, 720, field_mode::progressive, 25, 1, L"720p2500", boost::assign::list_of<int>(3840) ))
- (video_format_desc(video_format::x720p5000, 1280, 720, 1280, 720, field_mode::progressive, 50, 1, L"720p5000", boost::assign::list_of<int>(1920) ))
+ (video_format_desc(video_format::x576p2500, 720, 576, 720, 576, field_mode::progressive, 25, 1, L"576p2500", boost::assign::list_of<int>(3840) ))
+ (video_format_desc(video_format::x720p2398, 1280, 720, 1280, 720, field_mode::progressive, 24000, 1001, L"720p2398", boost::assign::list_of<int>(4004) ))
+ (video_format_desc(video_format::x720p2400, 1280, 720, 1280, 720, field_mode::progressive, 24, 1, L"720p2400", boost::assign::list_of<int>(4000) ))
+ (video_format_desc(video_format::x720p2500, 1280, 720, 1280, 720, field_mode::progressive, 25, 1, L"720p2500", boost::assign::list_of<int>(3840) ))
+ (video_format_desc(video_format::x720p5000, 1280, 720, 1280, 720, field_mode::progressive, 50, 1, L"720p5000", boost::assign::list_of<int>(1920) ))
+ (video_format_desc(video_format::x720p2997, 1280, 720, 1280, 720, field_mode::progressive, 30000, 1001, L"720p2997", boost::assign::list_of<int>(3204)(3202)(3204)(3202)(3204)))
(video_format_desc(video_format::x720p5994, 1280, 720, 1280, 720, field_mode::progressive, 60000, 1001, L"720p5994", boost::assign::list_of<int>(1602)(1601)(1602)(1601)(1602)))
- (video_format_desc(video_format::x720p6000, 1280, 720, 1280, 720, field_mode::progressive, 60, 1, L"720p6000", boost::assign::list_of<int>(1600) ))
- (video_format_desc(video_format::x1080p2397, 1920, 1080, 1920, 1080, field_mode::progressive, 24000, 1001, L"1080p2398", boost::assign::list_of<int>(4004) ))
- (video_format_desc(video_format::x1080p2400, 1920, 1080, 1920, 1080, field_mode::progressive, 24, 1, L"1080p2400", boost::assign::list_of<int>(4000) ))
- (video_format_desc(video_format::x1080i5000, 1920, 1080, 1920, 1080, field_mode::upper, 25, 1, L"1080i5000", boost::assign::list_of<int>(3840) ))
+ (video_format_desc(video_format::x720p3000, 1280, 720, 1280, 720, field_mode::progressive, 30, 1, L"720p3000", boost::assign::list_of<int>(3200) ))
+ (video_format_desc(video_format::x720p6000, 1280, 720, 1280, 720, field_mode::progressive, 60, 1, L"720p6000", boost::assign::list_of<int>(1600) ))
+ (video_format_desc(video_format::x1080p2398, 1920, 1080, 1920, 1080, field_mode::progressive, 24000, 1001, L"1080p2398", boost::assign::list_of<int>(4004) ))
+ (video_format_desc(video_format::x1080p2400, 1920, 1080, 1920, 1080, field_mode::progressive, 24, 1, L"1080p2400", boost::assign::list_of<int>(4000) ))
+ (video_format_desc(video_format::x1080i5000, 1920, 1080, 1920, 1080, field_mode::upper, 25, 1, L"1080i5000", boost::assign::list_of<int>(3840) ))
(video_format_desc(video_format::x1080i5994, 1920, 1080, 1920, 1080, field_mode::upper, 30000, 1001, L"1080i5994", boost::assign::list_of<int>(3204)(3202)(3204)(3202)(3204)))
- (video_format_desc(video_format::x1080i6000, 1920, 1080, 1920, 1080, field_mode::upper, 30, 1, L"1080i6000", boost::assign::list_of<int>(3200) ))
- (video_format_desc(video_format::x1080p2500, 1920, 1080, 1920, 1080, field_mode::progressive, 25, 1, L"1080p2500", boost::assign::list_of<int>(3840) ))
+ (video_format_desc(video_format::x1080i6000, 1920, 1080, 1920, 1080, field_mode::upper, 30, 1, L"1080i6000", boost::assign::list_of<int>(3200) ))
+ (video_format_desc(video_format::x1080p2500, 1920, 1080, 1920, 1080, field_mode::progressive, 25, 1, L"1080p2500", boost::assign::list_of<int>(3840) ))
(video_format_desc(video_format::x1080p2997, 1920, 1080, 1920, 1080, field_mode::progressive, 30000, 1001, L"1080p2997", boost::assign::list_of<int>(3204)(3202)(3204)(3202)(3204)))
- (video_format_desc(video_format::x1080p3000, 1920, 1080, 1920, 1080, field_mode::progressive, 30, 1, L"1080p3000", boost::assign::list_of<int>(3200) ))
- (video_format_desc(video_format::x1080p5000, 1920, 1080, 1920, 1080, field_mode::progressive, 50, 1, L"1080p5000", boost::assign::list_of<int>(1920) ))
- (video_format_desc(video_format::invalid, 0, 0, 0, 0, field_mode::progressive, 1, 1, L"invalid", boost::assign::list_of<int>(1) ));
+ (video_format_desc(video_format::x1080p3000, 1920, 1080, 1920, 1080, field_mode::progressive, 30, 1, L"1080p3000", boost::assign::list_of<int>(3200) ))
+ (video_format_desc(video_format::x1080p5000, 1920, 1080, 1920, 1080, field_mode::progressive, 50, 1, L"1080p5000", boost::assign::list_of<int>(1920) ))
+ (video_format_desc(video_format::x1080p5994, 1920, 1080, 1920, 1080, field_mode::progressive, 60000, 1001, L"1080p5994", boost::assign::list_of<int>(1602)(1601)(1602)(1601)(1602)))
+ (video_format_desc(video_format::x1080p6000, 1920, 1080, 1920, 1080, field_mode::progressive, 60, 1, L"1080p6000", boost::assign::list_of<int>(1600) ))
+ (video_format_desc(video_format::invalid, 0, 0, 0, 0, field_mode::progressive, 1, 1, L"invalid", boost::assign::list_of<int>(1) ));
video_format_desc::video_format_desc(video_format format,
int width,
case core::video_format::pal: return bmdModePAL;
case core::video_format::ntsc: return bmdModeNTSC;
case core::video_format::x576p2500: return (BMDDisplayMode)ULONG_MAX;
+ case core::video_format::x720p2398: return (BMDDisplayMode)ULONG_MAX;
+ case core::video_format::x720p2400: return (BMDDisplayMode)ULONG_MAX;
case core::video_format::x720p2500: return (BMDDisplayMode)ULONG_MAX;
case core::video_format::x720p5000: return bmdModeHD720p50;
+ case core::video_format::x720p2997: return (BMDDisplayMode)ULONG_MAX;
case core::video_format::x720p5994: return bmdModeHD720p5994;
+ case core::video_format::x720p3000: return (BMDDisplayMode)ULONG_MAX;
case core::video_format::x720p6000: return bmdModeHD720p60;
- case core::video_format::x1080p2397: return bmdModeHD1080p2398;
+ case core::video_format::x1080p2398: return bmdModeHD1080p2398;
case core::video_format::x1080p2400: return bmdModeHD1080p24;
case core::video_format::x1080i5000: return bmdModeHD1080i50;
case core::video_format::x1080i5994: return bmdModeHD1080i5994;
case core::video_format::x1080p2997: return bmdModeHD1080p2997;
case core::video_format::x1080p3000: return bmdModeHD1080p30;
case core::video_format::x1080p5000: return bmdModeHD1080p50;
+ case core::video_format::x1080p5994: return bmdModeHD1080p5994;
+ case core::video_format::x1080p6000: return bmdModeHD1080p6000;
default: return (BMDDisplayMode)ULONG_MAX;
}
}
case bmdModeHD720p50: return core::video_format::x720p5000;
case bmdModeHD720p5994: return core::video_format::x720p5994;
case bmdModeHD720p60: return core::video_format::x720p6000;
- case bmdModeHD1080p2398: return core::video_format::x1080p2397;
+ case bmdModeHD1080p2398: return core::video_format::x1080p2398;
case bmdModeHD1080p24: return core::video_format::x1080p2400;
case bmdModeHD1080i50: return core::video_format::x1080i5000;
case bmdModeHD1080i5994: return core::video_format::x1080i5994;
case bmdModeHD1080i6000: return core::video_format::x1080i6000;
- case bmdModeHD1080p25: return core::video_format::x1080p2500;
- case bmdModeHD1080p2997: return core::video_format::x1080p2997;
- case bmdModeHD1080p30: return core::video_format::x1080p3000;
- case bmdModeHD1080p50: return core::video_format::x1080p5000;
+ case bmdModeHD1080p25: return core::video_format::x1080p2500;
+ case bmdModeHD1080p2997: return core::video_format::x1080p2997;
+ case bmdModeHD1080p30: return core::video_format::x1080p3000;
+ case bmdModeHD1080p50: return core::video_format::x1080p5000;
+ case bmdModeHD1080p5994: return core::video_format::x1080p5994;
+ case bmdModeHD1080p6000: return core::video_format::x1080p6000;
default: return core::video_format::invalid;
}
}