Add new anamorphic mode "Automatic", delete "Strict" (#367)

* Add new anamorphic mode "Automatic", delete "Strict"

Anamorphic mode automatic is added to support Bradley's new presets that
are designed to pick a PAR that maximizes storage resolution.

Strict is converted to Loose + mod == 2 + UsesPictureSettings == 2
when importing presets

13 files changed, 240 insertions, 163 deletions

diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c
index 372d20280..83b7da46c 100644
--- a/gtk/src/callbacks.c
+++ b/gtk/src/callbacks.c
@@ -1698,18 +1698,21 @@ update_aspect_info(signal_user_data_t *ud)
     gtk_label_set_text(GTK_LABEL(widget), text);
     switch (ghb_settings_combo_int(ud->settings, "PicturePAR"))
     {
-        case 0:
+        case HB_ANAMORPHIC_NONE:
             text = _("Off");
             break;
-        case 1:
+        case HB_ANAMORPHIC_STRICT:
             text = _("Strict");
             break;
-        case 2:
+        case HB_ANAMORPHIC_LOOSE:
             text = _("Loose");
             break;
-        case 3:
+        case HB_ANAMORPHIC_CUSTOM:
             text = _("Custom");
             break;
+        case HB_ANAMORPHIC_AUTO:
+            text = _("Automatic");
+            break;
         default:
             text = _("Unknown");
             break;
@@ -1877,7 +1880,10 @@ set_title_settings(signal_user_data_t *ud, GhbValue *settings)
         gint pic_par;
         keep_aspect = ghb_dict_get_bool(settings, "PictureKeepRatio");
         pic_par = ghb_settings_combo_int(settings, "PicturePAR");
-        if (!(keep_aspect || pic_par) || pic_par == 3)
+        if (!keep_aspect ||
+            pic_par == HB_ANAMORPHIC_NONE ||
+            pic_par == HB_ANAMORPHIC_AUTO ||
+            pic_par == HB_ANAMORPHIC_CUSTOM)
         {
             ghb_dict_set_int(settings, "scale_height",
                              title->geometry.height - title->crop[0] - title->crop[1]);
diff --git a/gtk/src/ghb.m4 b/gtk/src/ghb.m4
index 3d0f2f642..0c2a8ff42 100644
--- a/gtk/src/ghb.m4
+++ b/gtk/src/ghb.m4
@@ -2509,12 +2509,14 @@ The actual display dimensions will differ if the pixel aspect ratio is not 1:1.<
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                             <property name="tooltip_markup" translatable="yes">&lt;b&gt;Anamorphic Modes:&lt;/b&gt;
 &lt;small&gt;&lt;tt&gt;
-None   - Force pixel aspect ratio to 1:1.
-Loose  - Align dimensions to chosen 'Alignment' value
-         and pick pixel aspect ratio that preserves the
-         original display aspect ratio
-Strict - Keep original source dimensions and pixel
-         aspect ratio&lt;/tt&gt;&lt;/small&gt;</property>
+None      - Force pixel aspect ratio to 1:1.
+Loose     - Use a pixel aspect ratio that is as
+            close as possible to the source video pixel
+            aspect ratio while preserving the original
+            display aspect ratio
+Automatic - Use a pixel aspect ratio that maximizes
+            storage resolution while preserving the original
+            display aspect ratio&lt;/tt&gt;&lt;/small&gt;</property>
                                             <signal name="changed" handler="scale_changed_cb" swapped="no"/>
                                           </object>
                                           <packing>
diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c
index a88afec50..5f5076a49 100644
--- a/gtk/src/hb-backend.c
+++ b/gtk/src/hb-backend.c
@@ -120,10 +120,10 @@ combo_opts_t when_complete_opts =
 
 static options_map_t d_par_opts[] =
 {
-    {N_("Off"),    "off",    0},
-    {N_("Strict"), "strict", 1},
-    {N_("Loose"),  "loose",  2},
-    {N_("Custom"), "custom", 3},
+    {N_("Off"),       "off",    HB_ANAMORPHIC_NONE},
+    {N_("Automatic"), "auto",   HB_ANAMORPHIC_AUTO},
+    {N_("Loose"),     "loose",  HB_ANAMORPHIC_LOOSE},
+    {N_("Custom"),    "custom", HB_ANAMORPHIC_CUSTOM},
 };
 combo_opts_t par_opts =
 {
@@ -3404,8 +3404,6 @@ ghb_set_scale_settings(GhbValue *settings, gint mode)
     gint max_width = 0;
     gint max_height = 0;
 
-    g_debug("ghb_set_scale ()\n");
-
     pic_par = ghb_settings_combo_int(settings, "PicturePAR");
     if (pic_par == HB_ANAMORPHIC_STRICT)
     {
@@ -3413,7 +3411,9 @@ ghb_set_scale_settings(GhbValue *settings, gint mode)
         ghb_dict_set_int(settings, "PictureModulus", 2);
         ghb_dict_set_bool(settings, "PictureLooseCrop", TRUE);
     }
-    if (pic_par == HB_ANAMORPHIC_STRICT || pic_par == HB_ANAMORPHIC_LOOSE)
+    if (pic_par == HB_ANAMORPHIC_STRICT ||
+        pic_par == HB_ANAMORPHIC_AUTO   ||
+        pic_par == HB_ANAMORPHIC_LOOSE)
     {
         ghb_dict_set_bool(settings, "PictureKeepRatio", TRUE);
     }
diff --git a/gtk/src/presets.c b/gtk/src/presets.c
index 76e09855e..256c7ef12 100644
--- a/gtk/src/presets.c
+++ b/gtk/src/presets.c
@@ -292,21 +292,14 @@ ghb_preset_to_settings(GhbValue *settings, GhbValue *preset)
         ghb_dict_get_value(settings, "PictureWidth")));
 
     int width, height, uses_pic, autoscale;
-    const char * pic_par;
 
     width    = ghb_dict_get_int(settings, "PictureWidth");
     height   = ghb_dict_get_int(settings, "PictureHeight");
     uses_pic = ghb_dict_get_int(settings, "UsesPictureSettings");
-    pic_par  = ghb_dict_get_string(settings, "PicturePAR");
 
-    autoscale = uses_pic == 2 || (width == 0 && height == 0);
+    autoscale = uses_pic != 1 || (width == 0 && height == 0);
     ghb_dict_set_bool(settings, "autoscale", autoscale);
 
-    if (!autoscale && pic_par != NULL && !strcasecmp(pic_par, "strict"))
-    {
-        ghb_dict_set_string(settings, "PicturePAR", "loose");
-    }
-
     gint vqtype;
 
     vqtype = ghb_dict_get_int(settings, "VideoQualityType");
diff --git a/gtk/src/queuehandler.c b/gtk/src/queuehandler.c
index 952543715..00ff52429 100644
--- a/gtk/src/queuehandler.c
+++ b/gtk/src/queuehandler.c
@@ -332,7 +332,7 @@ add_to_queue_list(signal_user_data_t *ud, GhbValue *queueDict, GtkTreeIter *pite
             aspect_desc = _("(Aspect Lost)");
         }
     }
-    else if (!strcasecmp(pic_par, "strict") || !strcasecmp(pic_par, "loose"))
+    else if (!strcasecmp(pic_par, "auto") || !strcasecmp(pic_par, "loose"))
     {
         aspect_desc = _("(Anamorphic)");
     }
diff --git a/libhb/common.h b/libhb/common.h
index ae05f2726..0e43c007c 100644
--- a/libhb/common.h
+++ b/libhb/common.h
@@ -452,7 +452,8 @@ typedef enum
     HB_ANAMORPHIC_NONE,
     HB_ANAMORPHIC_STRICT,
     HB_ANAMORPHIC_LOOSE,
-    HB_ANAMORPHIC_CUSTOM
+    HB_ANAMORPHIC_CUSTOM,
+    HB_ANAMORPHIC_AUTO
 } hb_anamorphic_mode_t;
 
 /******************************************************************************
diff --git a/libhb/hb.c b/libhb/hb.c
index f004a502b..05af04953 100644
--- a/libhb/hb.c
+++ b/libhb/hb.c
@@ -1060,6 +1060,8 @@ void hb_set_anamorphic_size2(hb_geometry_t *src_geo,
     {
         case HB_ANAMORPHIC_NONE:
         {
+            /* "None" anamorphic, a.k.a. 1:1.
+             */
             double par, cropped_sar, dar;
             par = (double)src_geo->par.num / src_geo->par.den;
             cropped_sar = (double)cropped_width / cropped_height;
