Changed 2k to 1556p and 4k to 2160p

diff --git a/CHANGES.txt b/CHANGES.txt
index dea866c92a1d3734e547acfbe2239ac050c103f1..0f142b5e205255372850877e1cd39e5a4daba7a6 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -9,8 +9,8 @@ General
   o Added support for video and images file thumbnail generation. By default the\r
     media directory is scanned every 5 seconds for new/modified/removed files\r
     and thumbnails are generated/regenerated/removed accordingly.\r
-  o Support for new video modes: 2k2398, 2k2400, 2k2500, 4k2398, 4k2400, 4k2500,\r
-    4k2997 and 4k3000.\r
+  o Support for new video modes: 1556p2398, 1556p2400, 1556p2500, 2160p2398,\r
+    2160p2400, 2160p2500, 2160p2997 and 2160p3000.\r
   o Experimental ATI graphics card support by using static linking against SFML\r
     instead of dynamic. Should improve ATI GPU support, but needs testing.\r
   o Added support for playback and pass-through of up to 16 audio channels. See\r

diff --git a/core/video_format.cpp b/core/video_format.cpp
index 7db4520743f088fb6693aae6b5b58c011a84f037..0265b53e0e808f7a221776def986affb12f08576 100644 (file)
--- a/core/video_format.cpp
+++ b/core/video_format.cpp
@@ -71,15 +71,15 @@ const video_format_desc format_descs[video_format::count] =
        DEFINE_VIDEOFORMATDESC(video_format::x1080p5000 ,1920, 1080, 1920, 1080, field_mode::progressive,       50,             1,              boost::assign::list_of(960),                                                                                            L"1080p5000"),\r
        DEFINE_VIDEOFORMATDESC(video_format::x1080p5994 ,1920, 1080, 1920, 1080, field_mode::progressive,       60000,  1001,   boost::assign::list_of(801)(801)(800)(801)(801)(801)(800)(801)(801)(801),       L"1080p5994"),\r
        DEFINE_VIDEOFORMATDESC(video_format::x1080p6000 ,1920, 1080, 1920, 1080, field_mode::progressive,       60,             1,              boost::assign::list_of(800),                                                                                            L"1080p6000"),\r
