From c1764222478a827d20dd4c029642d5866750e4d3 Mon Sep 17 00:00:00 2001 From: jstebbins Date: Fri, 3 Oct 2008 20:59:50 +0000 Subject: LinGui: change the top level structure that contains presets from a dictionary to an array. Dictionaries are unordered sets, so this new structure allows greater flexibility in how the presets may be ordered. Is backwards compatible. Old structure is read and converted to new. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1804 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- gtk/src/presets.c | 157 +++++++++++++++++++++++++++++++++---------- gtk/src/resource_data.h | 58 ++++++++++------ gtk/src/resources.plist | 58 ++++++++++------ gtk/src/standard_presets.xml | 58 ++++++++++------ 4 files changed, 237 insertions(+), 94 deletions(-) diff --git a/gtk/src/presets.c b/gtk/src/presets.c index 0298b1a6e..03f9501f7 100644 --- a/gtk/src/presets.c +++ b/gtk/src/presets.c @@ -35,6 +35,49 @@ plist_get_dict(GValue *presets, const gchar *name) return ghb_dict_lookup(presets, name); } +static GValue* +presets_get_dict(GValue *presets, const gchar *name) +{ + GValue *dict, *gval; + gint count, ii; + + if (presets == NULL || name == NULL) return NULL; + count = ghb_array_len(presets); + for (ii = 0; ii < count; ii++) + { + const gchar *str; + dict = ghb_array_get_nth(presets, ii); + gval = ghb_dict_lookup(dict, "preset_name"); + str = g_value_get_string(gval); + if (strcmp(str, name) == 0) + return dict; + } + return NULL; +} + +static gint +presets_remove(GValue *presets, const gchar *name) +{ + GValue *dict, *gval; + gint count, ii; + + if (presets == NULL || name == NULL) return -1; + count = ghb_array_len(presets); + for (ii = 0; ii < count; ii++) + { + const gchar *str; + dict = ghb_array_get_nth(presets, ii); + gval = ghb_dict_lookup(dict, "preset_name"); + str = g_value_get_string(gval); + if (strcmp(str, name) == 0) + { + ghb_array_remove(presets, ii); + return ii; + } + } + return -1; +} + void ghb_set_preset_default(GValue *settings) { @@ -60,7 +103,7 @@ gchar* ghb_presets_get_description(const gchar *name) { GValue *pdict; - pdict = plist_get_dict(presetsPlist, name); + pdict = presets_get_dict(presetsPlist, name); if (pdict == NULL) return g_strdup(""); return ghb_value_string(ghb_dict_lookup(pdict, "preset_description")); } @@ -93,37 +136,42 @@ preset_get_value( { GValue *dict; - dict = plist_get_dict(presetsPlist, name); + dict = presets_get_dict(presetsPlist, name); return preset_dict_get_value(dict, key); } GList* ghb_presets_get_names() { - GHashTable *dict; - GList *names, *link; + GList *names; GList *standard = NULL; GList *custom = NULL; + gint ii, count; if (presetsPlist == NULL) return NULL; - dict = g_value_get_boxed(presetsPlist); - link = names = g_hash_table_get_keys(dict); - while (link) + count = ghb_array_len(presetsPlist); + for (ii = 0; ii < count; ii++) { gchar *name; gint ptype; + GValue *dict; + GValue *gval; - name = (gchar*)link->data; - ptype = ghb_value_int(preset_get_value(name, "preset_type")); + dict = ghb_array_get_nth(presetsPlist, ii); + gval = ghb_dict_lookup(dict, "preset_name"); + name = (gchar*)g_value_get_string(gval); + ptype = ghb_value_int(preset_dict_get_value(dict, "preset_type")); if (ptype) + { custom = g_list_append(custom, name); + } else + { standard = g_list_append(standard, name); - link = link->next; + } } custom = g_list_sort(custom, key_cmp); standard = g_list_sort(standard, key_cmp); - g_list_free(names); names = g_list_concat(standard, custom); return names; } @@ -136,7 +184,7 @@ ghb_preset_flags(const gchar *name) gint ptype; gint ret = 0; - dict = plist_get_dict(presetsPlist, name); + dict = presets_get_dict(presetsPlist, name); gval = preset_dict_get_value(dict, "preset_type"); if (gval) { @@ -321,7 +369,7 @@ ghb_set_preset(signal_user_data_t *ud, const gchar *name) g_list_free(presets); } } - dict = plist_get_dict(presetsPlist, name); + dict = presets_get_dict(presetsPlist, name); if (dict == NULL || name == NULL) { preset_to_ui(ud, NULL); @@ -604,8 +652,8 @@ ghb_settings_init(signal_user_data_t *ud) void ghb_settings_close() { - //if (internalPlist) - //ghb_value_free(internalPlist); + if (internalPlist) + ghb_value_free(internalPlist); if (presetsPlist) ghb_value_free(presetsPlist); if (prefsPlist) @@ -654,36 +702,41 @@ ghb_prefs_load(signal_user_data_t *ud) void ghb_presets_reload(signal_user_data_t *ud) { - GValue *std_dict, *dict; - GHashTableIter std_iter; + GValue *std_presets; + gint count, ii; g_debug("ghb_presets_reload()\n"); - std_dict = ghb_resource_get("standard-presets"); - if (std_dict == NULL) return; + std_presets = ghb_resource_get("standard-presets"); + if (std_presets == NULL) return; // Merge the keyfile contents into our presets - gchar *name; - GValue *orig_dict; - - ghb_dict_iter_init(&std_iter, std_dict); - // middle (void*) cast prevents gcc warning "defreferencing type-punned - // pointer will break strict-aliasing rules" - while (g_hash_table_iter_next( - &std_iter, (gpointer*)(void*)&name, (gpointer*)(void*)&orig_dict)) + count = ghb_array_len(std_presets); + for (ii = 0; ii < count; ii++) { + const gchar *name; + GValue *std_dict; + GValue *copy_dict; GHashTableIter iter; gchar *key; GValue *value; + gint pos; - dict = ghb_dict_value_new(); - ghb_dict_insert(presetsPlist, g_strdup(name), dict); - ghb_dict_iter_init(&iter, orig_dict); + std_dict = ghb_array_get_nth(std_presets, ii); + name = g_value_get_string(ghb_dict_lookup(std_dict, "preset_name")); + pos = presets_remove(presetsPlist, name); + + copy_dict = ghb_dict_value_new(); + if (pos >= 0) + ghb_array_insert(presetsPlist, pos, copy_dict); + else + ghb_array_append(presetsPlist, copy_dict); + ghb_dict_iter_init(&iter, std_dict); // middle (void*) cast prevents gcc warning "defreferencing type-punned // pointer will break strict-aliasing rules" while (g_hash_table_iter_next( &iter, (gpointer*)(void*)&key, (gpointer*)(void*)&value)) { - ghb_dict_insert(dict, g_strdup(key), ghb_value_dup(value)); + ghb_dict_insert(copy_dict, g_strdup(key), ghb_value_dup(value)); } } store_plist(presetsPlist, "presets"); @@ -723,6 +776,41 @@ ghb_presets_load() presetsPlist = ghb_value_dup(ghb_resource_get("standard-presets")); presets_store(); } + if (G_VALUE_TYPE(presetsPlist) == ghb_dict_get_type()) + { // Presets is older dictionary format. Convert to array + GHashTableIter old_iter; + GValue *presets; + gchar *name; + GValue *orig_dict; + + presets = ghb_array_value_new(32); + ghb_dict_iter_init(&old_iter, presetsPlist); + // middle (void*) cast prevents gcc warning "defreferencing type-punned + // pointer will break strict-aliasing rules" + while (g_hash_table_iter_next( + &old_iter, (gpointer*)(void*)&name, (gpointer*)(void*)&orig_dict)) + { + GHashTableIter iter; + gchar *key; + GValue *value, *dict; + + dict = ghb_dict_value_new(); + ghb_dict_insert(dict, g_strdup("preset_name"), + ghb_string_value_new(name)); + ghb_array_append(presets, dict); + ghb_dict_iter_init(&iter, orig_dict); + // middle (void*) cast prevents gcc warning "defreferencing + // type-punned pointer will break strict-aliasing rules" + while (g_hash_table_iter_next( + &iter, (gpointer*)(void*)&key, (gpointer*)(void*)&value)) + { + ghb_dict_insert(dict, g_strdup(key), ghb_value_dup(value)); + } + } + ghb_value_free(presetsPlist); + presetsPlist = presets; + presets_store(); + } } void @@ -755,7 +843,8 @@ ghb_settings_save(signal_user_data_t *ud, const gchar *name) ghb_settings_set_int64(ud->settings, "preset_type", 1); dict = ghb_dict_value_new(); - ghb_dict_insert(presetsPlist, g_strdup(name), dict); + ghb_dict_insert(dict, g_strdup("preset_name"), ghb_string_value_new(name)); + ghb_array_append(presetsPlist, dict); internal = plist_get_dict(internalPlist, "Presets"); ghb_dict_iter_init(&iter, internal); @@ -800,9 +889,9 @@ ghb_settings_save(signal_user_data_t *ud, const gchar *name) void ghb_presets_remove(const gchar *name) { - if (ghb_dict_lookup(presetsPlist, name)) + if (presets_get_dict(presetsPlist, name)) { - ghb_dict_remove(presetsPlist, name); + presets_remove(presetsPlist, name); presets_store(); } } diff --git a/gtk/src/resource_data.h b/gtk/src/resource_data.h index 63e6ece92..379b1d826 100644 --- a/gtk/src/resource_data.h +++ b/gtk/src/resource_data.h @@ -10134,8 +10134,7 @@ " \n" " \n" " standard-presets\n" -" \n" -" Animation\n" +" \n" " \n" " anamorphic\n" " \n" @@ -10185,6 +10184,8 @@ " preset_description\n" " HandBrake's settings for cartoons, anime, and CGI.\n" +" preset_name\n" +" Animation\n" " preset_type\n" " 0\n" " subtitle_lang\n" @@ -10208,7 +10209,6 @@ "pyramid:me=umh:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip:filter" "=2,2\n" " \n" -" AppleTV\n" " \n" " anamorphic\n" " \n" @@ -10271,6 +10271,8 @@ " HandBrake's settings for the AppleTV, including Dolby D" "igital 5.1 AC3 sound. Provides a good balance between quality and file " "size, and optimizes performance.\n" +" preset_name\n" +" AppleTV\n" " preset_type\n" " 0\n" " subtitle_lang\n" @@ -10291,7 +10293,6 @@ " bframes=3:ref=1:me=umh:no-fast-pskip=1:trellis=1:cabac=0\n" " \n" -" Bedlam\n" " \n" " anamorphic\n" " \n" @@ -10342,6 +10343,8 @@ " HandBrake's settings maxed out for slowest encoding and" " highest quality. Use at your own risk. So slow it's not just insa" "ne...it's a trip to the looney bin.\n" +" preset_name\n" +" Bedlam\n" " preset_type\n" " 0\n" " subtitle_lang\n" @@ -10365,7 +10368,6 @@ "b-pyramid:me=esa:subme=7:me-range=64:analyse=all:8x8dct:trellis=1:no-fa" "st-pskip:no-dct-decimate:filter=-2,-1\n" " \n" -" Blind\n" " \n" " anamorphic\n" " \n" @@ -10415,6 +10417,8 @@ " preset_description\n" " HandBrake's preset for impatient people who don't " "care about picture quality.\n" +" preset_name\n" +" Blind\n" " preset_type\n" " 0\n" " subtitle_lang\n" @@ -10436,7 +10440,6 @@ " x264_options\n" " \n" " \n" -" Broke\n" " \n" " anamorphic\n" " \n" @@ -10487,6 +10490,8 @@ " HandBrake's preset for people without a lot of money to" " waste on hard drives. Tries to maximize quality for burning to CDs, so" " you can party like it's 1999.\n" +" preset_name\n" +" Broke\n" " preset_type\n" " 0\n" " subtitle_lang\n" @@ -10509,7 +10514,6 @@ " ref=3:mixed-refs:bframes=16:bime:weightb:b-rdo:b-pyramid:dir" "ect=auto:me=umh:trellis=1:analyse=all:8x8dct:no-fast-pskip\n" " \n" -" Classic\n" " \n" " anamorphic\n" " \n" @@ -10559,6 +10563,8 @@ " preset_description\n" " HandBrake's traditional, faster, lower-quality settings" ".\n" +" preset_name\n" +" Classic\n" " preset_type\n" " 0\n" " subtitle_lang\n" @@ -10578,7 +10584,6 @@ " x264_options\n" " \n" " \n" -" Constant Quality Rate\n" " \n" " anamorphic\n" " \n" @@ -10629,6 +10634,8 @@ " HandBrake's preset for consistently excellent quality i" "n one pass, with the downside of entirely unpredictable file sizes and " "bitrates.\n" +" preset_name\n" +" Constant Quality Rate\n" " preset_type\n" " 0\n" " subtitle_lang\n" @@ -10651,7 +10658,6 @@ " ref=3:mixed-refs:bframes=3:b-pyramid:b-rdo:bime:weightb:filt" "er=-2,-1:trellis=1:analyse=all:8x8dct:me=umh\n" " \n" -" Deux Six Quatre\n" " \n" " anamorphic\n" " \n" @@ -10703,6 +10709,8 @@ "A good balance of quality and speed, based on community standards found" " in the wild. This preset will give you a much better sense of x264&apo" "s;s capabilities than vanilla main profile.\n" +" preset_name\n" +" Deux Six Quatre\n" " preset_type\n" " 0\n" " subtitle_lang\n" @@ -10725,7 +10733,6 @@ " ref=5:mixed-refs:bframes=3:bime:weightb:b-rdo:b-pyramid:me=u" "mh:subme=7:trellis=1:analyse=all:8x8dct:no-fast-pskip\n" " \n" -" Film\n" " \n" " anamorphic\n" " \n" @@ -10774,6 +10781,8 @@ " \n" " preset_description\n" " HandBrake's preset for feature films.\n" +" preset_name\n" +" Film\n" " preset_type\n" " 0\n" " subtitle_lang\n" @@ -10797,7 +10806,6 @@ "pyramid:me=umh:subme=7:analyse=all:8x8dct:trellis=1:no-fast-pskip\n" " \n" -" Normal\n" " \n" " anamorphic\n" " \n" @@ -10846,6 +10854,8 @@ " \n" " preset_description\n" " HandBrake's normal, default settings.\n" +" preset_name\n" +" Normal\n" " preset_type\n" " 0\n" " subtitle_lang\n" @@ -10867,7 +10877,6 @@ " x264_options\n" " ref=2:bframes=2:me=umh\n" " \n" -" PS3\n" " \n" " anamorphic\n" " \n" @@ -10915,6 +10924,8 @@ " preset_description\n" " HandBrake's settings for the Sony PlayStation 3.\n" +" preset_name\n" +" PS3\n" " preset_type\n" " 0\n" " subtitle_lang\n" @@ -10934,7 +10945,6 @@ " x264_options\n" " level=41:me=umh\n" " \n" -" PSP\n" " \n" " anamorphic\n" " \n" @@ -10984,6 +10994,8 @@ " preset_description\n" " HandBrake's settings for the Sony PlayStation Portable." "\n" +" preset_name\n" +" PSP\n" " preset_type\n" " 0\n" " subtitle_lang\n" @@ -11003,7 +11015,6 @@ " x264_options\n" " \n" " \n" -" QuickTime\n" " \n" " anamorphic\n" " \n" @@ -11054,6 +11065,8 @@ " HandBrake's high quality settings for use with QuickTim" "e. It can be slow, so use it when the Normal preset doesn't look g" "ood enough.\n" +" preset_name\n" +" QuickTime\n" " preset_type\n" " 0\n" " subtitle_lang\n" @@ -11076,7 +11089,6 @@ " ref=3:mixed-refs:bframes=3:bime:weightb:b-rdo:direct=auto:me" "=umh:analyse=all:trellis=1:no-fast-pskip\n" " \n" -" Television\n" " \n" " anamorphic\n" " \n" @@ -11126,6 +11138,8 @@ " preset_description\n" " HandBrake's settings for video from television.\n" +" preset_name\n" +" Television\n" " preset_type\n" " 0\n" " subtitle_lang\n" @@ -11148,7 +11162,6 @@ " ref=3:mixed-refs:bframes=6:bime:weightb:direct=auto:b-pyrami" "d:me=umh:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip\n" " \n" -" Xbox 360\n" " \n" " anamorphic\n" " \n" @@ -11196,6 +11209,8 @@ " preset_description\n" " HandBrake's settings for the Microsoft Xbox 360.\n" +" preset_name\n" +" Xbox 360\n" " preset_type\n" " 0\n" " subtitle_lang\n" @@ -11217,7 +11232,6 @@ "t=auto:b-pyramid:me=umh:analyse=all:no-fast-pskip:filter=-2,-1" "\n" " \n" -" iPhone / iPod Touch\n" " \n" " anamorphic\n" " \n" @@ -11269,6 +11283,8 @@ " preset_description\n" " HandBrake's settings for the iPhone and iPod Touch.\n" +" preset_name\n" +" iPhone / iPod Touch\n" " preset_type\n" " 0\n" " subtitle_lang\n" @@ -11289,7 +11305,6 @@ " level=30:cabac=0:ref=1:analyse=all:me=umh:no-fast-pskip=1:tr" "ellis=1\n" " \n" -" iPod High-Rez\n" " \n" " anamorphic\n" " \n" @@ -11341,6 +11356,8 @@ " preset_description\n" " HandBrake's high resolution settings for the iPod. Good" " video quality, great for viewing on a TV using your iPod\n" +" preset_name\n" +" iPod High-Rez\n" " preset_type\n" " 0\n" " subtitle_lang\n" @@ -11361,7 +11378,6 @@ " level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsiz" "e=2000:analyse=all:me=umh:no-fast-pskip=1\n" " \n" -" iPod Low-Rez\n" " \n" " anamorphic\n" " \n" @@ -11414,6 +11430,8 @@ " HandBrake's low resolution settings for the iPod. Optim" "ized for great playback on the iPod screen, with smaller file size.\n" +" preset_name\n" +" iPod Low-Rez\n" " preset_type\n" " 0\n" " subtitle_lang\n" @@ -11434,7 +11452,7 @@ " level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize" "=2000:analyse=all:me=umh:no-fast-pskip=1\n" " \n" -" \n" +" \n" " widget-deps\n" " \n" " anamorphic\n" diff --git a/gtk/src/resources.plist b/gtk/src/resources.plist index 63ead6603..2a9ddc706 100644 --- a/gtk/src/resources.plist +++ b/gtk/src/resources.plist @@ -5017,8 +5017,7 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A standard-presets - - Animation + anamorphic @@ -5067,6 +5066,8 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A preset_description HandBrake's settings for cartoons, anime, and CGI. + preset_name + Animation preset_type 0 subtitle_lang @@ -5088,7 +5089,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A x264_options ref=5:mixed-refs:bframes=6:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip:filter=2,2 - AppleTV anamorphic @@ -5149,6 +5149,8 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A preset_description HandBrake's settings for the AppleTV, including Dolby Digital 5.1 AC3 sound. Provides a good balance between quality and file size, and optimizes performance. + preset_name + AppleTV preset_type 0 subtitle_lang @@ -5168,7 +5170,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A x264_options bframes=3:ref=1:me=umh:no-fast-pskip=1:trellis=1:cabac=0 - Bedlam anamorphic @@ -5217,6 +5218,8 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A preset_description HandBrake's settings maxed out for slowest encoding and highest quality. Use at your own risk. So slow it's not just insane...it's a trip to the looney bin. + preset_name + Bedlam preset_type 0 subtitle_lang @@ -5238,7 +5241,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A x264_options ref=16:mixed-refs:bframes=16:bime:weightb:b-rdo:direct=auto:b-pyramid:me=esa:subme=7:me-range=64:analyse=all:8x8dct:trellis=1:no-fast-pskip:no-dct-decimate:filter=-2,-1 - Blind anamorphic @@ -5287,6 +5289,8 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A preset_description HandBrake's preset for impatient people who don't care about picture quality. + preset_name + Blind preset_type 0 subtitle_lang @@ -5308,7 +5312,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A x264_options - Broke anamorphic @@ -5357,6 +5360,8 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A preset_description HandBrake's preset for people without a lot of money to waste on hard drives. Tries to maximize quality for burning to CDs, so you can party like it's 1999. + preset_name + Broke preset_type 0 subtitle_lang @@ -5378,7 +5383,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A x264_options ref=3:mixed-refs:bframes=16:bime:weightb:b-rdo:b-pyramid:direct=auto:me=umh:trellis=1:analyse=all:8x8dct:no-fast-pskip - Classic anamorphic @@ -5427,6 +5431,8 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A preset_description HandBrake's traditional, faster, lower-quality settings. + preset_name + Classic preset_type 0 subtitle_lang @@ -5446,7 +5452,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A x264_options - Constant Quality Rate anamorphic @@ -5495,6 +5500,8 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A preset_description HandBrake's preset for consistently excellent quality in one pass, with the downside of entirely unpredictable file sizes and bitrates. + preset_name + Constant Quality Rate preset_type 0 subtitle_lang @@ -5516,7 +5523,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A x264_options ref=3:mixed-refs:bframes=3:b-pyramid:b-rdo:bime:weightb:filter=-2,-1:trellis=1:analyse=all:8x8dct:me=umh - Deux Six Quatre anamorphic @@ -5565,6 +5571,8 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A preset_description HandBrake's preset for true high profile x264 quality. A good balance of quality and speed, based on community standards found in the wild. This preset will give you a much better sense of x264's capabilities than vanilla main profile. + preset_name + Deux Six Quatre preset_type 0 subtitle_lang @@ -5586,7 +5594,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A x264_options ref=5:mixed-refs:bframes=3:bime:weightb:b-rdo:b-pyramid:me=umh:subme=7:trellis=1:analyse=all:8x8dct:no-fast-pskip - Film anamorphic @@ -5635,6 +5642,8 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A preset_description HandBrake's preset for feature films. + preset_name + Film preset_type 0 subtitle_lang @@ -5656,7 +5665,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A x264_options ref=3:mixed-refs:bframes=6:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:subme=7:analyse=all:8x8dct:trellis=1:no-fast-pskip - Normal anamorphic @@ -5705,6 +5713,8 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A preset_description HandBrake's normal, default settings. + preset_name + Normal preset_type 0 subtitle_lang @@ -5726,7 +5736,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A x264_options ref=2:bframes=2:me=umh - PS3 anamorphic @@ -5773,6 +5782,8 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A preset_description HandBrake's settings for the Sony PlayStation 3. + preset_name + PS3 preset_type 0 subtitle_lang @@ -5792,7 +5803,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A x264_options level=41:me=umh - PSP anamorphic @@ -5841,6 +5851,8 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A preset_description HandBrake's settings for the Sony PlayStation Portable. + preset_name + PSP preset_type 0 subtitle_lang @@ -5860,7 +5872,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A x264_options - QuickTime anamorphic @@ -5909,6 +5920,8 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A preset_description HandBrake's high quality settings for use with QuickTime. It can be slow, so use it when the Normal preset doesn't look good enough. + preset_name + QuickTime preset_type 0 subtitle_lang @@ -5930,7 +5943,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A x264_options ref=3:mixed-refs:bframes=3:bime:weightb:b-rdo:direct=auto:me=umh:analyse=all:trellis=1:no-fast-pskip - Television anamorphic @@ -5979,6 +5991,8 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A preset_description HandBrake's settings for video from television. + preset_name + Television preset_type 0 subtitle_lang @@ -6000,7 +6014,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A x264_options ref=3:mixed-refs:bframes=6:bime:weightb:direct=auto:b-pyramid:me=umh:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip - Xbox 360 anamorphic @@ -6047,6 +6060,8 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A preset_description HandBrake's settings for the Microsoft Xbox 360. + preset_name + Xbox 360 preset_type 0 subtitle_lang @@ -6066,7 +6081,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A x264_options level=40:ref=2:mixed-refs:bframes=3:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:analyse=all:no-fast-pskip:filter=-2,-1 - iPhone / iPod Touch anamorphic @@ -6117,6 +6131,8 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A preset_description HandBrake's settings for the iPhone and iPod Touch. + preset_name + iPhone / iPod Touch preset_type 0 subtitle_lang @@ -6136,7 +6152,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A x264_options level=30:cabac=0:ref=1:analyse=all:me=umh:no-fast-pskip=1:trellis=1 - iPod High-Rez anamorphic @@ -6187,6 +6202,8 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A preset_description HandBrake's high resolution settings for the iPod. Good video quality, great for viewing on a TV using your iPod + preset_name + iPod High-Rez preset_type 0 subtitle_lang @@ -6206,7 +6223,6 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A x264_options level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1 - iPod Low-Rez anamorphic @@ -6257,6 +6273,8 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A preset_description HandBrake's low resolution settings for the iPod. Optimized for great playback on the iPod screen, with smaller file size. + preset_name + iPod Low-Rez preset_type 0 subtitle_lang @@ -6276,7 +6294,7 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A x264_options level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1 - + widget-deps anamorphic diff --git a/gtk/src/standard_presets.xml b/gtk/src/standard_presets.xml index 37fc524da..5ae60679d 100644 --- a/gtk/src/standard_presets.xml +++ b/gtk/src/standard_presets.xml @@ -1,9 +1,10 @@ - - Animation + + preset_name + Animation anamorphic autocrop @@ -72,8 +73,9 @@ x264_options ref=5:mixed-refs:bframes=6:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip:filter=2,2 - AppleTV + preset_name + AppleTV anamorphic autoscale @@ -152,8 +154,9 @@ x264_options bframes=3:ref=1:me=umh:no-fast-pskip=1:trellis=1:cabac=0 - Bedlam + preset_name + Bedlam anamorphic autocrop @@ -222,8 +225,9 @@ x264_options ref=16:mixed-refs:bframes=16:bime:weightb:b-rdo:direct=auto:b-pyramid:me=esa:subme=7:me-range=64:analyse=all:8x8dct:trellis=1:no-fast-pskip:no-dct-decimate:filter=-2,-1 - Blind + preset_name + Blind anamorphic autocrop @@ -292,8 +296,9 @@ x264_options - Broke + preset_name + Broke anamorphic autocrop @@ -362,8 +367,9 @@ x264_options ref=3:mixed-refs:bframes=16:bime:weightb:b-rdo:b-pyramid:direct=auto:me=umh:trellis=1:analyse=all:8x8dct:no-fast-pskip - Classic + preset_name + Classic anamorphic autocrop @@ -430,8 +436,9 @@ x264_options - Constant Quality Rate + preset_name + Constant Quality Rate anamorphic autocrop @@ -500,8 +507,9 @@ x264_options ref=3:mixed-refs:bframes=3:b-pyramid:b-rdo:bime:weightb:filter=-2,-1:trellis=1:analyse=all:8x8dct:me=umh - Deux Six Quatre + preset_name + Deux Six Quatre anamorphic autocrop @@ -570,8 +578,9 @@ x264_options ref=5:mixed-refs:bframes=3:bime:weightb:b-rdo:b-pyramid:me=umh:subme=7:trellis=1:analyse=all:8x8dct:no-fast-pskip - Film + preset_name + Film anamorphic autocrop @@ -640,8 +649,9 @@ x264_options ref=3:mixed-refs:bframes=6:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:subme=7:analyse=all:8x8dct:trellis=1:no-fast-pskip - Normal + preset_name + Normal anamorphic autocrop @@ -710,8 +720,9 @@ x264_options ref=2:bframes=2:me=umh - PS3 + preset_name + PS3 anamorphic autoscale @@ -776,8 +787,9 @@ x264_options level=41:me=umh - PSP + preset_name + PSP anamorphic autocrop @@ -844,8 +856,9 @@ x264_options - QuickTime + preset_name + QuickTime anamorphic autocrop @@ -914,8 +927,9 @@ x264_options ref=3:mixed-refs:bframes=3:bime:weightb:b-rdo:direct=auto:me=umh:analyse=all:trellis=1:no-fast-pskip - Television + preset_name + Television anamorphic autocrop @@ -984,8 +998,9 @@ x264_options ref=3:mixed-refs:bframes=6:bime:weightb:direct=auto:b-pyramid:me=umh:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip - Xbox 360 + preset_name + Xbox 360 anamorphic autoscale @@ -1050,8 +1065,9 @@ x264_options level=40:ref=2:mixed-refs:bframes=3:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:analyse=all:no-fast-pskip:filter=-2,-1 - iPhone / iPod Touch + preset_name + iPhone / iPod Touch anamorphic autocrop @@ -1120,8 +1136,9 @@ x264_options level=30:cabac=0:ref=1:analyse=all:me=umh:no-fast-pskip=1:trellis=1 - iPod High-Rez + preset_name + iPod High-Rez anamorphic autocrop @@ -1190,8 +1207,9 @@ x264_options level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1 - iPod Low-Rez + preset_name + iPod Low-Rez anamorphic autocrop @@ -1260,5 +1278,5 @@ x264_options level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1 - + -- cgit v1.2.3