@@ -1124,7 +1126,6 @@ void hb_set_anamorphic_size2(hb_geometry_t *src_geo,
             dst_par_num = dst_par_den = 1;
         } break;
 
-        default:
         case HB_ANAMORPHIC_STRICT:
         {
             /* "Strict" anamorphic.
@@ -1198,7 +1199,7 @@ void hb_set_anamorphic_size2(hb_geometry_t *src_geo,
 
         case HB_ANAMORPHIC_CUSTOM:
         {
-            /* Anamorphic 3: Power User Jamboree
+            /* "Custom" anamorphic: Power User Jamboree
                - Set everything based on specified values */
 
             /* Time to get picture dimensions that divide cleanly.*/
@@ -1234,11 +1235,51 @@ void hb_set_anamorphic_size2(hb_geometry_t *src_geo,
                                        src_par.den;
             }
         } break;
+
+        default:
+        case HB_ANAMORPHIC_AUTO:
+        {
+            /* "Automatic" anamorphic.
+             *  - Uses mod-compliant dimensions, set by user
+             *  - Allows users to set the either width *or* height
+             *  - Does *not* maintain original source PAR if one
+             *    or both dimensions is limited by maxWidth/maxHeight.
+             */
+            /* Anamorphic 3: Power User Jamboree
+               - Set everything based on specified values */
+
+            /* Time to get picture dimensions that divide cleanly.*/
+            width  = MULTIPLE_MOD_UP(geo->geometry.width, mod);
+            height = MULTIPLE_MOD_UP(geo->geometry.height, mod);
+
+            // Limit to min/max dimensions
+            if (width < HB_MIN_WIDTH)
+            {
+                width  = HB_MIN_WIDTH;
+            }
+            if (height < HB_MIN_HEIGHT)
+            {
+                height  = HB_MIN_HEIGHT;
+            }
+            if (width > maxWidth)
+            {
+                width = maxWidth;
+            }
+            if (height > maxHeight)
+            {
+                height = maxHeight;
+            }
+            /* Adjust the output PAR for new width/height
+             * See comment in HB_ANAMORPHIC_STRICT
+             */
+            dst_par_num = (int64_t)height * cropped_width  * src_par.num;
+            dst_par_den = (int64_t)width  * cropped_height * src_par.den;
+        } break;
     }
     if (width < HB_MIN_WIDTH || height < HB_MIN_HEIGHT ||
         width > maxWidth     || height > maxHeight)
     {
-        // All limits set above also attempted to keep PAR and DAR.
+        // Limits set above may have also attempted to keep PAR and DAR.
         // If we are still outside limits, enforce them and modify
         // PAR to keep DAR
         if (width < HB_MIN_WIDTH)
diff --git a/libhb/preset.c b/libhb/preset.c
index 60f46b218..5eb18b8ce 100644
--- a/libhb/preset.c
+++ b/libhb/preset.c
@@ -1730,21 +1730,27 @@ int hb_preset_apply_title(hb_handle_t *h, int title_index,
     {
         const char *s = hb_value_get_string(ana_mode_value);
         if (!strcasecmp(s, "none"))
-            geo.mode = 0;
+            geo.mode = HB_ANAMORPHIC_NONE;
         else if (!strcasecmp(s, "strict"))
-            geo.mode = 1;
+            geo.mode = HB_ANAMORPHIC_STRICT;
         else if (!strcasecmp(s, "custom"))
-            geo.mode = 3;
+            geo.mode = HB_ANAMORPHIC_CUSTOM;
+        else if (!strcasecmp(s, "auto"))
+            geo.mode = HB_ANAMORPHIC_AUTO;
         else // default loose
-            geo.mode = 2;
+            geo.mode = HB_ANAMORPHIC_LOOSE;
     }
     else
     {
         geo.mode = hb_value_get_int(hb_dict_get(preset, "PicturePAR"));
     }
     keep_aspect = hb_value_get_bool(hb_dict_get(preset, "PictureKeepRatio"));
-    if (geo.mode == HB_ANAMORPHIC_STRICT || geo.mode == HB_ANAMORPHIC_LOOSE)
+    if (geo.mode == HB_ANAMORPHIC_STRICT ||
+        geo.mode == HB_ANAMORPHIC_LOOSE  ||
+        geo.mode == HB_ANAMORPHIC_AUTO)
+    {
         keep_aspect = 1;
+    }
     geo.keep = keep_aspect * HB_KEEP_DISPLAY_ASPECT;
     geo.itu_par = hb_value_get_bool(hb_dict_get(preset, "PictureItuPAR"));
     geo.maxWidth = hb_value_get_int(hb_dict_get(preset, "PictureWidth"));
@@ -2147,6 +2153,21 @@ void hb_presets_clean(hb_value_t *preset)
     presets_clean(preset, hb_preset_template);
 }
 
+static void import_anamorphic_20_0_0(hb_value_t *preset)
+{
+    hb_value_t *val = hb_dict_get(preset, "PicturePAR");
+    if (hb_value_type(val) == HB_VALUE_TYPE_STRING)
+    {
+        const char *s = hb_value_get_string(val);
+        if (!strcasecmp(s, "strict"))
+        {
+            hb_dict_set(preset, "PicturePAR", hb_value_string("loose"));
+            hb_dict_set(preset, "UsesPictureSettings", hb_value_int(2));
+            hb_dict_set(preset, "PictureModulus", hb_value_int(2));
+        }
+    }
+}
+
 static void import_custom_11_1_0(hb_value_t * preset, int filter_id,
                                  const char * key)
 {
@@ -2744,9 +2765,16 @@ static void import_video_0_0_0(hb_value_t *preset)
     }
 }
 
