X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=core%2Fvideo_format.cpp;h=b58e1f199a968d9bcb565a5600ee87211ea6fc85;hb=6fcaa28bd5c747e88368e15cb0d18c14e3449a00;hp=61171c2af97db2991c366e7546af0507a9ae54af;hpb=6382412fccc3ab31f7df665693c96d36495ec88b;p=casparcg diff --git a/core/video_format.cpp b/core/video_format.cpp index 61171c2af..b58e1f199 100644 --- a/core/video_format.cpp +++ b/core/video_format.cpp @@ -28,42 +28,42 @@ namespace caspar { namespace core { const std::vector format_descs = { - { video_format::pal, 720, 576, 1024, 576, field_mode::upper, 25, 1, L"PAL", { 1920 } }, + { 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 } }, - { video_format::x576p2500, 720, 576, 1024, 576, field_mode::progressive, 25, 1, L"576p2500", { 1920 } }, + { video_format::x576p2500, 720, 576, 1024, 576, field_mode::progressive, 25000, 1000, L"576p2500", { 1920 } }, { video_format::x720p2398, 1280, 720, 1280, 720, field_mode::progressive, 24000, 1001, L"720p2398", { 2002 } }, - { video_format::x720p2400, 1280, 720, 1280, 720, field_mode::progressive, 24, 1, L"720p2400", { 2000 } }, - { video_format::x720p2500, 1280, 720, 1280, 720, field_mode::progressive, 25, 1, L"720p2500", { 1920 } }, - { video_format::x720p5000, 1280, 720, 1280, 720, field_mode::progressive, 50, 1, L"720p5000", { 960 } }, + { video_format::x720p2400, 1280, 720, 1280, 720, field_mode::progressive, 24000, 1000, L"720p2400", { 2000 } }, + { video_format::x720p2500, 1280, 720, 1280, 720, field_mode::progressive, 25000, 1000, L"720p2500", { 1920 } }, + { video_format::x720p5000, 1280, 720, 1280, 720, field_mode::progressive, 50000, 1000, L"720p5000", { 960 } }, { video_format::x720p2997, 1280, 720, 1280, 720, field_mode::progressive, 30000, 1001, L"720p2997", { 1602, 1601, 1602, 1601, 1602 } }, { video_format::x720p5994, 1280, 720, 1280, 720, field_mode::progressive, 60000, 1001, L"720p5994", { 801, 800, 801, 801, 801 } }, - { video_format::x720p3000, 1280, 720, 1280, 720, field_mode::progressive, 30, 1, L"720p3000", { 1600 } }, - { video_format::x720p6000, 1280, 720, 1280, 720, field_mode::progressive, 60, 1, L"720p6000", { 800 } }, + { video_format::x720p3000, 1280, 720, 1280, 720, field_mode::progressive, 30000, 1000, L"720p3000", { 1600 } }, + { video_format::x720p6000, 1280, 720, 1280, 720, field_mode::progressive, 60000, 1000, L"720p6000", { 800 } }, { video_format::x1080p2398, 1920, 1080, 1920, 1080, field_mode::progressive, 24000, 1001, L"1080p2398", { 2002 } }, - { video_format::x1080p2400, 1920, 1080, 1920, 1080, field_mode::progressive, 24, 1, L"1080p2400", { 2000 } }, - { video_format::x1080i5000, 1920, 1080, 1920, 1080, field_mode::upper, 25, 1, L"1080i5000", { 1920 } }, + { video_format::x1080p2400, 1920, 1080, 1920, 1080, field_mode::progressive, 24000, 1000, L"1080p2400", { 2000 } }, + { video_format::x1080i5000, 1920, 1080, 1920, 1080, field_mode::upper, 25000, 1000, L"1080i5000", { 1920 } }, { video_format::x1080i5994, 1920, 1080, 1920, 1080, field_mode::upper, 30000, 1001, L"1080i5994", { 1602, 1601, 1602, 1601, 1602 } }, - { video_format::x1080i6000, 1920, 1080, 1920, 1080, field_mode::upper, 30, 1, L"1080i6000", { 1600 } }, - { video_format::x1080p2500, 1920, 1080, 1920, 1080, field_mode::progressive, 25, 1, L"1080p2500", { 1920 } }, + { video_format::x1080i6000, 1920, 1080, 1920, 1080, field_mode::upper, 30000, 1000, L"1080i6000", { 1600 } }, + { video_format::x1080p2500, 1920, 1080, 1920, 1080, field_mode::progressive, 25000, 1000, L"1080p2500", { 1920 } }, { video_format::x1080p2997, 1920, 1080, 1920, 1080, field_mode::progressive, 30000, 1001, L"1080p2997", { 1602, 1601, 1602, 1601, 1602 } }, - { video_format::x1080p3000, 1920, 1080, 1920, 1080, field_mode::progressive, 30, 1, L"1080p3000", { 1600 } }, - { video_format::x1080p5000, 1920, 1080, 1920, 1080, field_mode::progressive, 50, 1, L"1080p5000", { 960 } }, + { video_format::x1080p3000, 1920, 1080, 1920, 1080, field_mode::progressive, 30000, 1000, L"1080p3000", { 1600 } }, + { video_format::x1080p5000, 1920, 1080, 1920, 1080, field_mode::progressive, 50000, 1000, L"1080p5000", { 960 } }, { video_format::x1080p5994, 1920, 1080, 1920, 1080, field_mode::progressive, 60000, 1001, L"1080p5994", { 801, 800, 801, 801, 801 } }, - { video_format::x1080p6000, 1920, 1080, 1920, 1080, field_mode::progressive, 60, 1, L"1080p6000", { 800 } }, + { video_format::x1080p6000, 1920, 1080, 1920, 1080, field_mode::progressive, 60000, 1000, L"1080p6000", { 800 } }, { video_format::x1556p2398, 2048, 1556, 2048, 1556, field_mode::progressive, 24000, 1001, L"1556p2398", { 2002 } }, - { video_format::x1556p2400, 2048, 1556, 2048, 1556, field_mode::progressive, 24, 1, L"1556p2400", { 2000 } }, - { video_format::x1556p2500, 2048, 1556, 2048, 1556, field_mode::progressive, 25, 1, L"1556p2500", { 1920 } }, + { video_format::x1556p2400, 2048, 1556, 2048, 1556, field_mode::progressive, 24000, 1000, L"1556p2400", { 2000 } }, + { video_format::x1556p2500, 2048, 1556, 2048, 1556, field_mode::progressive, 25000, 1000, L"1556p2500", { 1920 } }, { video_format::dci1080p2398, 2048, 1080, 2048, 1080, field_mode::progressive, 24000, 1001, L"dci1080p2398", { 2002 } }, - { video_format::dci1080p2400, 2048, 1080, 2048, 1080, field_mode::progressive, 24, 1, L"dci1080p2400", { 2000 } }, - { video_format::dci1080p2500, 2048, 1080, 2048, 1080, field_mode::progressive, 25, 1, L"dci1080p2500", { 1920 } }, + { video_format::dci1080p2400, 2048, 1080, 2048, 1080, field_mode::progressive, 24000, 1000, L"dci1080p2400", { 2000 } }, + { video_format::dci1080p2500, 2048, 1080, 2048, 1080, field_mode::progressive, 25000, 1000, L"dci1080p2500", { 1920 } }, { video_format::x2160p2398, 3840, 2160, 3840, 2160, field_mode::progressive, 24000, 1001, L"2160p2398", { 2002 } }, - { video_format::x2160p2400, 3840, 2160, 3840, 2160, field_mode::progressive, 24, 1, L"2160p2400", { 2000 } }, - { video_format::x2160p2500, 3840, 2160, 3840, 2160, field_mode::progressive, 25, 1, L"2160p2500", { 1920 } }, + { video_format::x2160p2400, 3840, 2160, 3840, 2160, field_mode::progressive, 24000, 1000, L"2160p2400", { 2000 } }, + { 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, 30, 1, L"2160p3000", { 1600 } }, + { video_format::x2160p3000, 3840, 2160, 3840, 2160, field_mode::progressive, 30000, 1000, L"2160p3000", { 1600 } }, { 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, 24, 1, L"dci2160p2400", { 2000 } }, - { video_format::dci2160p2500, 4096, 2160, 4096, 2160, field_mode::progressive, 25, 1, L"dci2160p2500", { 1920 } }, + { 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 } }, { video_format::invalid, 0, 0, 0, 0, field_mode::progressive, 1, 1, L"invalid", { 1 } } }; @@ -91,7 +91,6 @@ video_format_desc::video_format_desc( , size(width*height*4) , name(name) , audio_sample_rate(48000) - , audio_channels(2) , audio_cadence(audio_cadence) { }