From def7cc35acbdb5badb03adbf47210bbb6ad5b98d Mon Sep 17 00:00:00 2001 From: Helge Norberg Date: Wed, 1 Feb 2017 17:25:23 +0100 Subject: [PATCH] [CHANGELOG] Updated --- CHANGELOG | 2 ++ core/video_format.cpp | 11 +++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index f44bdeda6..4ac396a0b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -30,6 +30,8 @@ General Contributions during development (not w.r.t 2.1.0 Beta 1): + Fix ffmpeg build dependencies on clean ubuntu desktop amd64 14.04.3 or higher (Walter Sonius). + o Added support for video modes 2160p5000, 2160p5994 and 2160p6000 + (Antonio Ruano Cuesta). Consumers --------- diff --git a/core/video_format.cpp b/core/video_format.cpp index 120b1ee44..bea447306 100644 --- a/core/video_format.cpp +++ b/core/video_format.cpp @@ -26,7 +26,7 @@ #include namespace caspar { namespace core { - + const std::vector format_descs = { { video_format::pal, 720, 576, 1024, 576, field_mode::upper, 25000, 1000, L"PAL", { 1920 } }, { video_format::ntsc, 720, 486, 720, 540, field_mode::lower, 30000, 1001, L"NTSC", { 1602, 1601, 1602, 1601, 1602 } }, @@ -61,9 +61,9 @@ namespace caspar { namespace core { { video_format::x2160p2500, 3840, 2160, 3840, 2160, field_mode::progressive, 25000, 1000, L"2160p2500", { 1920 } }, { video_format::x2160p2997, 3840, 2160, 3840, 2160, field_mode::progressive, 30000, 1001, L"2160p2997", { 1602, 1601, 1602, 1601, 1602 } }, { video_format::x2160p3000, 3840, 2160, 3840, 2160, field_mode::progressive, 30000, 1000, L"2160p3000", { 1600 } }, - { video_format::x2160p5000, 3840, 2160, 3840, 2160, field_mode::progressive, 50, 1, L"2160p5000", { 960 } }, + { video_format::x2160p5000, 3840, 2160, 3840, 2160, field_mode::progressive, 50000, 1000, L"2160p5000", { 960 } }, { video_format::x2160p5994, 3840, 2160, 3840, 2160, field_mode::progressive, 60000, 1001, L"2160p5994", { 801, 800, 801, 801, 801 } }, - { video_format::x2160p6000, 3840, 2160, 3840, 2160, field_mode::progressive, 60, 1, L"2160p6000", { 800 } }, + { video_format::x2160p6000, 3840, 2160, 3840, 2160, field_mode::progressive, 60000, 1000, L"2160p6000", { 800 } }, { video_format::dci2160p2398, 4096, 2160, 4096, 2160, field_mode::progressive, 24000, 1001, L"dci2160p2398", { 2002 } }, { video_format::dci2160p2400, 4096, 2160, 4096, 2160, field_mode::progressive, 24000, 1000, L"dci2160p2400", { 2000 } }, { video_format::dci2160p2500, 4096, 2160, 4096, 2160, field_mode::progressive, 25000, 1000, L"dci2160p2500", { 1920 } }, @@ -109,7 +109,7 @@ video_format_desc::video_format_desc(video_format format) video_format_desc::video_format_desc(const std::wstring& name) : format(video_format::invalid) , field_mode(core::field_mode::empty) -{ +{ *this = video_format_desc(video_format::invalid); for(auto it = std::begin(format_descs); it != std::end(format_descs)-1; ++it) { @@ -122,7 +122,7 @@ video_format_desc::video_format_desc(const std::wstring& name) } bool operator==(const video_format_desc& lhs, const video_format_desc& rhs) -{ +{ return lhs.format == rhs.format; } @@ -139,4 +139,3 @@ std::wostream& operator<<(std::wostream& out, const video_format_desc& format_de }} - -- 2.39.2