+static void import_20_0_0(hb_value_t *preset)
+{
+    import_anamorphic_20_0_0(preset);
+}
+
 static void import_12_0_0(hb_value_t *preset)
 {
     import_deint_12_0_0(preset);
+
+    import_20_0_0(preset);
 }
 
 static void import_11_1_0(hb_value_t *preset)
@@ -2818,6 +2846,11 @@ static int preset_import(hb_value_t *preset, int major, int minor, int micro)
             import_12_0_0(preset);
             result = 1;
         }
+        else if (major == 20 && minor == 0 && micro == 0)
+        {
+            import_20_0_0(preset);
+            result = 1;
+        }
         preset_clean(preset, hb_preset_template);
     }
     return result;
diff --git a/libhb/preset_builtin.h b/libhb/preset_builtin.h
index 0c7f79227..5f425a0c0 100644
--- a/libhb/preset_builtin.h
+++ b/libhb/preset_builtin.h
@@ -58,7 +58,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -154,7 +154,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -250,7 +250,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -346,7 +346,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -442,7 +442,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -538,7 +538,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -634,7 +634,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -730,7 +730,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -840,7 +840,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -950,7 +950,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -1060,7 +1060,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -1170,7 +1170,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -1280,7 +1280,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -1390,7 +1390,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -1500,7 +1500,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -1610,7 +1610,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -1713,7 +1713,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -1809,7 +1809,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -1905,7 +1905,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -2001,7 +2001,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -2111,7 +2111,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -2221,7 +2221,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -2331,7 +2331,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -2441,7 +2441,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -2647,7 +2647,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -2757,7 +2757,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -2867,7 +2867,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -2963,7 +2963,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -3059,7 +3059,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -3172,7 +3172,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -3285,7 +3285,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -3395,7 +3395,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -3505,7 +3505,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -3601,7 +3601,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -3697,7 +3697,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -3793,7 +3793,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -3889,7 +3889,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -3985,7 +3985,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -4081,7 +4081,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -4191,7 +4191,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -4404,7 +4404,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -4500,7 +4500,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -4596,7 +4596,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -4692,7 +4692,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -4788,7 +4788,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -4884,7 +4884,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -4980,7 +4980,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -5076,7 +5076,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -5170,7 +5170,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -5264,7 +5264,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -5358,7 +5358,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -5452,7 +5452,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -5546,7 +5546,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -5640,7 +5640,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -5734,7 +5734,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -5828,7 +5828,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -6685,7 +6685,7 @@ const char hb_builtin_presets_json[] =
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"strict\", \n"
+"                    \"PicturePAR\": \"loose\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -6704,7 +6704,7 @@ const char hb_builtin_presets_json[] =
 "                    \"SubtitleTrackSelectionBehavior\": \"none\", \n"
 "                    \"Type\": 0, \n"
 "                    \"UsesPictureFilters\": true, \n"
