git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

[casparcg] / core / video_format.h

diff --git a/core/video_format.h b/core/video_format.h
index 3bac87d69ce6da9c7bc4437d422e24836fb7f436..fdbe1bd3ee49fff95159360fd029fa9a0d5eaaaa 100644 (file)
--- a/core/video_format.h
+++ b/core/video_format.h
@@ -51,17 +51,17 @@ struct video_format
        };\r
 };\r
 \r
-struct video_mode \r
+struct field_mode \r
 { \r
        enum type\r
        {\r
-               progressive = 0,\r
-               lower,\r
-               upper,\r
-               count\r
+               empty           = 0,\r
+               lower           = 1,\r
+               upper           = 2,\r
+               progressive = 3 // NOTE: progressive == lower | upper;\r
        };\r
 \r
-       static std::wstring print(video_mode::type value)\r
+       static std::wstring print(field_mode::type value)\r
        {\r
                switch(value)\r
                {\r
@@ -83,7 +83,9 @@ struct video_format_desc
 \r
        size_t                                  width;          // output frame width\r
        size_t                                  height;         // output frame height\r
-       video_mode::type                mode;           // progressive, interlaced upper field first, interlaced lower field first\r
+       size_t                                  square_width;\r
+       size_t                                  square_height;\r
+       field_mode::type                field_mode;     // progressive, interlaced upper field first, interlaced lower field first\r
        double                                  fps;            // actual framerate, e.g. i50 = 25 fps, p50 = 50 fps\r
        size_t                                  time_scale;\r
        size_t                                  duration;\r