update format and aspect ratio choices by Andrew

diff --git a/cinelerra-5.1/cinelerra/defaultformats.h b/cinelerra-5.1/cinelerra/defaultformats.h
index 61bd2165f1dbedc7e83d019700d02868c12b3054..28352b03ccb1b4bf463a19dfee75e7c3d360a23b 100644 (file)
--- a/cinelerra-5.1/cinelerra/defaultformats.h
+++ b/cinelerra-5.1/cinelerra/defaultformats.h
@@ -39,19 +39,59 @@ struct formatpresets
 };
 
 static struct formatpresets format_presets[] = {
 };
 
 static struct formatpresets format_presets[] = {

-       { N_("1080P/60"),               2, 2, 48000,    1, 1, 60000.0 / 1001,
+       { N_("1080p/60"),               2, 2, 48000,    1, 1, 60,

                1920,1080, 16,9, ILACE_MODE_NOTINTERLACED, BC_YUVA8888 },
                1920,1080, 16,9, ILACE_MODE_NOTINTERLACED, BC_YUVA8888 },

-       { N_("1080P/24"),               6, 6, 48000,    1, 1, 24,
+       { N_("1080p/59.94"),            2, 2, 48000,    1, 1, 60000.0 / 1001,

                1920,1080, 16,9, ILACE_MODE_NOTINTERLACED, BC_YUVA8888 },
                1920,1080, 16,9, ILACE_MODE_NOTINTERLACED, BC_YUVA8888 },

-       { N_("1080I"),          2, 2, 48000,    1, 1, 30000.0 / 1001,
+       { N_("1080p/50"),               2, 2, 48000,    1, 1, 50,
+               1920,1080, 16,9, ILACE_MODE_NOTINTERLACED, BC_YUVA8888 },
+       { N_("1080p/30"),               6, 6, 48000,    1, 1, 30,
+               1920,1080, 16,9, ILACE_MODE_NOTINTERLACED, BC_YUVA8888 },
+       { N_("1080p/29.97"),            6, 6, 48000,    1, 1, 30000.0 / 1001,
+               1920,1080, 16,9, ILACE_MODE_NOTINTERLACED, BC_YUVA8888 },
+       { N_("1080p/25"),               6, 6, 48000,    1, 1, 25,
+               1920,1080, 16,9, ILACE_MODE_NOTINTERLACED, BC_YUVA8888 },
+       { N_("1080p/24"),               6, 6, 48000,    1, 1, 24,
+               1920,1080, 16,9, ILACE_MODE_NOTINTERLACED, BC_YUVA8888 },
+       { N_("1080p/23.976"),           6, 6, 48000,    1, 1, 24000.0 / 1001,
+               1920,1080, 16,9, ILACE_MODE_NOTINTERLACED, BC_YUVA8888 },
+       { N_("1080i/60"),               2, 2, 48000,    1, 1, 60,
+               1920,1080, 16,9, ILACE_MODE_BOTTOM_FIRST, BC_YUVA8888 },
+       { N_("1080i/50"),               2, 2, 48000,    1, 1, 50,
+               1920,1080, 16,9, ILACE_MODE_BOTTOM_FIRST, BC_YUVA8888 },
+       { N_("1080i/30"),               2, 2, 48000,    1, 1, 30,

                1920,1080, 16,9, ILACE_MODE_BOTTOM_FIRST, BC_YUVA8888 },
                1920,1080, 16,9, ILACE_MODE_BOTTOM_FIRST, BC_YUVA8888 },

-       { N_("720P/60"),        2, 2, 48000,    1, 1, 60000.0 / 1001,
+       { N_("1080i/29.97"),            2, 2, 48000,    1, 1, 30000.0 / 1001,
+               1920,1080, 16,9, ILACE_MODE_BOTTOM_FIRST, BC_YUVA8888 },
+       { N_("1080i/25"),               2, 2, 48000,    1, 1, 25,
+               1920,1080, 16,9, ILACE_MODE_BOTTOM_FIRST, BC_YUVA8888 },
+       { N_("1080i/24"),               2, 2, 48000,    1, 1, 24,
+               1920,1080, 16,9, ILACE_MODE_BOTTOM_FIRST, BC_YUVA8888 },
+       { N_("HDV 1080i/29.97"),                2, 2, 48000,    1, 1, 30000.0 / 1001,
+               1440,1080, 16,9, ILACE_MODE_TOP_FIRST, BC_YUVA8888 },
+       { N_("HDV 1080i/25"),           2, 2, 48000,    1, 1, 25,
+               1440,1080, 16,9, ILACE_MODE_TOP_FIRST, BC_YUVA8888 },
+       { N_("(HDV) 720p/60"),  2, 2, 48000,    1, 1, 60000.0 / 1001,
+               1280,720,  16,9, ILACE_MODE_NOTINTERLACED, BC_YUVA8888 },
+       { N_("(HDV 10 bit) 720p/60"),   2, 2, 48000,    1, 1, 60000.0 / 1001,
+               1280,720,  16,9, ILACE_MODE_NOTINTERLACED, BC_RGBA_FLOAT },
+       { N_("(HDV) 720p/50"),  2, 2, 48000,    1, 1, 50,
+               1280,720,  16,9, ILACE_MODE_NOTINTERLACED, BC_YUVA8888 },
+       { N_("(HDV) 720p/29.97"),       2, 2, 48000,    1, 1, 30000.0 / 1001,
+               1280,720,  16,9, ILACE_MODE_NOTINTERLACED, BC_YUVA8888 },
+       { N_("(HDV) 720p/25"),  2, 2, 48000,    1, 1, 25,
+               1280,720,  16,9, ILACE_MODE_NOTINTERLACED, BC_YUVA8888 },
+       { N_("(HDV) 720p/23.976"),      2, 2, 48000,    1, 1, 24000.0 / 1001,

                1280,720,  16,9, ILACE_MODE_NOTINTERLACED, BC_YUVA8888 },
                1280,720,  16,9, ILACE_MODE_NOTINTERLACED, BC_YUVA8888 },

-       { N_("PAL 576I - DV(D)"),       2, 2, 48000,    1, 1, 25,
+       { N_("PAL 576i - DV(D)"),       2, 2, 48000,    1, 1, 25,

                720,576,   4,3, ILACE_MODE_BOTTOM_FIRST, BC_YUVA8888 },
                720,576,   4,3, ILACE_MODE_BOTTOM_FIRST, BC_YUVA8888 },

-       { N_("NTSC 480P - DV(D)"),      2, 2, 48000,    1, 1, 60000.0 / 1001,
+       { N_("PAL 576i (16:9) - DV(D)"),        2, 2, 48000,    1, 1, 25,
+               720,576,   16,9, ILACE_MODE_BOTTOM_FIRST, BC_YUVA8888 },
+       { N_("PAL 576p (16:9) - DV(D)"),        2, 2, 48000,    1, 1, 25,
+               720,576,   16,9, ILACE_MODE_NOTINTERLACED, BC_YUVA8888 },
+       { N_("NTSC 480p - DV(D)"),      2, 2, 48000,    1, 1, 60000.0 / 1001,

                720,480,   4,3, ILACE_MODE_NOTINTERLACED, BC_YUVA8888 },
                720,480,   4,3, ILACE_MODE_NOTINTERLACED, BC_YUVA8888 },

-       { N_("NTSC 480I - DV(D)"),      2, 2, 48000,    1, 1, 30000.0 / 1001,
+       { N_("NTSC 480i - DV(D)"),      2, 2, 48000,    1, 1, 30000.0 / 1001,

                720,480,   4,3, ILACE_MODE_BOTTOM_FIRST, BC_YUVA8888 },
        { N_("YouTube"),                1, 1, 48000,    1, 1, 30000.0 / 1001,
                424,318,   4,3, ILACE_MODE_NOTINTERLACED, BC_YUVA8888 },
                720,480,   4,3, ILACE_MODE_BOTTOM_FIRST, BC_YUVA8888 },
        { N_("YouTube"),                1, 1, 48000,    1, 1, 30000.0 / 1001,
                424,318,   4,3, ILACE_MODE_NOTINTERLACED, BC_YUVA8888 },

diff --git a/cinelerra-5.1/cinelerra/theme.C b/cinelerra-5.1/cinelerra/theme.C
index d89c789f76cb95018e954fc1f0d65002c16e0d7c..ab22ec8e21ca629f853a3fe357ea462970a69af0 100644 (file)
--- a/cinelerra-5.1/cinelerra/theme.C
+++ b/cinelerra-5.1/cinelerra/theme.C
@@ -274,6 +274,7 @@ void Theme::build_menus()
        aspect_ratios.append(new BC_ListBoxItem("3:2"));
        aspect_ratios.append(new BC_ListBoxItem("4:3"));
        aspect_ratios.append(new BC_ListBoxItem("16:9"));
        aspect_ratios.append(new BC_ListBoxItem("3:2"));
        aspect_ratios.append(new BC_ListBoxItem("4:3"));
        aspect_ratios.append(new BC_ListBoxItem("16:9"));

+       aspect_ratios.append(new BC_ListBoxItem("16:10"));

        aspect_ratios.append(new BC_ListBoxItem("2.10:1"));
        aspect_ratios.append(new BC_ListBoxItem("2.20:1"));
        aspect_ratios.append(new BC_ListBoxItem("2.25:1"));
        aspect_ratios.append(new BC_ListBoxItem("2.10:1"));
        aspect_ratios.append(new BC_ListBoxItem("2.20:1"));
        aspect_ratios.append(new BC_ListBoxItem("2.25:1"));


@@ -283,9 +284,11 @@ void Theme::build_menus()
 
        frame_sizes.append(new BC_ListBoxItem("128x96     "));
        frame_sizes.append(new BC_ListBoxItem("160x120    "));
 
        frame_sizes.append(new BC_ListBoxItem("128x96     "));
        frame_sizes.append(new BC_ListBoxItem("160x120    "));

+       frame_sizes.append(new BC_ListBoxItem("240x160   HQVGA"));

        frame_sizes.append(new BC_ListBoxItem("320x240    "));
        frame_sizes.append(new BC_ListBoxItem("360x240    "));
        frame_sizes.append(new BC_ListBoxItem("320x240    "));
        frame_sizes.append(new BC_ListBoxItem("360x240    "));

-       frame_sizes.append(new BC_ListBoxItem("400x300    "));
+       frame_sizes.append(new BC_ListBoxItem("384x288    CIF"));
+       frame_sizes.append(new BC_ListBoxItem("400x300    qSVGA"));

        frame_sizes.append(new BC_ListBoxItem("640x360    nHD"));
        frame_sizes.append(new BC_ListBoxItem("640x400    "));
        frame_sizes.append(new BC_ListBoxItem("640x480    VGA"));
        frame_sizes.append(new BC_ListBoxItem("640x360    nHD"));
        frame_sizes.append(new BC_ListBoxItem("640x400    "));
        frame_sizes.append(new BC_ListBoxItem("640x480    VGA"));


@@ -299,19 +302,32 @@ void Theme::build_menus()
        frame_sizes.append(new BC_ListBoxItem("1024x576   "));
        frame_sizes.append(new BC_ListBoxItem("1024x768   XGA"));
        frame_sizes.append(new BC_ListBoxItem("1152x648   "));
        frame_sizes.append(new BC_ListBoxItem("1024x576   "));
        frame_sizes.append(new BC_ListBoxItem("1024x768   XGA"));
        frame_sizes.append(new BC_ListBoxItem("1152x648   "));

+       frame_sizes.append(new BC_ListBoxItem("1152x768   "));
+       frame_sizes.append(new BC_ListBoxItem("1152x864  XGA+"));

        frame_sizes.append(new BC_ListBoxItem("1280x720   HD"));
        frame_sizes.append(new BC_ListBoxItem("1280x720   HD"));

+       frame_sizes.append(new BC_ListBoxItem("1280x800   "));

        frame_sizes.append(new BC_ListBoxItem("1280x1024  SXGA"));
        frame_sizes.append(new BC_ListBoxItem("1366x768   WXGA"));
        frame_sizes.append(new BC_ListBoxItem("1280x1024  SXGA"));
        frame_sizes.append(new BC_ListBoxItem("1366x768   WXGA"));

+       frame_sizes.append(new BC_ListBoxItem("1440x900   WXGA+"));
+       frame_sizes.append(new BC_ListBoxItem("1440x1080  HDV"));

        frame_sizes.append(new BC_ListBoxItem("1600x900   HD+"));
        frame_sizes.append(new BC_ListBoxItem("1600x1200  UXGA"));
        frame_sizes.append(new BC_ListBoxItem("1920x1080  Full HD"));
        frame_sizes.append(new BC_ListBoxItem("1600x900   HD+"));
        frame_sizes.append(new BC_ListBoxItem("1600x1200  UXGA"));
        frame_sizes.append(new BC_ListBoxItem("1920x1080  Full HD"));

+       frame_sizes.append(new BC_ListBoxItem("1920x1280  FHD+"));
+       frame_sizes.append(new BC_ListBoxItem("2048x1080  DCI 2K"));

        frame_sizes.append(new BC_ListBoxItem("2048x1152  "));
        frame_sizes.append(new BC_ListBoxItem("2048x1152  "));

+       frame_sizes.append(new BC_ListBoxItem("2048x1536   QXGA"));
+       frame_sizes.append(new BC_ListBoxItem("2160x1440   "));

        frame_sizes.append(new BC_ListBoxItem("2304x1296  "));
        frame_sizes.append(new BC_ListBoxItem("2304x1296  "));

-       frame_sizes.append(new BC_ListBoxItem("2560x1440  QHD"));
+       frame_sizes.append(new BC_ListBoxItem("2560x1080  UW-FHD"));
+       frame_sizes.append(new BC_ListBoxItem("2560x1440  WQHD"));

        frame_sizes.append(new BC_ListBoxItem("2880x1620  "));
        frame_sizes.append(new BC_ListBoxItem("2880x1620  "));

-       frame_sizes.append(new BC_ListBoxItem("3200x1800  QHD+"));
+       frame_sizes.append(new BC_ListBoxItem("3200x1800  WQXGA+"));
+       frame_sizes.append(new BC_ListBoxItem("3440x1440  Ultra-Wide QHD"));

        frame_sizes.append(new BC_ListBoxItem("3520x1980  "));
        frame_sizes.append(new BC_ListBoxItem("3520x1980  "));

+       frame_sizes.append(new BC_ListBoxItem("3840x1600  UW4K"));

        frame_sizes.append(new BC_ListBoxItem("3840x2160  4K UHD"));
        frame_sizes.append(new BC_ListBoxItem("3840x2160  4K UHD"));

+       frame_sizes.append(new BC_ListBoxItem("4096x2160  DCI 4K"));

        frame_sizes.append(new BC_ListBoxItem("4096x2304  Full 4K UHD"));
        frame_sizes.append(new BC_ListBoxItem("4480x2520  "));
        frame_sizes.append(new BC_ListBoxItem("5120x2880  5K UHD"));
        frame_sizes.append(new BC_ListBoxItem("4096x2304  Full 4K UHD"));
        frame_sizes.append(new BC_ListBoxItem("4480x2520  "));
        frame_sizes.append(new BC_ListBoxItem("5120x2880  5K UHD"));