-"                    \"UsesPictureSettings\": 2, \n"
+"                    \"UsesPictureSettings\": 0, \n"
 "                    \"VideoAvgBitrate\": 6000, \n"
 "                    \"VideoColorMatrixCode\": 0, \n"
 "                    \"VideoEncoder\": \"x264\", \n"
@@ -6838,7 +6838,7 @@ const char hb_builtin_presets_json[] =
 "            \"x264Option\": \"\", \n"
 "            \"x264UseAdvancedOptions\": false\n"
 "        }, \n"
-"        \"VersionMajor\": 20, \n"
+"        \"VersionMajor\": 21, \n"
 "        \"VersionMicro\": 0, \n"
 "        \"VersionMinor\": 0\n"
 "    }\n"
diff --git a/preset/preset_builtin.json b/preset/preset_builtin.json
index 2a29b4fd7..5886c1709 100644
--- a/preset/preset_builtin.json
+++ b/preset/preset_builtin.json
@@ -57,7 +57,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -156,7 +156,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -255,7 +255,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -354,7 +354,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -453,7 +453,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -552,7 +552,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -651,7 +651,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -750,7 +750,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -863,7 +863,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -976,7 +976,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -1089,7 +1089,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -1202,7 +1202,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -1315,7 +1315,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -1428,7 +1428,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -1541,7 +1541,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -1654,7 +1654,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -1760,7 +1760,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -1859,7 +1859,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -1958,7 +1958,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -2057,7 +2057,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -2170,7 +2170,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -2283,7 +2283,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -2396,7 +2396,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -2509,7 +2509,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -2721,7 +2721,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -2834,7 +2834,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -2947,7 +2947,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -3046,7 +3046,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -3145,7 +3145,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -3261,7 +3261,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -3377,7 +3377,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -3490,7 +3490,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -3603,7 +3603,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -3702,7 +3702,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -3801,7 +3801,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -3900,7 +3900,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -3999,7 +3999,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -4098,7 +4098,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -4197,7 +4197,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -4310,7 +4310,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -4529,7 +4529,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -4628,7 +4628,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -4727,7 +4727,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -4826,7 +4826,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -4925,7 +4925,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -5024,7 +5024,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -5123,7 +5123,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -5222,7 +5222,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -5320,7 +5320,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -5418,7 +5418,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -5516,7 +5516,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -5614,7 +5614,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -5712,7 +5712,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -5810,7 +5810,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -5908,7 +5908,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -6006,7 +6006,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
diff --git a/preset/preset_builtin.list b/preset/preset_builtin.list
index 7153ea8a1..88eebd84a 100644
--- a/preset/preset_builtin.list
+++ b/preset/preset_builtin.list
@@ -1,6 +1,6 @@
 <resources>
     <section name="PresetTemplate">