-       DEFINE_VIDEOFORMATDESC(video_format::x2k2398    ,2048, 1556, 2048, 1556, field_mode::progressive,        24000, 1001,   boost::assign::list_of(2002),                                                                                           L"2k2398"),\r
-       DEFINE_VIDEOFORMATDESC(video_format::x2k2400    ,2048, 1556, 2048, 1556, field_mode::progressive,        24,    1,              boost::assign::list_of(2000),                                                                                           L"2k2400"),\r
-       DEFINE_VIDEOFORMATDESC(video_format::x2k2500    ,2048, 1556, 2048, 1556, field_mode::progressive,        25,    1,              boost::assign::list_of(1920),                                                                                           L"2k2500"),\r
-       DEFINE_VIDEOFORMATDESC(video_format::x4k2398    ,3840, 2160, 3840, 2160, field_mode::progressive,        24000, 1001,   boost::assign::list_of(2002),                                                                                           L"4k2398"),\r
-       DEFINE_VIDEOFORMATDESC(video_format::x4k2400    ,3840, 2160, 3840, 2160, field_mode::progressive,        24,    1,              boost::assign::list_of(2000),                                                                                           L"4k2400"),\r
-       DEFINE_VIDEOFORMATDESC(video_format::x4k2500    ,3840, 2160, 3840, 2160, field_mode::progressive,        25,    1,              boost::assign::list_of(1920),                                                                                           L"4k2500"),\r
-       DEFINE_VIDEOFORMATDESC(video_format::x4k2997    ,3840, 2160, 3840, 2160, field_mode::progressive,        30000, 1001,   boost::assign::list_of(1602)    (1601)    (1602)    (1601)    (1602),           L"4k2398"),\r
-       DEFINE_VIDEOFORMATDESC(video_format::x4k3000    ,3840, 2160, 3840, 2160, field_mode::progressive,        30,    1,              boost::assign::list_of(1600),                                                                                           L"4k3000"),\r
-       DEFINE_VIDEOFORMATDESC(video_format::invalid    ,0,             0,   0,         0,   field_mode::progressive,    1,             1,              boost::assign::list_of(1),                                                                                                      L"invalid")\r
+       DEFINE_VIDEOFORMATDESC(video_format::x1556p2398 ,2048, 1556, 2048, 1556, field_mode::progressive,       24000,  1001,   boost::assign::list_of(2002),                                                                                           L"1556p2398"),\r
+       DEFINE_VIDEOFORMATDESC(video_format::x1556p2400 ,2048, 1556, 2048, 1556, field_mode::progressive,       24,             1,              boost::assign::list_of(2000),                                                                                           L"1556p2400"),\r
+       DEFINE_VIDEOFORMATDESC(video_format::x1556p2500 ,2048, 1556, 2048, 1556, field_mode::progressive,       25,             1,              boost::assign::list_of(1920),                                                                                           L"1556p2500"),\r
+       DEFINE_VIDEOFORMATDESC(video_format::x2160p2398 ,3840, 2160, 3840, 2160, field_mode::progressive,       24000,  1001,   boost::assign::list_of(2002),                                                                                           L"2160p2398"),\r
+       DEFINE_VIDEOFORMATDESC(video_format::x2160p2400 ,3840, 2160, 3840, 2160, field_mode::progressive,       24,             1,              boost::assign::list_of(2000),                                                                                           L"2160p2400"),\r
+       DEFINE_VIDEOFORMATDESC(video_format::x2160p2500 ,3840, 2160, 3840, 2160, field_mode::progressive,       25,             1,              boost::assign::list_of(1920),                                                                                           L"2160p2500"),\r
+       DEFINE_VIDEOFORMATDESC(video_format::x2160p2997 ,3840, 2160, 3840, 2160, field_mode::progressive,       30000,  1001,   boost::assign::list_of(1602)    (1601)    (1602)    (1601)    (1602),           L"2160p2398"),\r
+       DEFINE_VIDEOFORMATDESC(video_format::x2160p3000 ,3840, 2160, 3840, 2160, field_mode::progressive,       30,             1,              boost::assign::list_of(1600),                                                                                           L"2160p3000"),\r
+       DEFINE_VIDEOFORMATDESC(video_format::invalid    ,0,             0,   0,         0,   field_mode::progressive,   1,              1,              boost::assign::list_of(1),                                                                                                      L"invalid")\r
 };\r
 \r
 const video_format_desc& video_format_desc::get(video_format::type format)     \r

diff --git a/core/video_format.h b/core/video_format.h
index 1b4ed3a69b8d393a96dcafa1322187ee66e76626..27d3c7fecf155be8f91a5695f02f194c7d824464 100644 (file)
--- a/core/video_format.h
+++ b/core/video_format.h
@@ -52,14 +52,14 @@ struct video_format
                x1080p5000,\r
                x1080p5994,\r
                x1080p6000,\r
-               x2k2398,\r
-               x2k2400,\r
-               x2k2500,\r
-               x4k2398,\r
-               x4k2400,\r
-               x4k2500,\r
-               x4k2997,\r
-               x4k3000,\r
+               x1556p2398,\r
+               x1556p2400,\r
+               x1556p2500,\r
+               x2160p2398,\r
+               x2160p2400,\r
+               x2160p2500,\r
+               x2160p2997,\r
+               x2160p3000,\r
                invalid,\r
                count\r
        };\r

diff --git a/modules/decklink/util/util.h b/modules/decklink/util/util.h
index 99add07f61222caf585739693d74b974e3e8d938..51865cb42128749767d6b7ca02bb58325c372b73 100644 (file)
--- a/modules/decklink/util/util.h
+++ b/modules/decklink/util/util.h
@@ -63,14 +63,14 @@ static BMDDisplayMode get_decklink_video_format(core::video_format::type fmt)
        case core::video_format::x1080p5000:    return bmdModeHD1080p50;\r
        case core::video_format::x1080p5994:    return bmdModeHD1080p5994;\r
        case core::video_format::x1080p6000:    return bmdModeHD1080p6000;\r
