#197 Fixed incorrect audio cadence for 60000 / 1001 modes

diff --git a/core/video_format.cpp b/core/video_format.cpp
index 608282ee4ea1fcd7de84549b06ab1ba06c27bc8b..8dff12725b3832f20cd04289dcf1017e17c4b00f 100644 (file)
--- a/core/video_format.cpp
+++ b/core/video_format.cpp
@@ -49,37 +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(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::x1556p2398 ,2048, 1556, 2048, 1556, field_mode::progressive,       24000,  1001,   boost::assign::list_of(2002),                                                                                           L"1556p2398"),\r
-       DEFINE_VIDEOFORMATDESC(video_format::x1556p2400 ,2048, 1556, 2048, 1556, field_mode::progressive,       24,             1,              boost::assign::list_of(2000),                                                                                           L"1556p2400"),\r
-       DEFINE_VIDEOFORMATDESC(video_format::x1556p2500 ,2048, 1556, 2048, 1556, field_mode::progressive,       25,             1,              boost::assign::list_of(1920),                                                                                           L"1556p2500"),\r
-       DEFINE_VIDEOFORMATDESC(video_format::x2160p2398 ,3840, 2160, 3840, 2160, field_mode::progressive,       24000,  1001,   boost::assign::list_of(2002),                                                                                           L"2160p2398"),\r
-       DEFINE_VIDEOFORMATDESC(video_format::x2160p2400 ,3840, 2160, 3840, 2160, field_mode::progressive,       24,             1,              boost::assign::list_of(2000),                                                                                           L"2160p2400"),\r
-       DEFINE_VIDEOFORMATDESC(video_format::x2160p2500 ,3840, 2160, 3840, 2160, field_mode::progressive,       25,             1,              boost::assign::list_of(1920),                                                                                           L"2160p2500"),\r
-       DEFINE_VIDEOFORMATDESC(video_format::x2160p2997 ,3840, 2160, 3840, 2160, field_mode::progressive,       30000,  1001,   boost::assign::list_of(1602)    (1601)    (1602)    (1601)    (1602),           L"2160p2997"),\r
-       DEFINE_VIDEOFORMATDESC(video_format::x2160p3000 ,3840, 2160, 3840, 2160, field_mode::progressive,       30,             1,              boost::assign::list_of(1600),                                                                                           L"2160p3000"),\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) (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) (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::x1556p2398 ,2048, 1556, 2048, 1556, field_mode::progressive,       24000,  1001,   boost::assign::list_of(2002),                                                   L"1556p2398"),\r
+       DEFINE_VIDEOFORMATDESC(video_format::x1556p2400 ,2048, 1556, 2048, 1556, field_mode::progressive,       24,             1,              boost::assign::list_of(2000),                                                   L"1556p2400"),\r
+       DEFINE_VIDEOFORMATDESC(video_format::x1556p2500 ,2048, 1556, 2048, 1556, field_mode::progressive,       25,             1,              boost::assign::list_of(1920),                                                   L"1556p2500"),\r
+       DEFINE_VIDEOFORMATDESC(video_format::x2160p2398 ,3840, 2160, 3840, 2160, field_mode::progressive,       24000,  1001,   boost::assign::list_of(2002),                                                   L"2160p2398"),\r
+       DEFINE_VIDEOFORMATDESC(video_format::x2160p2400 ,3840, 2160, 3840, 2160, field_mode::progressive,       24,             1,              boost::assign::list_of(2000),                                                   L"2160p2400"),\r
+       DEFINE_VIDEOFORMATDESC(video_format::x2160p2500 ,3840, 2160, 3840, 2160, field_mode::progressive,       25,             1,              boost::assign::list_of(1920),                                                   L"2160p2500"),\r
+       DEFINE_VIDEOFORMATDESC(video_format::x2160p2997 ,3840, 2160, 3840, 2160, field_mode::progressive,       30000,  1001,   boost::assign::list_of(1602)(1601)(1602)(1601)(1602),   L"2160p2997"),\r
+       DEFINE_VIDEOFORMATDESC(video_format::x2160p3000 ,3840, 2160, 3840, 2160, field_mode::progressive,       30,             1,              boost::assign::list_of(1600),                                                   L"2160p3000"),\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