-        <integer name="VersionMajor" value="20" />
+        <integer name="VersionMajor" value="21" />
         <integer name="VersionMinor" value="0" />
         <integer name="VersionMicro" value="0" />
         <json name="Preset" file="preset_template.json" />
diff --git a/preset/preset_cli_default.json b/preset/preset_cli_default.json
index 188ff031d..e60721805 100644
--- a/preset/preset_cli_default.json
+++ b/preset/preset_cli_default.json
@@ -64,7 +64,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "strict",
+                    "PicturePAR": "loose",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -76,7 +76,7 @@
                     "PresetName": "CLI Default",
                     "Type": 0,
                     "UsesPictureFilters": true,
-                    "UsesPictureSettings": 2,
+                    "UsesPictureSettings": 0,
                     "SubtitleAddCC": false,
                     "SubtitleAddForeignAudioSearch": false,
                     "SubtitleAddForeignAudioSubtitle": false,
diff --git a/test/test.c b/test/test.c
index dad76c46d..6c4c0de61 100644
--- a/test/test.c
+++ b/test/test.c
@@ -1504,8 +1504,10 @@ static void ShowHelp()
 "   -X, --maxWidth  <number>\n"
 "                           Set maximum width in pixels\n"
 "   --non-anamorphic        Set pixel aspect ratio to 1:1\n"