-       case core::video_format::x2k2398:               return bmdMode2k2398;\r
-       case core::video_format::x2k2400:               return bmdMode2k24;\r
-       case core::video_format::x2k2500:               return bmdMode2k25;\r
-       case core::video_format::x4k2398:               return bmdMode4K2160p2398;\r
-       case core::video_format::x4k2400:               return bmdMode4K2160p24;\r
-       case core::video_format::x4k2500:               return bmdMode4K2160p25;\r
-       case core::video_format::x4k2997:               return bmdMode4K2160p2997;\r
-       case core::video_format::x4k3000:               return bmdMode4K2160p30;\r
+       case core::video_format::x1556p2398:    return bmdMode2k2398;\r
+       case core::video_format::x1556p2400:    return bmdMode2k24;\r
+       case core::video_format::x1556p2500:    return bmdMode2k25;\r
+       case core::video_format::x2160p2398:    return bmdMode4K2160p2398;\r
+       case core::video_format::x2160p2400:    return bmdMode4K2160p24;\r
+       case core::video_format::x2160p2500:    return bmdMode4K2160p25;\r
+       case core::video_format::x2160p2997:    return bmdMode4K2160p2997;\r
+       case core::video_format::x2160p3000:    return bmdMode4K2160p30;\r
        default:                                                                return (BMDDisplayMode)ULONG_MAX;\r
        }\r
 }\r
@@ -95,14 +95,14 @@ static core::video_format::type get_caspar_video_format(BMDDisplayMode fmt)
        case bmdModeHD1080p50:                                  return core::video_format::x1080p5000;  \r
        case bmdModeHD1080p5994:                                return core::video_format::x1080p5994;  \r
        case bmdModeHD1080p6000:                                return core::video_format::x1080p6000;  \r
-       case bmdMode2k2398:                                             return core::video_format::x2k2398;     \r
-       case bmdMode2k24:                                               return core::video_format::x2k2400;     \r
-       case bmdMode2k25:                                               return core::video_format::x2k2500;     \r
-       case bmdMode4K2160p2398:                                return core::video_format::x4k2398;     \r
-       case bmdMode4K2160p24:                                  return core::video_format::x4k2400;     \r
-       case bmdMode4K2160p25:                                  return core::video_format::x4k2500;     \r
-       case bmdMode4K2160p2997:                                return core::video_format::x4k2997;     \r
-       case bmdMode4K2160p30:                                  return core::video_format::x4k3000;     \r
+       case bmdMode2k2398:                                             return core::video_format::x1556p2398;  \r
+       case bmdMode2k24:                                               return core::video_format::x1556p2400;  \r
+       case bmdMode2k25:                                               return core::video_format::x1556p2500;  \r
+       case bmdMode4K2160p2398:                                return core::video_format::x2160p2398;  \r
+       case bmdMode4K2160p24:                                  return core::video_format::x2160p2400;  \r
+       case bmdMode4K2160p25:                                  return core::video_format::x2160p2500;  \r
+       case bmdMode4K2160p2997:                                return core::video_format::x2160p2997;  \r
+       case bmdMode4K2160p30:                                  return core::video_format::x2160p3000;  \r
        default:                                                                return core::video_format::invalid;     \r
        }\r
 }\r

diff --git a/shell/casparcg.config b/shell/casparcg.config
index f628c50bcb5781db778b3046c3091ee9d49b5fe7..5bb8f69440296f56e5deb786238421c7956f3365 100644 (file)
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -61,7 +61,7 @@
 </thumbnails>\r
 <channels>\r
     <channel>\r
-        <video-mode> PAL [PAL|NTSC|576p2500|720p2398|720p2400|720p2500|720p5000|720p2997|720p5994|720p3000|720p6000|1080p2398|1080p2400|1080i5000|1080i5994|1080i6000|1080p2500|1080p2997|1080p3000|1080p5000|1080p5994|1080p6000|2k2398|2k2400|2k2500|4k2398|4k2400|4k2500|4k2997|4k3000] </video-mode>\r
+        <video-mode> PAL [PAL|NTSC|576p2500|720p2398|720p2400|720p2500|720p5000|720p2997|720p5994|720p3000|720p6000|1080p2398|1080p2400|1080i5000|1080i5994|1080i6000|1080p2500|1080p2997|1080p3000|1080p5000|1080p5994|1080p6000|1556p2398|1556p2400|1556p2500|2160p2398|2160p2400|2160p2500|2160p2997|2160p3000] </video-mode>\r
         <channel-layout>stereo [mono|stereo|dts|dolbye|dolbydigital|smpte|passthru]</channel-layout>\r
         <straight-alpha-output>false [true|false]</straight-alpha-output>\r
         <consumers>\r