X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=core%2Fvideo_format.cpp;h=792afb4623aeef64da6c22a2003c4af858a1a2bd;hb=19340cfde28bca046b81e2575f93ffc432ee731d;hp=f0c6b04af80ecd59167049bfea56a0598f044c46;hpb=de5b6c0f75961f39927449ca45e7c0045c996204;p=casparcg

diff --git a/core/video_format.cpp b/core/video_format.cpp
index f0c6b04af..792afb462 100644
--- a/core/video_format.cpp
+++ b/core/video_format.cpp
@@ -28,37 +28,43 @@
 namespace caspar { namespace core {
 	
 	const std::vector<video_format_desc> format_descs = {
-		{ video_format::pal,        720,  576,  1024, 576,  field_mode::upper,       25,    1,    L"PAL",       { 1920                         } },
-		{ video_format::ntsc,       720,  486,  720,  540,  field_mode::lower,       30000, 1001, L"NTSC",      { 1602, 1601, 1602, 1601, 1602 } },
-		{ video_format::x576p2500,  720,  576,  1024, 576,  field_mode::progressive, 25,    1,    L"576p2500",  { 1920                         } },
-		{ video_format::x720p2398,  1280, 720,  1280, 720,  field_mode::progressive, 24000, 1001, L"720p2398",  { 2002                         } },
-		{ video_format::x720p2400,  1280, 720,  1280, 720,  field_mode::progressive, 24,    1,    L"720p2400",  { 2000                         } },
-		{ video_format::x720p2500,  1280, 720,  1280, 720,  field_mode::progressive, 25,    1,    L"720p2500",  { 1920                         } },
-		{ video_format::x720p5000,  1280, 720,  1280, 720,  field_mode::progressive, 50,    1,    L"720p5000",  { 960                          } },
-		{ video_format::x720p2997,  1280, 720,  1280, 720,  field_mode::progressive, 30000, 1001, L"720p2997",  { 1602, 1601, 1602, 1601, 1602 } },
-		{ video_format::x720p5994,  1280, 720,  1280, 720,  field_mode::progressive, 60000, 1001, L"720p5994",  { 801,  800,  801,  801,  801  } },
-		{ video_format::x720p3000,  1280, 720,  1280, 720,  field_mode::progressive, 30,    1,    L"720p3000",  { 1600                         } },
-		{ video_format::x720p6000,  1280, 720,  1280, 720,  field_mode::progressive, 60,    1,    L"720p6000",  { 800                          } },
-		{ video_format::x1080p2398, 1920, 1080, 1920, 1080, field_mode::progressive, 24000, 1001, L"1080p2398", { 2002                         } },
-		{ video_format::x1080p2400, 1920, 1080, 1920, 1080, field_mode::progressive, 24,    1,    L"1080p2400", { 2000                         } },
-		{ video_format::x1080i5000, 1920, 1080, 1920, 1080, field_mode::upper,       25,    1,    L"1080i5000", { 1920                         } },
-		{ video_format::x1080i5994, 1920, 1080, 1920, 1080, field_mode::upper,       30000, 1001, L"1080i5994", { 1602, 1601, 1602, 1601, 1602 } },
-		{ video_format::x1080i6000, 1920, 1080, 1920, 1080, field_mode::upper,       30,    1,    L"1080i6000", { 1600                         } },
-		{ video_format::x1080p2500, 1920, 1080, 1920, 1080, field_mode::progressive, 25,    1,    L"1080p2500", { 1920                         } },
-		{ video_format::x1080p2997, 1920, 1080, 1920, 1080, field_mode::progressive, 30000, 1001, L"1080p2997", { 1602, 1601, 1602, 1601, 1602 } },
-		{ video_format::x1080p3000, 1920, 1080, 1920, 1080, field_mode::progressive, 30,    1,    L"1080p3000", { 1600                         } },
-		{ video_format::x1080p5000, 1920, 1080, 1920, 1080, field_mode::progressive, 50,    1,    L"1080p5000", { 960                          } },
-		{ video_format::x1080p5994, 1920, 1080, 1920, 1080, field_mode::progressive, 60000, 1001, L"1080p5994", { 801,  800,  801,  801,  801  } },
-		{ video_format::x1080p6000, 1920, 1080, 1920, 1080, field_mode::progressive, 60,    1,    L"1080p6000", { 800                          } },
-		{ video_format::x2k2398,    2048, 1556, 2048, 1556, field_mode::progressive, 24000, 1001, L"2k2398",    { 2002                         } },
-		{ video_format::x2k2400,    2048, 1556, 2048, 1556, field_mode::progressive, 24,    1,    L"2k2400",    { 2000                         } },
-		{ video_format::x2k2500,    2048, 1556, 2048, 1556, field_mode::progressive, 25,    1,    L"2k2500",    { 1920                         } },
-		{ video_format::x4k2398,    3840, 2160, 3840, 2160, field_mode::progressive, 24000, 1001, L"4k2398",    { 2002                         } },
-		{ video_format::x4k2400,    3840, 2160, 3840, 2160, field_mode::progressive, 24,    1,    L"4k2400",    { 2000                         } },
-		{ video_format::x4k2500,    3840, 2160, 3840, 2160, field_mode::progressive, 25,    1,    L"4k2500",    { 1920                         } },
-		{ video_format::x4k2997,    3840, 2160, 3840, 2160, field_mode::progressive, 30000, 1001, L"4k2398",    { 1602, 1601, 1602, 1601, 1602 } },
-		{ video_format::x4k3000,    3840, 2160, 3840, 2160, field_mode::progressive, 30,    1,    L"4k3000",    { 1600                         } },
-		{ video_format::invalid,    0,    0,    0,    0,    field_mode::progressive, 1,     1,    L"invalid",   { 1                            } }
+		{ video_format::pal,          720,  576,  1024, 576,  field_mode::upper,       25,    1,    L"PAL",          { 1920                         } },
+		{ video_format::ntsc,         720,  486,  720,  540,  field_mode::lower,       30000, 1001, L"NTSC",         { 1602, 1601, 1602, 1601, 1602 } },
+		{ video_format::x576p2500,    720,  576,  1024, 576,  field_mode::progressive, 25,    1,    L"576p2500",     { 1920                         } },
+		{ video_format::x720p2398,    1280, 720,  1280, 720,  field_mode::progressive, 24000, 1001, L"720p2398",     { 2002                         } },
+		{ video_format::x720p2400,    1280, 720,  1280, 720,  field_mode::progressive, 24,    1,    L"720p2400",     { 2000                         } },
+		{ video_format::x720p2500,    1280, 720,  1280, 720,  field_mode::progressive, 25,    1,    L"720p2500",     { 1920                         } },
+		{ video_format::x720p5000,    1280, 720,  1280, 720,  field_mode::progressive, 50,    1,    L"720p5000",     { 960                          } },
+		{ video_format::x720p2997,    1280, 720,  1280, 720,  field_mode::progressive, 30000, 1001, L"720p2997",     { 1602, 1601, 1602, 1601, 1602 } },
+		{ video_format::x720p5994,    1280, 720,  1280, 720,  field_mode::progressive, 60000, 1001, L"720p5994",     { 801,  800,  801,  801,  801  } },
+		{ video_format::x720p3000,    1280, 720,  1280, 720,  field_mode::progressive, 30,    1,    L"720p3000",     { 1600                         } },
+		{ video_format::x720p6000,    1280, 720,  1280, 720,  field_mode::progressive, 60,    1,    L"720p6000",     { 800                          } },
+		{ video_format::x1080p2398,   1920, 1080, 1920, 1080, field_mode::progressive, 24000, 1001, L"1080p2398",    { 2002                         } },
+		{ video_format::x1080p2400,   1920, 1080, 1920, 1080, field_mode::progressive, 24,    1,    L"1080p2400",    { 2000                         } },
+		{ video_format::x1080i5000,   1920, 1080, 1920, 1080, field_mode::upper,       25,    1,    L"1080i5000",    { 1920                         } },
+		{ video_format::x1080i5994,   1920, 1080, 1920, 1080, field_mode::upper,       30000, 1001, L"1080i5994",    { 1602, 1601, 1602, 1601, 1602 } },
+		{ video_format::x1080i6000,   1920, 1080, 1920, 1080, field_mode::upper,       30,    1,    L"1080i6000",    { 1600                         } },
+		{ video_format::x1080p2500,   1920, 1080, 1920, 1080, field_mode::progressive, 25,    1,    L"1080p2500",    { 1920                         } },
+		{ video_format::x1080p2997,   1920, 1080, 1920, 1080, field_mode::progressive, 30000, 1001, L"1080p2997",    { 1602, 1601, 1602, 1601, 1602 } },
+		{ video_format::x1080p3000,   1920, 1080, 1920, 1080, field_mode::progressive, 30,    1,    L"1080p3000",    { 1600                         } },
+		{ video_format::x1080p5000,   1920, 1080, 1920, 1080, field_mode::progressive, 50,    1,    L"1080p5000",    { 960                          } },
+		{ video_format::x1080p5994,   1920, 1080, 1920, 1080, field_mode::progressive, 60000, 1001, L"1080p5994",    { 801,  800,  801,  801,  801  } },
+		{ video_format::x1080p6000,   1920, 1080, 1920, 1080, field_mode::progressive, 60,    1,    L"1080p6000",    { 800                          } },
+		{ video_format::x1556p2398,   2048, 1556, 2048, 1556, field_mode::progressive, 24000, 1001, L"1556p2398",    { 2002                         } },
+		{ video_format::x1556p2400,   2048, 1556, 2048, 1556, field_mode::progressive, 24,    1,    L"1556p2400",    { 2000                         } },
+		{ video_format::x1556p2500,   2048, 1556, 2048, 1556, field_mode::progressive, 25,    1,    L"1556p2500",    { 1920                         } },
+		{ video_format::dci1080p2398, 2048, 1080, 2048, 1080, field_mode::progressive, 24000, 1001, L"dci1080p2398", { 2002                         } },
+		{ video_format::dci1080p2400, 2048, 1080, 2048, 1080, field_mode::progressive, 24,    1,    L"dci1080p2400", { 2000                         } },
+		{ video_format::dci1080p2500, 2048, 1080, 2048, 1080, field_mode::progressive, 25,    1,    L"dci1080p2500", { 1920                         } },
+		{ video_format::x2160p2398,   3840, 2160, 3840, 2160, field_mode::progressive, 24000, 1001, L"2160p2398",    { 2002                         } },
+		{ video_format::x2160p2400,   3840, 2160, 3840, 2160, field_mode::progressive, 24,    1,    L"2160p2400",    { 2000                         } },
+		{ video_format::x2160p2500,   3840, 2160, 3840, 2160, field_mode::progressive, 25,    1,    L"2160p2500",    { 1920                         } },
+		{ video_format::x2160p2997,   3840, 2160, 3840, 2160, field_mode::progressive, 30000, 1001, L"2160p2997",    { 1602, 1601, 1602, 1601, 1602 } },
+		{ video_format::x2160p3000,   3840, 2160, 3840, 2160, field_mode::progressive, 30,    1,    L"2160p3000",    { 1600                         } },
+		{ video_format::dci2160p2398, 4096, 2160, 4096, 2160, field_mode::progressive, 24000, 1001, L"dci2160p2398", { 2002                         } },
+		{ video_format::dci2160p2400, 4096, 2160, 4096, 2160, field_mode::progressive, 24,    1,    L"dci2160p2400", { 2000                         } },
+		{ video_format::dci2160p2500, 4096, 2160, 4096, 2160, field_mode::progressive, 25,    1,    L"dci2160p2500", { 1920                         } },
+		{ video_format::invalid,      0,    0,    0,    0,    field_mode::progressive, 1,     1,    L"invalid",      { 1                            } }
 	};
 
 video_format_desc::video_format_desc(
@@ -78,28 +84,27 @@ video_format_desc::video_format_desc(
 	, square_width(square_width)
 	, square_height(square_height)
 	, field_mode(field_mode)
-	, fps((double)time_scale/(double)duration)
+	, fps(static_cast<double>(time_scale) / static_cast<double>(duration))
 	, time_scale(time_scale)
 	, duration(duration)
-	, field_count(field_mode == field_mode::progressive ? 1 : 2)
+	, field_count(field_mode == core::field_mode::progressive ? 1 : 2)
 	, size(width*height*4)
 	, name(name)
 	, audio_sample_rate(48000)
-	, audio_channels(2)
 	, audio_cadence(audio_cadence)
 {
 }
 
 video_format_desc::video_format_desc(video_format format)
 	: format(video_format::invalid)
-	, field_mode(field_mode::empty)
+	, field_mode(core::field_mode::empty)
 {
-	*this = format_descs.at(format.value());
+	*this = format_descs.at(static_cast<int>(format));
 }
 
 video_format_desc::video_format_desc(const std::wstring& name)
 	: format(video_format::invalid)
-	, field_mode(field_mode::empty)
+	, field_mode(core::field_mode::empty)
 {	
 	*this = video_format_desc(video_format::invalid);
 	for(auto it = std::begin(format_descs); it != std::end(format_descs)-1; ++it)