-"   --strict-anamorphic     Store pixel aspect ratio in video stream\n"
-"   --loose-anamorphic      Store pixel aspect ratio with specified display width\n"
+"   --auto-anamorphic       Store pixel aspect ratio that maximizes storage\n"
+"                           resolution\n"
+"   --loose-anamorphic      Store pixel aspect ratio that is as close as\n"
+"                           possible to the source video pixel aspect ratio\n"
 "   --custom-anamorphic     Store pixel aspect ratio in video stream and\n"
 "                           directly control all parameters.\n"
 "   --display-width <number>\n"
@@ -1525,7 +1527,6 @@ static void ShowHelp()
 "   --no-itu-par            Disable preset 'itu-par'\n"
 "   --modulus <number>      Set storage width and height modulus\n"
 "                           Dimensions will be made divisible by this number.\n"
-"                           Does not affect strict anamorphic mode (always mod 2)\n"
 "                           (default: set by preset, typically 2)\n"
 "   -M, --color-matrix <string>\n"
 "                           Set the color space signaled by the output:\n"
@@ -2032,10 +2033,10 @@ static int ParseOptions( int argc, char ** argv )
             { "grayscale",   no_argument,       NULL,        'g' },
             { "no-grayscale",no_argument,       &grayscale,    0 },
             { "rotate",      optional_argument, NULL,   ROTATE_FILTER },
-            { "non-anamorphic",  no_argument, &anamorphic_mode, 0 },
-            { "strict-anamorphic",  no_argument, &anamorphic_mode, 1 },
-            { "loose-anamorphic", no_argument, &anamorphic_mode, 2 },
-            { "custom-anamorphic", no_argument, &anamorphic_mode, 3 },
+            { "non-anamorphic",  no_argument, &anamorphic_mode, HB_ANAMORPHIC_NONE },
+            { "auto-anamorphic",  no_argument, &anamorphic_mode, HB_ANAMORPHIC_AUTO },
+            { "loose-anamorphic", no_argument, &anamorphic_mode, HB_ANAMORPHIC_LOOSE },
+            { "custom-anamorphic", no_argument, &anamorphic_mode, HB_ANAMORPHIC_CUSTOM },
             { "display-width", required_argument, NULL, DISPLAY_WIDTH },
             { "keep-display-aspect", optional_argument, NULL, KEEP_DISPLAY_ASPECT },
             { "no-keep-display-aspect", no_argument, &keep_display_aspect, 0 },
@@ -3691,13 +3692,13 @@ static hb_dict_t * PreparePreset(const char *preset_name)
     if (display_width > 0)
     {
         keep_display_aspect = 0;
-        anamorphic_mode = 3;
+        anamorphic_mode = HB_ANAMORPHIC_CUSTOM;
         hb_dict_set(preset, "PictureDARWidth", hb_value_int(display_width));
     }
     else if (par_width > 0 && par_height > 0)
     {
         keep_display_aspect = 0;
-        anamorphic_mode = 3;
+        anamorphic_mode = HB_ANAMORPHIC_CUSTOM;
         hb_dict_set(preset, "PicturePARWidth", hb_value_int(par_width));
         hb_dict_set(preset, "PicturePARHeight", hb_value_int(par_height));
     }