X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=core%2Fvideo_format.cpp;h=c9c3f9a75d5c7ea3bf011c5f7a30ec8cd7246b0b;hb=ca4193194e570781a824519791fa7cbdee032946;hp=09217a82376d0f5f23f2ae0ccfa9211a636bd480;hpb=ce0c7bd96cb0af4a66e5b534236623c71217f9d3;p=casparcg

diff --git a/core/video_format.cpp b/core/video_format.cpp
index 09217a823..c9c3f9a75 100644
--- a/core/video_format.cpp
+++ b/core/video_format.cpp
@@ -24,30 +24,46 @@
 
 #include <boost/algorithm/string.hpp>
 
-#include <array>
-
-#define DEFINE_VIDEOFORMATDESC(w, h, m, f, s, fmt) { (fmt), (w), (h), (m), (m == video_mode::progressive ? f : f/2.0), (1.0/(m == video_mode::progressive ? f : f/2.0)), ((w)*(h)*4), (s)}
+#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 == field_mode::progressive ? 1 : 2),\
+	((w)*(h)*4),\
+	(name),\
+	(48000),\
+	(2),\
+	(static_cast<size_t>(48000.0/((double)scale/(double)duration)+0.99)*2)\
+}
 
 namespace caspar { namespace core {
 	
 const video_format_desc format_descs[video_format::count] =  
 {									   
-	DEFINE_VIDEOFORMATDESC(720,  576,  video_mode::upper,			50,			TEXT("pal"),		video_format::pal		), 
-	DEFINE_VIDEOFORMATDESC(720,  486,  video_mode::lower,			60/1.001,	TEXT("ntsc"),		video_format::ntsc		), 
-	DEFINE_VIDEOFORMATDESC(720,  576,  video_mode::progressive,		25,			TEXT("576p2500"),	video_format::x576p2500	),
-	DEFINE_VIDEOFORMATDESC(1280, 720,  video_mode::progressive,		25,			TEXT("720p2500"),	video_format::x720p2500	), 
-	DEFINE_VIDEOFORMATDESC(1280, 720,  video_mode::progressive,		50,			TEXT("720p5000"),	video_format::x720p5000	), 
-	DEFINE_VIDEOFORMATDESC(1280, 720,  video_mode::progressive,		60/1.001,	TEXT("720p5994"),	video_format::x720p5994	),
-	DEFINE_VIDEOFORMATDESC(1280, 720,  video_mode::progressive,		60,			TEXT("720p6000"),	video_format::x720p6000	),
-	DEFINE_VIDEOFORMATDESC(1920, 1080, video_mode::progressive,		24/1.001,	TEXT("1080p2397"),	video_format::x1080p2397),
-	DEFINE_VIDEOFORMATDESC(1920, 1080, video_mode::progressive,		24,			TEXT("1080p2400"),	video_format::x1080p2400),
-	DEFINE_VIDEOFORMATDESC(1920, 1080, video_mode::upper,			50,			TEXT("1080i5000"),	video_format::x1080i5000),
-	DEFINE_VIDEOFORMATDESC(1920, 1080, video_mode::upper,			60/1.001,	TEXT("1080i5994"),	video_format::x1080i5994),
-	DEFINE_VIDEOFORMATDESC(1920, 1080, video_mode::upper,			60,			TEXT("1080i6000"),	video_format::x1080i6000),
-	DEFINE_VIDEOFORMATDESC(1920, 1080, video_mode::progressive,		25,			TEXT("1080p2500"),	video_format::x1080p2500),
-	DEFINE_VIDEOFORMATDESC(1920, 1080, video_mode::progressive,		30/1.001,	TEXT("1080p2997"),	video_format::x1080p2997),
-	DEFINE_VIDEOFORMATDESC(1920, 1080, video_mode::progressive,		30,			TEXT("1080p3000"),	video_format::x1080p3000),
-	DEFINE_VIDEOFORMATDESC(0,		0, video_mode::invalid,			-1,			TEXT("invalid"),	video_format::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)