]> git.sesse.net Git - casparcg/blobdiff - core/video_format.cpp
Made ffmpeg producer output relative path (to media folder) via OSC instead of absolu...
[casparcg] / core / video_format.cpp
index 1a15474d661fb83464985c145dc6252f766d032d..7db4520743f088fb6693aae6b5b58c011a84f037 100644 (file)
@@ -1,5 +1,5 @@
 /*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
 *\r
 * This file is part of CasparCG (www.casparcg.com).\r
 *\r
@@ -41,7 +41,6 @@
        ((w)*(h)*4),\\r
        (name),\\r
        (48000),\\r
-       (2),\\r
        (audio_samples)\\r
 }\r
 \r
@@ -50,23 +49,37 @@ namespace caspar { namespace core {
        \r
 const video_format_desc format_descs[video_format::count] =  \r
 {                                                                         \r
-       DEFINE_VIDEOFORMATDESC(video_format::pal                ,720,  576,  1024, 576,  field_mode::upper,                     25,             1,               boost::assign::list_of(3840),                                                  L"PAL"), \r
-       DEFINE_VIDEOFORMATDESC(video_format::ntsc               ,720,  486,  720,  534,  field_mode::lower,                     30000,  1001,    boost::assign::list_of(3204)(3202)(3204)(3202)(3204),  L"NTSC"), \r
-       DEFINE_VIDEOFORMATDESC(video_format::x576p2500  ,720,  576,  720,  576,  field_mode::progressive,       25,             1,               boost::assign::list_of(3840),                                                  L"576p2500"),\r
-       DEFINE_VIDEOFORMATDESC(video_format::x720p2500  ,1280, 720,  1280, 720,  field_mode::progressive,       25,             1,               boost::assign::list_of(3840),                                                  L"720p2500"), \r
-       DEFINE_VIDEOFORMATDESC(video_format::x720p5000  ,1280, 720,  1280, 720,  field_mode::progressive,       50,             1,               boost::assign::list_of(1920),                                                  L"720p5000"), \r
-       DEFINE_VIDEOFORMATDESC(video_format::x720p5994  ,1280, 720,  1280, 720,  field_mode::progressive,       60000,  1001,    boost::assign::list_of(1602)(1601)(1602)(1601)(1602),  L"720p5994"),\r
-       DEFINE_VIDEOFORMATDESC(video_format::x720p6000  ,1280, 720,  1280, 720,  field_mode::progressive,       60,             1,               boost::assign::list_of(1600),                                                  L"720p6000"),\r
-       DEFINE_VIDEOFORMATDESC(video_format::x1080p2397 ,1920, 1080, 1920, 1080, field_mode::progressive,       24000,  1001,    boost::assign::list_of(4004),                                                  L"1080p2398"),\r
-       DEFINE_VIDEOFORMATDESC(video_format::x1080p2400 ,1920, 1080, 1920, 1080, field_mode::progressive,       24,             1,               boost::assign::list_of(4000),                                                  L"1080p2400"),\r
-       DEFINE_VIDEOFORMATDESC(video_format::x1080i5000 ,1920, 1080, 1920, 1080, field_mode::upper,                     25,             1,               boost::assign::list_of(3840),                                                  L"1080i5000"),\r
-       DEFINE_VIDEOFORMATDESC(video_format::x1080i5994 ,1920, 1080, 1920, 1080, field_mode::upper,                     30000,  1001,    boost::assign::list_of(3204)(3202)(3204)(3202)(3204),  L"1080i5994"),\r
-       DEFINE_VIDEOFORMATDESC(video_format::x1080i6000 ,1920, 1080, 1920, 1080, field_mode::upper,                     30,             1,               boost::assign::list_of(3200),                                                  L"1080i6000"),\r
-       DEFINE_VIDEOFORMATDESC(video_format::x1080p2500 ,1920, 1080, 1920, 1080, field_mode::progressive,       25,             1,               boost::assign::list_of(3840),                                                  L"1080p2500"),\r
-       DEFINE_VIDEOFORMATDESC(video_format::x1080p2997 ,1920, 1080, 1920, 1080, field_mode::progressive,       30000,  1001,    boost::assign::list_of(3204)(3202)(3204)(3202)(3204),  L"1080p2997"),\r
-       DEFINE_VIDEOFORMATDESC(video_format::x1080p3000 ,1920, 1080, 1920, 1080, field_mode::progressive,       30,             1,               boost::assign::list_of(3200),                                                  L"1080p3000"),\r
-       DEFINE_VIDEOFORMATDESC(video_format::x1080p5000 ,1920, 1080, 1920, 1080, field_mode::progressive,       50,             1,               boost::assign::list_of(1920),                                                  L"1080p5000"),\r
-       DEFINE_VIDEOFORMATDESC(video_format::invalid    ,0,             0,   0,         0,   field_mode::progressive,   1,              1,               boost::assign::list_of(1),                                                             L"invalid")\r
+       DEFINE_VIDEOFORMATDESC(video_format::pal                ,720,  576,  1024, 576,  field_mode::upper,                     25,             1,              boost::assign::list_of(1920),                                                                                           L"PAL"), \r
+       DEFINE_VIDEOFORMATDESC(video_format::ntsc               ,720,  486,  720,  540,  field_mode::lower,                     30000,  1001,   boost::assign::list_of(1602)    (1601)    (1602)    (1601)    (1602),           L"NTSC"), \r
+       DEFINE_VIDEOFORMATDESC(video_format::x576p2500  ,1024, 576,  1024, 576,  field_mode::progressive,       25,             1,              boost::assign::list_of(1920),                                                                                           L"576p2500"),\r
+       DEFINE_VIDEOFORMATDESC(video_format::x720p2398  ,1280, 720,  1280, 720,  field_mode::progressive,       24000,  1001,   boost::assign::list_of(2002),                                                                                           L"720p2398"),\r
+       DEFINE_VIDEOFORMATDESC(video_format::x720p2400  ,1280, 720,  1280, 720,  field_mode::progressive,       24,             1,              boost::assign::list_of(2000),                                                                                           L"720p2400"),\r
+       DEFINE_VIDEOFORMATDESC(video_format::x720p2500  ,1280, 720,  1280, 720,  field_mode::progressive,       25,             1,              boost::assign::list_of(1920),                                                                                           L"720p2500"), \r
+       DEFINE_VIDEOFORMATDESC(video_format::x720p5000  ,1280, 720,  1280, 720,  field_mode::progressive,       50,             1,              boost::assign::list_of(960),                                                                                            L"720p5000"), \r
+       DEFINE_VIDEOFORMATDESC(video_format::x720p2997  ,1280, 720,  1280, 720,  field_mode::progressive,       30000,  1001,   boost::assign::list_of(1602)    (1601)    (1602)    (1601)    (1602),           L"720p2997"),\r
+       DEFINE_VIDEOFORMATDESC(video_format::x720p5994  ,1280, 720,  1280, 720,  field_mode::progressive,       60000,  1001,   boost::assign::list_of(801)(801)(800)(801)(801)(801)(800)(801)(801)(801),       L"720p5994"),\r
+       DEFINE_VIDEOFORMATDESC(video_format::x720p3000  ,1280, 720,  1280, 720,  field_mode::progressive,       30,             1,              boost::assign::list_of(1600),                                                                                           L"720p3000"),\r
+       DEFINE_VIDEOFORMATDESC(video_format::x720p6000  ,1280, 720,  1280, 720,  field_mode::progressive,       60,             1,              boost::assign::list_of(800),                                                                                            L"720p6000"),\r
+       DEFINE_VIDEOFORMATDESC(video_format::x1080p2398 ,1920, 1080, 1920, 1080, field_mode::progressive,       24000,  1001,   boost::assign::list_of(2002),                                                                                           L"1080p2398"),\r
+       DEFINE_VIDEOFORMATDESC(video_format::x1080p2400 ,1920, 1080, 1920, 1080, field_mode::progressive,       24,             1,              boost::assign::list_of(2000),                                                                                           L"1080p2400"),\r
+       DEFINE_VIDEOFORMATDESC(video_format::x1080i5000 ,1920, 1080, 1920, 1080, field_mode::upper,                     25,             1,              boost::assign::list_of(1920),                                                                                           L"1080i5000"),\r
+       DEFINE_VIDEOFORMATDESC(video_format::x1080i5994 ,1920, 1080, 1920, 1080, field_mode::upper,                     30000,  1001,   boost::assign::list_of(1602)    (1601)    (1602)    (1601)    (1602),           L"1080i5994"),\r
+       DEFINE_VIDEOFORMATDESC(video_format::x1080i6000 ,1920, 1080, 1920, 1080, field_mode::upper,                     30,             1,              boost::assign::list_of(1600),                                                                                           L"1080i6000"),\r
+       DEFINE_VIDEOFORMATDESC(video_format::x1080p2500 ,1920, 1080, 1920, 1080, field_mode::progressive,       25,             1,              boost::assign::list_of(1920),                                                                                           L"1080p2500"),\r
+       DEFINE_VIDEOFORMATDESC(video_format::x1080p2997 ,1920, 1080, 1920, 1080, field_mode::progressive,       30000,  1001,   boost::assign::list_of(1602)    (1601)    (1602)    (1601)    (1602),           L"1080p2997"),\r
+       DEFINE_VIDEOFORMATDESC(video_format::x1080p3000 ,1920, 1080, 1920, 1080, field_mode::progressive,       30,             1,              boost::assign::list_of(1600),                                                                                           L"1080p3000"),\r
+       DEFINE_VIDEOFORMATDESC(video_format::x1080p5000 ,1920, 1080, 1920, 1080, field_mode::progressive,       50,             1,              boost::assign::list_of(960),                                                                                            L"1080p5000"),\r
+       DEFINE_VIDEOFORMATDESC(video_format::x1080p5994 ,1920, 1080, 1920, 1080, field_mode::progressive,       60000,  1001,   boost::assign::list_of(801)(801)(800)(801)(801)(801)(800)(801)(801)(801),       L"1080p5994"),\r
+       DEFINE_VIDEOFORMATDESC(video_format::x1080p6000 ,1920, 1080, 1920, 1080, field_mode::progressive,       60,             1,              boost::assign::list_of(800),                                                                                            L"1080p6000"),\r
+       DEFINE_VIDEOFORMATDESC(video_format::x2k2398    ,2048, 1556, 2048, 1556, field_mode::progressive,        24000, 1001,   boost::assign::list_of(2002),                                                                                           L"2k2398"),\r
+       DEFINE_VIDEOFORMATDESC(video_format::x2k2400    ,2048, 1556, 2048, 1556, field_mode::progressive,        24,    1,              boost::assign::list_of(2000),                                                                                           L"2k2400"),\r
+       DEFINE_VIDEOFORMATDESC(video_format::x2k2500    ,2048, 1556, 2048, 1556, field_mode::progressive,        25,    1,              boost::assign::list_of(1920),                                                                                           L"2k2500"),\r
+       DEFINE_VIDEOFORMATDESC(video_format::x4k2398    ,3840, 2160, 3840, 2160, field_mode::progressive,        24000, 1001,   boost::assign::list_of(2002),                                                                                           L"4k2398"),\r
+       DEFINE_VIDEOFORMATDESC(video_format::x4k2400    ,3840, 2160, 3840, 2160, field_mode::progressive,        24,    1,              boost::assign::list_of(2000),                                                                                           L"4k2400"),\r
+       DEFINE_VIDEOFORMATDESC(video_format::x4k2500    ,3840, 2160, 3840, 2160, field_mode::progressive,        25,    1,              boost::assign::list_of(1920),                                                                                           L"4k2500"),\r
+       DEFINE_VIDEOFORMATDESC(video_format::x4k2997    ,3840, 2160, 3840, 2160, field_mode::progressive,        30000, 1001,   boost::assign::list_of(1602)    (1601)    (1602)    (1601)    (1602),           L"4k2398"),\r
+       DEFINE_VIDEOFORMATDESC(video_format::x4k3000    ,3840, 2160, 3840, 2160, field_mode::progressive,        30,    1,              boost::assign::list_of(1600),                                                                                           L"4k3000"),\r
+       DEFINE_VIDEOFORMATDESC(video_format::invalid    ,0,             0,   0,         0,   field_mode::progressive,    1,             1,              boost::assign::list_of(1),                                                                                                      L"invalid")\r
 };\r
 \r
 const video_format_desc& video_format_desc::get(video_format::type format)     \r