diff options
Diffstat (limited to 'libhb')
| -rw-r--r-- | libhb/common.h | 3 | ||||
| -rw-r--r-- | libhb/hb.c | 47 | ||||
| -rw-r--r-- | libhb/preset.c | 43 | ||||
| -rw-r--r-- | libhb/preset_builtin.h | 118 |
4 files changed, 143 insertions, 68 deletions
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" |