X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=core%2Fvideo_format.cpp;h=c3db0e7925bd9d15e6ac98d91ccda7d05baf6946;hb=34420e565fdeb9b862d59835c212f44ebdda8d5b;hp=332e8214ed7c708d92bf3ccf266a50d360a677d8;hpb=30b4d98ff66b9aa1fcbb742dec8bba617c46f865;p=casparcg

diff --git a/core/video_format.cpp b/core/video_format.cpp
index 332e8214e..c3db0e792 100644
--- a/core/video_format.cpp
+++ b/core/video_format.cpp
@@ -24,21 +24,20 @@
 
 #include <boost/algorithm/string.hpp>
 
-#include <array>
-
-#define DEFINE_VIDEOFORMATDESC(fmt, w, h, m, scale, duration, name) \
+#define DEFINE_VIDEOFORMATDESC(fmt, w, h, sw, sh, m, scale, duration, name) \
 { \
 	(fmt), \
 	(w), \
 	(h), \
+	(sw),\
+	(sh),\
 	(m), \
 	((double)scale/(double)duration),\
 	(scale),\
 	(duration),\
-	(m == video_mode::progressive ? 1 : 2),\
+	(m == field_mode::progressive ? 1 : 2),\
 	((w)*(h)*4),\
 	(name),\
-	(2),\
 	(48000),\
 	(2),\
 	(static_cast<size_t>(48000.0*2.0/((double)scale/(double)duration)+0.99))\
@@ -48,23 +47,23 @@ namespace caspar { namespace core {
 	
 const video_format_desc format_descs[video_format::count] =  
 {									   
-	DEFINE_VIDEOFORMATDESC(video_format::pal		,720,  576,  video_mode::upper,			25,		1,		TEXT("PAL")		), 
-	DEFINE_VIDEOFORMATDESC(video_format::ntsc		,720,  486,  video_mode::lower,			30000,	1001,	TEXT("NTSC")	), 
-	DEFINE_VIDEOFORMATDESC(video_format::x576p2500	,720,  576,  video_mode::progressive,	25,		1,		TEXT("576p2500")),
-	DEFINE_VIDEOFORMATDESC(video_format::x720p2500	,1280, 720,  video_mode::progressive,	25,		1,		TEXT("720p2500")), 
-	DEFINE_VIDEOFORMATDESC(video_format::x720p5000	,1280, 720,  video_mode::progressive,	50,		1,		TEXT("720p5000")), 
-	DEFINE_VIDEOFORMATDESC(video_format::x720p5994	,1280, 720,  video_mode::progressive,	60000,	1001,	TEXT("720p5994")),
-	DEFINE_VIDEOFORMATDESC(video_format::x720p6000	,1280, 720,  video_mode::progressive,	60,		1,		TEXT("720p6000")),
-	DEFINE_VIDEOFORMATDESC(video_format::x1080p2397	,1920, 1080, video_mode::progressive,	24000,	1001,	TEXT("1080p2398")),
-	DEFINE_VIDEOFORMATDESC(video_format::x1080p2400	,1920, 1080, video_mode::progressive,	24,		1,		TEXT("1080p2400")),
-	DEFINE_VIDEOFORMATDESC(video_format::x1080i5000	,1920, 1080, video_mode::upper,			25,		1,		TEXT("1080i5000")),
-	DEFINE_VIDEOFORMATDESC(video_format::x1080i5994	,1920, 1080, video_mode::upper,			30000,	1001,	TEXT("1080i5994")),
-	DEFINE_VIDEOFORMATDESC(video_format::x1080i6000	,1920, 1080, video_mode::upper,			30,		1,		TEXT("1080i6000")),
-	DEFINE_VIDEOFORMATDESC(video_format::x1080p2500	,1920, 1080, video_mode::progressive,	25,		1,		TEXT("1080p2500")),
-	DEFINE_VIDEOFORMATDESC(video_format::x1080p2997	,1920, 1080, video_mode::progressive,	30000,	1001,	TEXT("1080p2997")),
-	DEFINE_VIDEOFORMATDESC(video_format::x1080p3000	,1920, 1080, video_mode::progressive,	30,		1,		TEXT("1080p3000")),
-	DEFINE_VIDEOFORMATDESC(video_format::x1080p5000	,1920, 1080, video_mode::progressive,	50,		1,		TEXT("1080p5000")),
-	DEFINE_VIDEOFORMATDESC(video_format::invalid	,0,		0, video_mode::count,			1,		1,		TEXT("invalid"))
+	DEFINE_VIDEOFORMATDESC(video_format::pal		,720,  576,  768,  576,  field_mode::upper,			25,		1,		L"PAL"), 
+	DEFINE_VIDEOFORMATDESC(video_format::ntsc		,720,  486,  720,  547,  field_mode::lower,			30000,	1001,	L"NTSC"), 
+	DEFINE_VIDEOFORMATDESC(video_format::x576p2500	,720,  576,  720,  576,  field_mode::progressive,	25,		1,		L"576p2500"),
+	DEFINE_VIDEOFORMATDESC(video_format::x720p2500	,1280, 720,  1280, 720,  field_mode::progressive,	25,		1,		L"720p2500"), 
+	DEFINE_VIDEOFORMATDESC(video_format::x720p5000	,1280, 720,  1280, 720,  field_mode::progressive,	50,		1,		L"720p5000"), 
+	DEFINE_VIDEOFORMATDESC(video_format::x720p5994	,1280, 720,  1280, 720,  field_mode::progressive,	60000,	1001,	L"720p5994"),
+	DEFINE_VIDEOFORMATDESC(video_format::x720p6000	,1280, 720,  1280, 720,  field_mode::progressive,	60,		1,		L"720p6000"),
+	DEFINE_VIDEOFORMATDESC(video_format::x1080p2397	,1920, 1080, 1920, 1080, field_mode::progressive,	24000,	1001,	L"1080p2398"),
+	DEFINE_VIDEOFORMATDESC(video_format::x1080p2400	,1920, 1080, 1920, 1080, field_mode::progressive,	24,		1,		L"1080p2400"),
+	DEFINE_VIDEOFORMATDESC(video_format::x1080i5000	,1920, 1080, 1920, 1080, field_mode::upper,			25,		1,		L"1080i5000"),
+	DEFINE_VIDEOFORMATDESC(video_format::x1080i5994	,1920, 1080, 1920, 1080, field_mode::upper,			30000,	1001,	L"1080i5994"),
+	DEFINE_VIDEOFORMATDESC(video_format::x1080i6000	,1920, 1080, 1920, 1080, field_mode::upper,			30,		1,		L"1080i6000"),
+	DEFINE_VIDEOFORMATDESC(video_format::x1080p2500	,1920, 1080, 1920, 1080, field_mode::progressive,	25,		1,		L"1080p2500"),
+	DEFINE_VIDEOFORMATDESC(video_format::x1080p2997	,1920, 1080, 1920, 1080, field_mode::progressive,	30000,	1001,	L"1080p2997"),
+	DEFINE_VIDEOFORMATDESC(video_format::x1080p3000	,1920, 1080, 1920, 1080, field_mode::progressive,	30,		1,		L"1080p3000"),
+	DEFINE_VIDEOFORMATDESC(video_format::x1080p5000	,1920, 1080, 1920, 1080, field_mode::progressive,	50,		1,		L"1080p5000"),
+	DEFINE_VIDEOFORMATDESC(video_format::invalid	,0,		0,   0,		0,   field_mode::progressive,	1,		1,		L"invalid")
 };
 
 const video_format_desc& video_format_desc::get(video_format::type format)