X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=core%2Fvideo_format.h;h=90ff1f806ecd640a55ade16b7dc0796206e603bc;hb=9e6b4e8c7b0119f334b66966f0ea8ab84f288d4b;hp=bdcf3f8ac47d1167baf294e062e77968f7013337;hpb=702f2d114793dcc86f66a88a6a49f1ea5c21828b;p=casparcg

diff --git a/core/video_format.h b/core/video_format.h
index bdcf3f8ac..90ff1f806 100644
--- a/core/video_format.h
+++ b/core/video_format.h
@@ -1,77 +1,123 @@
-#pragma once
-
-#include <string>
-
-#include <common/compiler/vs/disable_silly_warnings.h>
-
-namespace caspar { namespace core {
-	
-struct video_format 
-{ 
-	enum type
-	{
-		pal = 0,
-		//ntsc,
-		//x576p2500,
-		x720p2500,
-		x720p5000,
-		//x720p5994,
-		//x720p6000,
-		//x1080p2397,
-		//x1080p2400,
-		x1080i5000,
-		//x1080i5994,
-		//x1080i6000,
-		x1080p2500,
-		//x1080p2997,
-		//x1080p3000,
-		count,
-		invalid
-	};
-};
-
-struct video_mode 
-{ 
-	enum type
-	{
-		progressive,
-		lower,
-		upper,
-		count,
-		invalid
-	};
-};
-
-struct video_format_desc
-{
-	video_format::type		format;		// video output format
-
-	size_t					width;		// output frame width
-	size_t					height;		// output frame height
-	video_mode::type		mode;		// progressive, interlaced upper field first, interlaced lower field first
-	double					fps;		// actual framerate, e.g. i50 = 25 fps, p50 = 50 fps
-	double					interval;	// time between frames
-	size_t					size;		// output frame size in bytes 
-	std::wstring			name;		// name of output format
-
-	static const video_format_desc& get(video_format::type format);
-	static const video_format_desc& get(const std::wstring& name);
-};
-
-inline bool operator==(const video_format_desc& rhs, const video_format_desc& lhs)
-{
-	return rhs.format == lhs.format;
-}
-
-inline bool operator!=(const video_format_desc& rhs, const video_format_desc& lhs)
-{
-	return !(rhs == lhs);
-}
-
-inline std::wostream& operator<<(std::wostream& out, const video_format_desc& format_desc)
-{
-	out << format_desc.name.c_str();
-	return out;
-}
-
-}}
\ No newline at end of file
+/*
+* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>
+*
+* This file is part of CasparCG (www.casparcg.com).
+*
+* CasparCG is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* CasparCG is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with CasparCG. If not, see <http://www.gnu.org/licenses/>.
+*
+* Author: Robert Nagy, ronag89@gmail.com
+*/
+
+#pragma once
+
+#include <vector>
+#include <string>
+#include <cstddef>
+
+#include <common/enum_class.h>
+
+namespace caspar { namespace core {
+	
+enum class video_format
+{ 
+	pal,		
+	ntsc,		
+	x576p2500,	
+	x720p2500,	
+	x720p5000,
+	x720p2398,
+	x720p2400,
+	x720p2997,
+	x720p5994,
+	x720p3000,
+	x720p6000,
+	x1080p2398,
+	x1080p2400,	
+	x1080i5000,	
+	x1080i5994,	
+	x1080i6000,	
+	x1080p2500,	
+	x1080p2997,	
+	x1080p3000,	
+	x1080p5000,
+	x1080p5994,
+	x1080p6000,
+	x1556p2398,
+	x1556p2400,
+	x1556p2500,
+	dci1080p2398,
+	dci1080p2400,
+	dci1080p2500,
+	x2160p2398,
+	x2160p2400,
+	x2160p2500,
+	x2160p2997,
+	x2160p3000,
+	dci2160p2398,
+	dci2160p2400,
+	dci2160p2500,
+	invalid,
+	count
+};
+
+enum class field_mode
+{
+	empty		= 0,
+	lower		= 1,
+	upper		= 2,
+	progressive = 3 // NOTE: progressive == lower | upper;
+};
+ENUM_ENABLE_BITWISE(field_mode);
+//static_assert((field_mode::lower | field_mode::upper) == field_mode::progressive, "");
+
+struct video_format_desc final
+{
+	video_format		format;		
+
+	int					width;		
+	int					height;		
+	int					square_width;
+	int					square_height;
+	core::field_mode	field_mode;	// progressive, interlaced upper field first, interlaced lower field first
+	double				fps;		// actual framerate = duration/time_scale, e.g. i50 = 25 fps, p50 = 50 fps
+	int					time_scale;
+	int					duration;
+	int					field_count;
+	std::size_t			size;		// frame size in bytes 
+	std::wstring		name;		// name of output format
+
+	int					audio_sample_rate;
+	std::vector<int>	audio_cadence;	// rotating optimal number of samples per frame
+
+	video_format_desc(video_format format,
+					  int width,
+					  int height,
+					  int square_width,
+					  int square_height,
+					  core::field_mode field_mode,
+					  int time_scale,
+					  int duration,
+					  const std::wstring& name,
+					  const std::vector<int>& audio_cadence);
+		
+	video_format_desc(video_format format = video_format::invalid);
+	video_format_desc(const std::wstring& name);
+};
+
+bool operator==(const video_format_desc& rhs, const video_format_desc& lhs);
+bool operator!=(const video_format_desc& rhs, const video_format_desc& lhs);
+
+std::wostream& operator<<(std::wostream& out, const video_format_desc& format_desc);
+
+}}