#include "hb-backend.h"
#include "settings.h"
#include "callbacks.h"
+#include "values.h"
typedef struct
{
const gchar *option;
const gchar *shortOpt;
gint ivalue;
- gdouble dvalue;
const gchar *svalue;
- gboolean sensitive;
} options_map_t;
typedef struct
{
gint count;
options_map_t *map;
- gint *grey_options;
} combo_opts_t;
+static const gchar *index_str[] =
+{
+ "0",
+ "1",
+ "2",
+ "3",
+ "4",
+ "5",
+ "6",
+ "7",
+ "8",
+ "9",
+ "10",
+};
+
static options_map_t d_container_opts[] =
{
- {"MKV", "mkv", HB_MUX_MKV, 0.0, "mkv"},
- {"MP4", "mp4", HB_MUX_MP4, 0.0, "mp4"},
- {"M4V", "m4v", HB_MUX_MP4, 0.0, "m4v"},
- {"AVI", "avi", HB_MUX_AVI, 0.0, "avi"},
- {"OGM", "ogm", HB_MUX_OGM, 0.0, "ogm"},
+ {"MKV", "mkv", HB_MUX_MKV, "mkv"},
+ {"MP4", "mp4", HB_MUX_MP4, "mp4"},
+ {"M4V", "m4v", HB_MUX_MP4, "m4v"},
+ {"AVI", "avi", HB_MUX_AVI, "avi"},
+ {"OGM", "ogm", HB_MUX_OGM, "ogm"},
};
combo_opts_t container_opts =
{
static options_map_t d_deint_opts[] =
{
- {"None", "none", 0, 0.0, ""},
- {"Fast", "fast", 1, 0.0, "-1:-1:-1:0:1"},
- {"Slow", "slow", 2, 0.0, "2:-1:-1:0:1"},
- {"Slower", "slower", 3, 0.0, "0:-1:-1:0:1"},
+ {"None", "none", 0, ""},
+ {"Fast", "fast", 1, "-1:-1:-1:0:1"},
+ {"Slow", "slow", 2, "2:-1:-1:0:1"},
+ {"Slower", "slower", 3, "0:-1:-1:0:1"},
};
combo_opts_t deint_opts =
{
static options_map_t d_denoise_opts[] =
{
- {"None", "none", 0, 0.0, ""},
- {"Weak", "weak", 1, 0.0, "2:1:2:3"},
- {"Medium", "medium", 2, 0.0, "3:2:2:3"},
- {"Strong", "strong", 3, 0.0, "7:7:5:5"},
+ {"None", "none", 0, ""},
+ {"Weak", "weak", 1, "2:1:2:3"},
+ {"Medium", "medium", 2, "3:2:2:3"},
+ {"Strong", "strong", 3, "7:7:5:5"},
};
combo_opts_t denoise_opts =
{
static options_map_t d_vcodec_opts[] =
{
- {"H.264 (x264)", "x264", HB_VCODEC_X264, 0.0, ""},
- {"MPEG-4 (XviD)", "xvid", HB_VCODEC_XVID, 0.0, ""},
- {"MPEG-4 (FFMPEG)", "ffmpeg", HB_VCODEC_FFMPEG, 0.0, ""},
- {"Theora", "theora", HB_VCODEC_THEORA, 0.0, ""},
+ {"H.264 (x264)", "x264", HB_VCODEC_X264, ""},
+ {"MPEG-4 (XviD)", "xvid", HB_VCODEC_XVID, ""},
+ {"MPEG-4 (FFMPEG)", "ffmpeg", HB_VCODEC_FFMPEG, ""},
+ {"Theora", "theora", HB_VCODEC_THEORA, ""},
};
combo_opts_t vcodec_opts =
{
static options_map_t d_acodec_opts[] =
{
- {"AAC (faac)", "faac", HB_ACODEC_FAAC, 0.0, ""},
- {"MP3 (lame)", "lame", HB_ACODEC_LAME, 0.0, ""},
- {"Vorbis", "vorbis", HB_ACODEC_VORBIS, 0.0, ""},
- {"AC3 (pass-thru)", "ac3", HB_ACODEC_AC3, 0.0, ""},
+ {"AAC (faac)", "faac", HB_ACODEC_FAAC, "faac"},
+ {"MP3 (lame)", "lame", HB_ACODEC_LAME, "lame"},
+ {"Vorbis", "vorbis", HB_ACODEC_VORBIS, "vorbis"},
+ {"AC3 (pass-thru)", "ac3", HB_ACODEC_AC3, "ac3"},
};
combo_opts_t acodec_opts =
{
d_acodec_opts
};
-static options_map_t d_pref_acodec_opts[] =
-{
- {"None", "none", 0, 0.0, ""},
- {"AAC (faac)", "faac", HB_ACODEC_FAAC, 0.0, ""},
- {"MP3 (lame)", "lame", HB_ACODEC_LAME, 0.0, ""},
- {"Vorbis", "vorbis", HB_ACODEC_VORBIS, 0.0, ""},
- {"AC3 (pass-thru)", "ac3", HB_ACODEC_AC3, 0.0, ""},
-};
-combo_opts_t pref_acodec_opts =
-{
- sizeof(d_pref_acodec_opts)/sizeof(options_map_t),
- d_pref_acodec_opts
-};
-
-static options_map_t d_source_acodec_opts[] =
-{
- {"AC3", "ac3", HB_ACODEC_AC3, 0.0, ""},
- {"DTS", "dca", HB_ACODEC_DCA, 0.0, ""},
- {"MP2", "mpga", HB_ACODEC_MPGA, 0.0, ""},
- {"LPCM", "lpcm", HB_ACODEC_LPCM, 0.0, ""},
-};
-combo_opts_t source_acodec_opts =
-{
- sizeof(d_source_acodec_opts)/sizeof(options_map_t),
- d_source_acodec_opts
-};
-
static options_map_t d_direct_opts[] =
{
- {"None", "none", 0, 0.0, "none"},
- {"Spatial", "spatial", 1, 0.0, "spatial"},
- {"Temporal", "temporal", 2, 0.0, "temporal"},
- {"Automatic", "auto", 3, 0.0, "auto"},
+ {"None", "none", 0, "none"},
+ {"Spatial", "spatial", 1, "spatial"},
+ {"Temporal", "temporal", 2, "temporal"},
+ {"Automatic", "auto", 3, "auto"},
};
combo_opts_t direct_opts =
{
static options_map_t d_me_opts[] =
{
- {"Diamond", "dia", 0, 0.0, "dia"},
- {"Hexagon", "hex", 1, 0.0, "hex"},
- {"Uneven Multi-Hexagon", "umh", 2, 0.0, "umh"},
- {"Exhaustive", "esa", 3, 0.0, "esa"},
+ {"Diamond", "dia", 0, "dia"},
+ {"Hexagon", "hex", 1, "hex"},
+ {"Uneven Multi-Hexagon", "umh", 2, "umh"},
+ {"Exhaustive", "esa", 3, "esa"},
};
combo_opts_t me_opts =
{
static options_map_t d_subme_opts[] =
{
- {"1", "1", 1, 0.0, "1"},
- {"2", "2", 2, 0.0, "2"},
- {"3", "3", 3, 0.0, "3"},
- {"4", "4", 4, 0.0, "4"},
- {"5", "5", 5, 0.0, "5"},
- {"6", "6", 6, 0.0, "6"},
- {"7", "7", 7, 0.0, "7"},
+ {"1", "1", 1, "1"},
+ {"2", "2", 2, "2"},
+ {"3", "3", 3, "3"},
+ {"4", "4", 4, "4"},
+ {"5", "5", 5, "5"},
+ {"6", "6", 6, "6"},
+ {"7", "7", 7, "7"},
+ {"8", "8", 8, "8"},
+ {"9", "9", 9, "9"},
};
combo_opts_t subme_opts =
{
static options_map_t d_analyse_opts[] =
{
- {"Some", "some", 0, 0.0, "some"},
- {"None", "none", 1, 0.0, "none"},
- {"All", "all", 2, 0.0, "all:8x8dct=1"},
+ {"Some", "some", 0, "some"},
+ {"None", "none", 1, "none"},
+ {"All", "all", 2, "all"},
+ {"Custom", "custom", 3, "all"},
};
combo_opts_t analyse_opts =
{
static options_map_t d_trellis_opts[] =
{
- {"Disabled", "off", 0, 0.0, ""},
- {"Final Macro Block", "fmb", 1, 0.0, ""},
- {"Always", "always", 2, 0.0, ""},
+ {"Disabled", "0", 0, "0"},
+ {"Final Macro Block", "1", 1, "1"},
+ {"Always", "2", 2, "2"},
};
combo_opts_t trellis_opts =
{
d_trellis_opts
};
+combo_opts_t subtitle_opts =
+{
+ 0,
+ NULL
+};
+
+combo_opts_t title_opts =
+{
+ 0,
+ NULL
+};
+
+combo_opts_t audio_track_opts =
+{
+ 0,
+ NULL
+};
+
+typedef struct
+{
+ const gchar *name;
+ combo_opts_t *opts;
+} combo_name_map_t;
+
+combo_name_map_t combo_name_map[] =
+{
+ {"container", &container_opts},
+ {"deinterlace", &deint_opts},
+ {"tweak_deinterlace", &deint_opts},
+ {"denoise", &denoise_opts},
+ {"tweak_denoise", &denoise_opts},
+ {"video_codec", &vcodec_opts},
+ {"audio_codec", &acodec_opts},
+ {"x264_direct", &direct_opts},
+ {"x264_me", &me_opts},
+ {"x264_subme", &subme_opts},
+ {"x264_analyse", &analyse_opts},
+ {"x264_trellis", &trellis_opts},
+ {"subtitle_lang", &subtitle_opts},
+ {"title", &title_opts},
+ {"audio_track", &audio_track_opts},
+ {NULL, NULL}
+};
+
typedef struct iso639_lang_t
{
char * eng_name; /* Description in English */
static const iso639_lang_t language_table[] =
{
{ "Any", "", "zz", "und" },
- { "Afar", "", "aa", "aar" },
+ { "Afar", "", "aa", "aar" },
{ "Abkhazian", "", "ab", "abk" },
{ "Afrikaans", "", "af", "afr" },
{ "Akan", "", "ak", "aka" },
};
#define LANG_TABLE_SIZE (sizeof(language_table)/ sizeof(iso639_lang_t))
+static void audio_bitrate_opts_set(GtkBuilder *builder, const gchar *name);
+
static void
-del_tree(const gchar *name)
+del_tree(const gchar *name, gboolean del_top)
{
const gchar *file;
{
gchar *path;
path = g_strdup_printf("%s/%s", name, file);
- del_tree(path);
+ del_tree(path, TRUE);
g_free(path);
file = g_dir_read_name(gdir);
}
- g_rmdir(name);
+ if (del_top)
+ g_rmdir(name);
+ g_dir_close(gdir);
}
else
{
void
ghb_vquality_range(signal_user_data_t *ud, gint *min, gint *max)
{
- if (ghb_settings_get_bool(ud->settings, "directqp"))
+ if (ghb_settings_get_boolean(ud->settings, "directqp"))
{
- gint vcodec = ghb_settings_get_int(ud->settings, "video_codec");
+ gint vcodec = ghb_settings_combo_int(ud->settings, "video_codec");
// Only x264 and ffmpeg currently support direct qp/crf entry
if (vcodec == HB_VCODEC_X264)
{
}
}
-static setting_value_t*
+static gint
+lookup_generic_int(combo_opts_t *opts, const GValue *gval)
+{
+ gint ii;
+ gchar *str;
+ gint result = -1;
+
+ str = ghb_value_string(gval);
+ for (ii = 0; ii < opts->count; ii++)
+ {
+ if (strcmp(opts->map[ii].shortOpt, str) == 0)
+ {
+ result = opts->map[ii].ivalue;
+ break;
+ }
+ }
+ g_free(str);
+ return result;
+}
+
+static const gchar*
+lookup_generic_option(combo_opts_t *opts, const GValue *gval)
+{
+ gint ii;
+ gchar *str;
+ const gchar *result = "";
+
+ str = ghb_value_string(gval);
+ for (ii = 0; ii < opts->count; ii++)
+ {
+ if (strcmp(opts->map[ii].shortOpt, str) == 0)
+ {
+ result = opts->map[ii].option;
+ break;
+ }
+ }
+ g_free(str);
+ return result;
+}
+
+static gint
+lookup_mix_int(const GValue *mix)
+{
+ gint ii;
+ gchar *str;
+ gint result = 0;
+
+
+ str = ghb_value_string(mix);
+ for (ii = 0; ii < hb_audio_mixdowns_count; ii++)
+ {
+ if (strcmp(hb_audio_mixdowns[ii].short_name, str) == 0)
+ {
+ result = hb_audio_mixdowns[ii].amixdown;
+ break;
+ }
+ }
+ g_free(str);
+ return result;
+}
+
+static const gchar*
+lookup_mix_option(const GValue *mix)
+{
+ gint ii;
+ gchar *str;
+ gchar *result = "None";
+
+
+ str = ghb_value_string(mix);
+ for (ii = 0; ii < hb_audio_mixdowns_count; ii++)
+ {
+ if (strcmp(hb_audio_mixdowns[ii].short_name, str) == 0)
+ {
+ result = hb_audio_mixdowns[ii].human_readable_name;
+ break;
+ }
+ }
+ g_free(str);
+ return result;
+}
+
+static gint
+lookup_video_rate_int(const GValue *vrate)
+{
+ gint ii;
+ gchar *str;
+ gint result = 0;
+
+ str = ghb_value_string(vrate);
+ for (ii = 0; ii < hb_video_rates_count; ii++)
+ {
+ if (strcmp(hb_video_rates[ii].string, str) == 0)
+ {
+ result = hb_video_rates[ii].rate;
+ break;
+ }
+ }
+ g_free(str);
+ // Default to "same as source"
+ return result;
+}
+
+static const gchar*
+lookup_video_rate_option(const GValue *vrate)
+{
+ gint ii;
+ gchar *str;
+ const gchar *result = "Same as source";
+
+ str = ghb_value_string(vrate);
+ for (ii = 0; ii < hb_video_rates_count; ii++)
+ {
+ if (strcmp(hb_video_rates[ii].string, str) == 0)
+ {
+ result = hb_video_rates[ii].string;
+ break;
+ }
+ }
+ g_free(str);
+ // Default to "same as source"
+ return result;
+}
+
+static gint
+lookup_audio_rate_int(const GValue *rate)
+{
+ gint ii;
+ gchar *str;
+ gint result = 0;
+
+ // Coincidentally, the string "source" will return 0
+ // which is our flag to use "same as source"
+ str = ghb_value_string(rate);
+ for (ii = 0; ii < hb_audio_rates_count; ii++)
+ {
+ if (strcmp(hb_audio_rates[ii].string, str) == 0)
+ {
+ result = hb_audio_rates[ii].rate;
+ break;
+ }
+ }
+ g_free(str);
+ return result;
+}
+
+static const gchar*
+lookup_audio_rate_option(const GValue *rate)
+{
+ gint ii;
+ gchar *str;
+ const gchar *result = "Same as source";
+
+ // Coincidentally, the string "source" will return 0
+ // which is our flag to use "same as source"
+ str = ghb_value_string(rate);
+ for (ii = 0; ii < hb_audio_rates_count; ii++)
+ {
+ if (strcmp(hb_audio_rates[ii].string, str) == 0)
+ {
+ result = hb_audio_rates[ii].string;
+ break;
+ }
+ }
+ g_free(str);
+ return result;
+}
+
+static gint
+lookup_audio_bitrate_int(const GValue *rate)
+{
+ gint ii;
+ gchar *str;
+ gint result = 0;
+
+ // Coincidentally, the string "source" will return 0
+ // which is our flag to use "same as source"
+ str = ghb_value_string(rate);
+ for (ii = 0; ii < hb_audio_bitrates_count; ii++)
+ {
+ if (strcmp(hb_audio_bitrates[ii].string, str) == 0)
+ {
+ result = hb_audio_bitrates[ii].rate;
+ break;
+ }
+ }
+ g_free(str);
+ return result;
+}
+
+static const gchar*
+lookup_audio_bitrate_option(const GValue *rate)
+{
+ gint ii;
+ gchar *str;
+ const gchar *result = "Same as source";
+
+ // Coincidentally, the string "source" will return 0
+ // which is our flag to use "same as source"
+ str = ghb_value_string(rate);
+ for (ii = 0; ii < hb_audio_bitrates_count; ii++)
+ {
+ if (strcmp(hb_audio_bitrates[ii].string, str) == 0)
+ {
+ result = hb_audio_bitrates[ii].string;
+ break;
+ }
+ }
+ g_free(str);
+ return result;
+}
+
+static gint
+lookup_audio_lang_int(const GValue *rate)
+{
+ gint ii;
+ gchar *str;
+ gint result = 0;
+
+ // Coincidentally, the string "source" will return 0
+ // which is our flag to use "same as source"
+ str = ghb_value_string(rate);
+ for (ii = 0; ii < LANG_TABLE_SIZE; ii++)
+ {
+ if (strcmp(language_table[ii].iso639_2, str) == 0)
+ {
+ result = ii;
+ break;
+ }
+ }
+ g_free(str);
+ return result;
+}
+
+static const gchar*
+lookup_audio_lang_option(const GValue *rate)
+{
+ gint ii;
+ gchar *str;
+ const gchar *result = "Same as source";
+
+ // Coincidentally, the string "source" will return 0
+ // which is our flag to use "same as source"
+ str = ghb_value_string(rate);
+ for (ii = 0; ii < LANG_TABLE_SIZE; ii++)
+ {
+ if (strcmp(language_table[ii].iso639_2, str) == 0)
+ {
+ result = language_table[ii].eng_name;
+ break;
+ }
+ }
+ g_free(str);
+ return result;
+}
+
+static GValue*
get_acodec_value(gint val)
{
- setting_value_t *value = NULL;
+ GValue *value = NULL;
gint ii;
for (ii = 0; ii < acodec_opts.count; ii++)
{
if (acodec_opts.map[ii].ivalue == val)
{
- value = g_malloc(sizeof(setting_value_t));
- value->option = g_strdup(acodec_opts.map[ii].option);
- value->shortOpt = g_strdup(acodec_opts.map[ii].shortOpt);
- value->svalue = g_strdup(acodec_opts.map[ii].svalue);
- value->index = ii;
- value->ivalue = acodec_opts.map[ii].ivalue;
- value->dvalue = acodec_opts.map[ii].dvalue;
+ value = ghb_string_value_new(acodec_opts.map[ii].shortOpt);
break;
}
}
return value;
}
-static setting_value_t*
+static GValue*
+get_abitrate_value(gint val)
+{
+ GValue *value = NULL;
+ gint ii;
+
+ for (ii = 0; ii < hb_audio_bitrates_count; ii++)
+ {
+ if (hb_audio_bitrates[ii].rate == val)
+ {
+ value = ghb_string_value_new(hb_audio_bitrates[ii].string);
+ break;
+ }
+ }
+ return value;
+}
+
+static GValue*
get_amix_value(gint val)
{
- setting_value_t *value = NULL;
+ GValue *value = NULL;
gint ii;
for (ii = 0; ii < hb_audio_mixdowns_count; ii++)
{
if (hb_audio_mixdowns[ii].amixdown == val)
{
- value = g_malloc(sizeof(setting_value_t));
- value->option = g_strdup(hb_audio_mixdowns[ii].human_readable_name);
- value->shortOpt = g_strdup(hb_audio_mixdowns[ii].short_name);
- value->svalue = g_strdup(hb_audio_mixdowns[ii].internal_name);
- value->index = ii;
- value->ivalue = hb_audio_mixdowns[ii].amixdown;
- value->dvalue = hb_audio_mixdowns[ii].amixdown;
+ value = ghb_string_value_new(hb_audio_mixdowns[ii].short_name);
break;
}
}
}
// Handle for libhb. Gets set by ghb_backend_init()
-static hb_handle_t * h = NULL;
+static hb_handle_t * h_scan = NULL;
+static hb_handle_t * h_queue = NULL;
extern void hb_get_tempory_directory(hb_handle_t *h, char path[512]);
void
-ghb_hb_cleanup()
+ghb_hb_cleanup(gboolean partial)
{
char dir[512];
- hb_get_tempory_directory(h, dir);
- del_tree(dir);
+ hb_get_tempory_directory(h_scan, dir);
+ del_tree(dir, !partial);
+}
+
+gint
+ghb_get_title_number(gint titleindex)
+{
+ hb_list_t * list;
+ hb_title_t * title;
+
+ if (h_scan == NULL) return 1;
+ list = hb_get_titles( h_scan );
+ if( !hb_list_count( list ) )
+ {
+ /* No valid title, stop right there */
+ return 1;
+ }
+ title = hb_list_item( list, titleindex );
+ if (title == NULL) return 1; // Bad titleindex
+ return title->index;
}
static hb_audio_config_t*
hb_title_t * title;
hb_audio_config_t *audio = NULL;
- if (h == NULL) return NULL;
- list = hb_get_titles( h );
+ if (h_scan == NULL) return NULL;
+ list = hb_get_titles( h_scan );
if( !hb_list_count( list ) )
{
/* No valid title, stop right there */
return -1;
}
-#if 0
-const gchar*
-ghb_get_rate_string(gint rate, gint type)
-{
- gint index;
-
- switch (type)
- {
- case GHB_FRAMERATE:
- {
- index = search_rates(hb_video_rates, rate, hb_video_rates_count);
- if (index >= 0) return hb_video_rates[index].string;
- } break;
- case GHB_AUDIO_BITRATE:
- {
- rate /= 1000;
- index = search_rates(hb_audio_bitrates, rate, hb_audio_bitrates_count);
- if (index >= 0) return hb_audio_bitrates[index].string;
- } break;
- case GHB_AUDIO_SAMPLERATE:
- {
- index = search_rates(hb_audio_rates, rate, hb_audio_rates_count);
- if (index >= 0) return hb_audio_rates[index].string;
- } break;
- }
- return NULL;
-}
-#endif
-
static gboolean find_combo_item_by_int(GtkTreeModel *store, gint value, GtkTreeIter *iter);
static GtkListStore*
{
GtkWidget *widget;
gint container, track, titleindex, acodec;
+ gboolean httpopt;
hb_audio_config_t *audio = NULL;
widget = GHB_WIDGET (builder, "title");
- titleindex = ghb_widget_int(widget);
+ titleindex = ghb_lookup_combo_int("title", ghb_widget_value(widget));
widget = GHB_WIDGET (builder, "audio_track");
- track = ghb_widget_int(widget);
+ track = ghb_lookup_combo_int("audio_track", ghb_widget_value(widget));
audio = get_hb_audio(titleindex, track);
+ widget = GHB_WIDGET (builder, "container");
+ container = ghb_lookup_combo_int("container", ghb_widget_value(widget));
+ widget = GHB_WIDGET (builder, "http_optimize_mp4");
+ httpopt = ghb_widget_boolean(widget);
grey_combo_box_item(builder, "audio_codec", HB_ACODEC_FAAC, FALSE);
- grey_combo_box_item(builder, "pref_audio_codec1", HB_ACODEC_FAAC, FALSE);
- grey_combo_box_item(builder, "pref_audio_codec2", HB_ACODEC_FAAC, FALSE);
grey_combo_box_item(builder, "audio_codec", HB_ACODEC_LAME, FALSE);
- grey_combo_box_item(builder, "pref_audio_codec1", HB_ACODEC_LAME, FALSE);
- grey_combo_box_item(builder, "pref_audio_codec2", HB_ACODEC_LAME, FALSE);
grey_combo_box_item(builder, "audio_codec", HB_ACODEC_VORBIS, FALSE);
- grey_combo_box_item(builder, "pref_audio_codec1", HB_ACODEC_VORBIS, FALSE);
- grey_combo_box_item(builder, "pref_audio_codec2", HB_ACODEC_VORBIS, FALSE);
- if (audio && audio->in.codec != HB_ACODEC_AC3)
+
+ gboolean allow_ac3 = TRUE;
+ allow_ac3 =
+ !(container == HB_MUX_MP4 && httpopt) &&
+ (container != HB_MUX_OGM);
+
+ if (allow_ac3)
{
- grey_combo_box_item(builder, "audio_codec", HB_ACODEC_AC3, TRUE);
+ grey_combo_box_item(builder, "audio_codec", HB_ACODEC_AC3, FALSE);
}
else
{
- grey_combo_box_item(builder, "audio_codec", HB_ACODEC_AC3, FALSE);
+ grey_combo_box_item(builder, "audio_codec", HB_ACODEC_AC3, TRUE);
+ }
+ if (audio && audio->in.codec != HB_ACODEC_AC3)
+ {
+ grey_combo_box_item(builder, "audio_codec", HB_ACODEC_AC3, TRUE);
}
- grey_combo_box_item(builder, "pref_audio_codec1", HB_ACODEC_AC3, FALSE);
- grey_combo_box_item(builder, "pref_audio_codec2", HB_ACODEC_AC3, FALSE);
grey_combo_box_item(builder, "video_codec", HB_VCODEC_THEORA, FALSE);
widget = GHB_WIDGET (builder, "audio_codec");
- acodec = ghb_widget_int(widget);
+ acodec = ghb_lookup_combo_int("audio_codec", ghb_widget_value(widget));
if (acodec != HB_ACODEC_AC3)
{
grey_combo_box_item(builder, "audio_mix", 0, TRUE);
}
- widget = GHB_WIDGET (builder, "container");
- container = ghb_widget_int(widget);
if (container == HB_MUX_MP4)
{
grey_combo_box_item(builder, "audio_codec", HB_ACODEC_LAME, TRUE);
- grey_combo_box_item(builder, "pref_audio_codec1", HB_ACODEC_LAME, TRUE);
- grey_combo_box_item(builder, "pref_audio_codec2", HB_ACODEC_LAME, TRUE);
grey_combo_box_item(builder, "audio_codec", HB_ACODEC_VORBIS, TRUE);
- grey_combo_box_item(builder, "pref_audio_codec1", HB_ACODEC_VORBIS, TRUE);
- grey_combo_box_item(builder, "pref_audio_codec2", HB_ACODEC_VORBIS, TRUE);
grey_combo_box_item(builder, "video_codec", HB_VCODEC_THEORA, TRUE);
}
else if (container == HB_MUX_AVI)
{
grey_combo_box_item(builder, "audio_codec", HB_ACODEC_FAAC, TRUE);
- grey_combo_box_item(builder, "pref_audio_codec1", HB_ACODEC_FAAC, TRUE);
- grey_combo_box_item(builder, "pref_audio_codec2", HB_ACODEC_FAAC, TRUE);
grey_combo_box_item(builder, "audio_codec", HB_ACODEC_VORBIS, TRUE);
- grey_combo_box_item(builder, "pref_audio_codec1", HB_ACODEC_VORBIS, TRUE);
- grey_combo_box_item(builder, "pref_audio_codec2", HB_ACODEC_VORBIS, TRUE);
grey_combo_box_item(builder, "video_codec", HB_VCODEC_THEORA, TRUE);
}
else if (container == HB_MUX_OGM)
{
grey_combo_box_item(builder, "audio_codec", HB_ACODEC_FAAC, TRUE);
- grey_combo_box_item(builder, "pref_audio_codec1", HB_ACODEC_FAAC, TRUE);
- grey_combo_box_item(builder, "pref_audio_codec2", HB_ACODEC_FAAC, TRUE);
- grey_combo_box_item(builder, "audio_codec", HB_ACODEC_AC3, TRUE);
- grey_combo_box_item(builder, "pref_audio_codec1", HB_ACODEC_AC3, TRUE);
- grey_combo_box_item(builder, "pref_audio_codec2", HB_ACODEC_AC3, TRUE);
}
gboolean allow_mono = TRUE;
G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING);
gtk_combo_box_set_model(combo, GTK_TREE_MODEL(store));
- gtk_cell_layout_clear(GTK_CELL_LAYOUT(combo));
- cell = GTK_CELL_RENDERER(gtk_cell_renderer_text_new());
- gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo), cell, TRUE);
- gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo), cell,
- "text", 0, "sensitive", 1, NULL);
-}
-
-static void
-audio_bitrate_opts_set(GtkBuilder *builder, const gchar *name, hb_rate_t *rates, gint count)
-{
- GtkTreeIter iter;
- GtkListStore *store;
- gint ii;
-
- g_debug("audio_bitrate_opts_set ()\n");
- store = get_combo_box_store(builder, name);
- gtk_list_store_clear(store);
- for (ii = 0; ii < count; ii++)
+ if (GTK_WIDGET_TYPE(combo) == GTK_TYPE_COMBO_BOX)
{
- gtk_list_store_append(store, &iter);
- gtk_list_store_set(store, &iter,
- 0, rates[ii].string,
- 1, TRUE,
- 2, rates[ii].string,
- 3, rates[ii].rate * 1000,
- 4, rates[ii].string,
- -1);
+ gtk_cell_layout_clear(GTK_CELL_LAYOUT(combo));
+ cell = GTK_CELL_RENDERER(gtk_cell_renderer_text_new());
+ gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo), cell, TRUE);
+ gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo), cell,
+ "text", 0, "sensitive", 1, NULL);
}
-}
-
-static gboolean
-audio_bitrate_opts_clean(GtkBuilder *builder, const gchar *name, hb_rate_t *rates, gint count)
-{
- GtkTreeIter iter;
- GtkListStore *store;
- gint ivalue;
- gboolean done = FALSE;
- gboolean changed = FALSE;
-
- g_debug("audio_bitrate_opts_clean ()\n");
- store = get_combo_box_store(builder, name);
- if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL(store), &iter))
- {
- do
- {
- gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, 3, &ivalue, -1);
- if (search_rates(rates, ivalue/1000, count) < 0)
- {
- done = !gtk_list_store_remove(store, &iter);
- changed = TRUE;
- }
- else
- {
- done = !gtk_tree_model_iter_next (GTK_TREE_MODEL(store), &iter);
- }
- } while (!done);
+ else
+ { // Combo box entry
+ gtk_combo_box_entry_set_text_column(GTK_COMBO_BOX_ENTRY(combo), 0);
}
- return changed;
-}
+}
static void
audio_samplerate_opts_set(GtkBuilder *builder, const gchar *name, hb_rate_t *rates, gint count)
GtkListStore *store;
gint ii;
- g_debug("audio_bitrate_opts_set ()\n");
+ g_debug("mix_opts_set ()\n");
store = get_combo_box_store(builder, name);
gtk_list_store_clear(store);
gtk_list_store_append(store, &iter);
GtkListStore *store;
gint ii;
- g_debug("audio_bitrate_opts_set ()\n");
+ g_debug("language_opts_set ()\n");
store = get_combo_box_store(builder, name);
gtk_list_store_clear(store);
for (ii = 0; ii < LANG_TABLE_SIZE; ii++)
}
}
+static gchar **titles = NULL;
+
void
title_opts_set(GtkBuilder *builder, const gchar *name)
{
GtkTreeIter iter;
GtkListStore *store;
- hb_list_t * list;
- hb_title_t * title;
+ hb_list_t * list = NULL;
+ hb_title_t * title = NULL;
gint ii;
gint count = 0;
g_debug("title_opts_set ()\n");
store = get_combo_box_store(builder, name);
gtk_list_store_clear(store);
- if (h != NULL)
+ if (h_scan != NULL)
{
- list = hb_get_titles( h );
+ list = hb_get_titles( h_scan );
count = hb_list_count( list );
if (count > 100) count = 100;
}
+ if (titles) g_strfreev(titles);
+ if (title_opts.map) g_free(title_opts.map);
+ if (count > 0)
+ {
+ title_opts.count = count;
+ title_opts.map = g_malloc(count*sizeof(options_map_t));
+ titles = g_malloc((count+1) * sizeof(gchar*));
+ }
+ else
+ {
+ title_opts.count = 1;
+ title_opts.map = g_malloc(sizeof(options_map_t));
+ titles = NULL;
+ }
if( count <= 0 )
{
// No titles. Fill in a default.
3, -1,
4, "none",
-1);
+ title_opts.map[0].option = "No Titles";
+ title_opts.map[0].shortOpt = "none";
+ title_opts.map[0].ivalue = -1;
+ title_opts.map[0].svalue = "none";
return;
}
for (ii = 0; ii < count; ii++)
{
- gchar *option;
-
title = (hb_title_t*)hb_list_item(list, ii);
- option = g_strdup_printf ("%d - %02dh%02dm%02ds",
- title->index, title->hours, title->minutes, title->seconds);
+ if (title->duration != 0)
+ {
+ titles[ii] = g_strdup_printf ("%d - %02dh%02dm%02ds",
+ title->index, title->hours, title->minutes, title->seconds);
+ }
+ else
+ {
+ titles[ii] = g_strdup_printf ("%d - Unknown Length", title->index);
+ }
gtk_list_store_append(store, &iter);
gtk_list_store_set(store, &iter,
- 0, option,
+ 0, titles[ii],
1, TRUE,
- 2, option,
+ 2, titles[ii],
3, ii,
- 4, option,
+ 4, titles[ii],
-1);
+ title_opts.map[ii].option = titles[ii];
+ title_opts.map[ii].shortOpt = titles[ii];
+ title_opts.map[ii].ivalue = ii;
+ title_opts.map[ii].svalue = titles[ii];
}
+ titles[ii] = NULL;
}
static gboolean
return foundit;
}
-static gboolean
-audio_rate_opts_add(GtkBuilder *builder, const gchar *name, gint rate)
-{
- GtkTreeIter iter;
- GtkListStore *store;
- gchar *str;
-
- g_debug("audio_rate_opts_add ()\n");
- store = get_combo_box_store(builder, name);
- if (!find_combo_item_by_int(GTK_TREE_MODEL(store), rate, &iter))
- {
- str = g_strdup_printf ("%.8g", (gdouble)rate/1000.0);
- gtk_list_store_append(store, &iter);
- gtk_list_store_set(store, &iter,
- 0, str,
- 1, TRUE,
- 2, str,
- 3, rate,
- 4, str,
- -1);
- return TRUE;
- }
- return FALSE;
-}
-
-#if 0
-static gboolean
-audio_rate_opts_remove(GtkBuilder *builder, const gchar *name, gint rate)
-{
- GtkTreeIter iter;
- GtkListStore *store;
-
- g_debug("audio_rate_opts_remove ()\n");
- store = get_combo_box_store(builder, name);
- if (find_combo_item_by_int(GTK_TREE_MODEL(store), rate, &iter))
- {
- gtk_list_store_remove (store, &iter);
- return TRUE;
- }
- return FALSE;
-}
-#endif
-
void
audio_track_opts_set(GtkBuilder *builder, const gchar *name, gint titleindex)
{
GtkTreeIter iter;
GtkListStore *store;
- hb_list_t * list;
- hb_title_t * title;
+ hb_list_t * list = NULL;
+ hb_title_t * title = NULL;
hb_audio_config_t * audio;
gint ii;
gint count = 0;
g_debug("audio_track_opts_set ()\n");
store = get_combo_box_store(builder, name);
gtk_list_store_clear(store);
- if (h != NULL)
+ if (h_scan != NULL)
{
- list = hb_get_titles( h );
+ list = hb_get_titles( h_scan );
title = (hb_title_t*)hb_list_item( list, titleindex );
if (title != NULL)
{
}
}
if (count > 10) count = 10;
+ if (audio_track_opts.map) g_free(audio_track_opts.map);
+ if (count > 0)
+ {
+ audio_track_opts.count = count;
+ audio_track_opts.map = g_malloc(count*sizeof(options_map_t));
+ }
+ else
+ {
+ audio_track_opts.count = 1;
+ audio_track_opts.map = g_malloc(sizeof(options_map_t));
+ }
if( count <= 0 )
{
// No audio. set some default
3, -1,
4, "none",
-1);
+ audio_track_opts.map[0].option = "No Audio";
+ audio_track_opts.map[0].shortOpt = "none";
+ audio_track_opts.map[0].ivalue = -1;
+ audio_track_opts.map[0].svalue = "none";
return;
}
for (ii = 0; ii < count; ii++)
gtk_list_store_set(store, &iter,
0, audio->lang.description,
1, TRUE,
- 2, audio->lang.description,
+ 2, index_str[ii],
3, ii,
- 4, audio->lang.description,
+ 4, index_str[ii],
-1);
+ audio_track_opts.map[ii].option = audio->lang.description,
+ audio_track_opts.map[ii].shortOpt = index_str[ii];
+ audio_track_opts.map[ii].ivalue = ii;
+ audio_track_opts.map[ii].svalue = index_str[ii];
}
}
+
void
subtitle_opts_set(GtkBuilder *builder, const gchar *name, gint titleindex)
{
GtkTreeIter iter;
GtkListStore *store;
- hb_list_t * list;
- hb_title_t * title;
+ hb_list_t * list = NULL;
+ hb_title_t * title = NULL;
hb_subtitle_t * subtitle;
gint ii;
gint count = 0;
- g_debug("subtitle_opts_set ()\n");
+ g_debug("subtitle_opts_set () %s\n", name);
store = get_combo_box_store(builder, name);
gtk_list_store_clear(store);
- if (h != NULL)
+ if (h_scan != NULL)
{
- list = hb_get_titles( h );
+ list = hb_get_titles( h_scan );
title = (hb_title_t*)hb_list_item( list, titleindex );
if (title != NULL)
{
}
}
if (count > 10) count = 10;
+ if (subtitle_opts.map) g_free(subtitle_opts.map);
+ if (count > 0)
+ {
+ subtitle_opts.count = count+2;
+ subtitle_opts.map = g_malloc((count+2)*sizeof(options_map_t));
+ }
+ else
+ {
+ subtitle_opts.count = LANG_TABLE_SIZE+2;
+ subtitle_opts.map = g_malloc((LANG_TABLE_SIZE+2)*sizeof(options_map_t));
+ }
// Add options for "none" and "autoselect"
gtk_list_store_append(store, &iter);
gtk_list_store_set(store, &iter,
3, -2,
4, "none",
-1);
+ subtitle_opts.map[0].option = "None";
+ subtitle_opts.map[0].shortOpt = "none";
+ subtitle_opts.map[0].ivalue = -2;
+ subtitle_opts.map[0].svalue = "none";
gtk_list_store_append(store, &iter);
gtk_list_store_set(store, &iter,
- 0, "Same As Audio",
+ 0, "Same as audio",
1, TRUE,
2, "auto",
3, -1,
4, "auto",
-1);
- for (ii = 0; ii < count; ii++)
+ subtitle_opts.map[0].option = "Same as audio";
+ subtitle_opts.map[0].shortOpt = "auto";
+ subtitle_opts.map[0].ivalue = -1;
+ subtitle_opts.map[0].svalue = "auto";
+ if (count >0)
{
- subtitle = (hb_subtitle_t *) hb_list_item( title->list_subtitle, ii );
- gtk_list_store_append(store, &iter);
- gtk_list_store_set(store, &iter,
- 0, subtitle->lang,
- 1, TRUE,
- 2, subtitle->iso639_2,
- 3, ii,
- 4, subtitle->iso639_2,
- -1);
+ for (ii = 0; ii < count; ii++)
+ {
+ subtitle = (hb_subtitle_t *)hb_list_item(title->list_subtitle, ii);
+ gtk_list_store_append(store, &iter);
+ gtk_list_store_set(store, &iter,
+ 0, subtitle->lang,
+ 1, TRUE,
+ 2, subtitle->iso639_2,
+ 3, ii,
+ 4, subtitle->iso639_2,
+ -1);
+ subtitle_opts.map[ii+2].option = subtitle->lang;
+ subtitle_opts.map[ii+2].shortOpt = subtitle->iso639_2;
+ subtitle_opts.map[ii+2].ivalue = ii;
+ subtitle_opts.map[ii+2].svalue = subtitle->iso639_2;
+ }
}
- if (titleindex == -1)
+ else
{
for (ii = 0; ii < LANG_TABLE_SIZE; ii++)
{
3, ii,
4, language_table[ii].iso639_2,
-1);
+ subtitle_opts.map[ii+2].option = language_table[ii].eng_name;
+ subtitle_opts.map[ii+2].shortOpt = language_table[ii].iso639_2;
+ subtitle_opts.map[ii+2].ivalue = ii;
+ subtitle_opts.map[ii+2].svalue = language_table[ii].iso639_2;
}
}
}
gint titleindex = 0;
g_debug("ghb_longest_title ()\n");
- if (h == NULL) return 0;
- list = hb_get_titles( h );
+ if (h_scan == NULL) return 0;
+ list = hb_get_titles( h_scan );
count = hb_list_count( list );
if (count > 100) count = 100;
for (ii = 0; ii < count; ii++)
}
gint
-ghb_find_audio_track(gint titleindex, const gchar *lang, gint acodec)
+ghb_find_audio_track(gint titleindex, const gchar *lang, gint index)
{
hb_list_t * list;
hb_title_t * title;
hb_audio_config_t * audio;
gint ii;
gint count = 0;
- gint track = 0;
+ gint track = -1;
+ gint match = 0;
g_debug("find_audio_track ()\n");
- if (h != NULL)
+ if (h_scan != NULL)
{
- list = hb_get_titles( h );
+ list = hb_get_titles( h_scan );
title = (hb_title_t*)hb_list_item( list, titleindex );
if (title != NULL)
{
if ((strcmp(lang, audio->lang.iso639_2) == 0) ||
(strcmp(lang, "und") == 0))
{
- // Candidate track. Will use if no better match found
- track = ii;
- if (audio->in.codec == acodec)
+ if (index == match)
{
- // Perfect match
- return track;
+ track = ii;
+ break;
}
+ match++;
}
}
return track;
gint ii;
g_debug("generic_opts_set ()\n");
+ if (name == NULL || opts == NULL) return;
store = get_combo_box_store(builder, name);
gtk_list_store_clear(store);
for (ii = 0; ii < opts->count; ii++)
}
}
+combo_opts_t*
+find_combo_table(const gchar *name)
+{
+ gint ii;
+
+ for (ii = 0; combo_name_map[ii].name != NULL; ii++)
+ {
+ if (strcmp(name, combo_name_map[ii].name) == 0)
+ {
+ return combo_name_map[ii].opts;
+ }
+ }
+ return NULL;
+}
+
+gint
+ghb_lookup_combo_int(const gchar *name, const GValue *gval)
+{
+ if (strcmp(name, "audio_bitrate") == 0)
+ return lookup_audio_bitrate_int(gval);
+ else if (strcmp(name, "audio_rate") == 0)
+ return lookup_audio_rate_int(gval);
+ else if (strcmp(name, "framerate") == 0)
+ return lookup_video_rate_int(gval);
+ else if (strcmp(name, "audio_mix") == 0)
+ return lookup_mix_int(gval);
+ else if (strcmp(name, "source_audio_lang") == 0)
+ return lookup_audio_lang_int(gval);
+ else
+ {
+ return lookup_generic_int(find_combo_table(name), gval);
+ }
+ g_warning("ghb_lookup_combo_int() couldn't find %s", name);
+ return 0;
+}
+
+const gchar*
+ghb_lookup_combo_option(const gchar *name, const GValue *gval)
+{
+ if (strcmp(name, "audio_bitrate") == 0)
+ return lookup_audio_bitrate_option(gval);
+ else if (strcmp(name, "audio_rate") == 0)
+ return lookup_audio_rate_option(gval);
+ else if (strcmp(name, "framerate") == 0)
+ return lookup_video_rate_option(gval);
+ else if (strcmp(name, "audio_mix") == 0)
+ return lookup_mix_option(gval);
+ else if (strcmp(name, "source_audio_lang") == 0)
+ return lookup_audio_lang_option(gval);
+ else
+ {
+ return lookup_generic_option(find_combo_table(name), gval);
+ }
+ g_warning("ghb_lookup_combo_int() couldn't find %s", name);
+ return 0;
+}
+
void
ghb_update_ui_combo_box(GtkBuilder *builder, const gchar *name, gint user_data, gboolean all)
{
}
}
}
- if (all || strcmp(name, "audio_bitrate") == 0)
- audio_bitrate_opts_set(builder, "audio_bitrate", hb_audio_bitrates, hb_audio_bitrates_count);
- if (all || strcmp(name, "pref_audio_bitrate1") == 0)
- audio_bitrate_opts_set(builder, "pref_audio_bitrate1", hb_audio_bitrates, hb_audio_bitrates_count);
- if (all || strcmp(name, "pref_audio_bitrate2") == 0)
- audio_bitrate_opts_set(builder, "pref_audio_bitrate2", hb_audio_bitrates, hb_audio_bitrates_count);
- if (all || strcmp(name, "audio_sample_rate") == 0)
- audio_samplerate_opts_set(builder, "audio_sample_rate", hb_audio_rates, hb_audio_rates_count);
- if (all || strcmp(name, "pref_audio_rate1") == 0)
- audio_samplerate_opts_set(builder, "pref_audio_rate1", hb_audio_rates, hb_audio_rates_count);
- if (all || strcmp(name, "pref_audio_rate2") == 0)
- audio_samplerate_opts_set(builder, "pref_audio_rate2", hb_audio_rates, hb_audio_rates_count);
- if (all || strcmp(name, "framerate") == 0)
+ if (all)
+ {
+ audio_bitrate_opts_set(builder, "audio_bitrate");
+ audio_samplerate_opts_set(builder, "audio_rate", hb_audio_rates, hb_audio_rates_count);
video_rate_opts_set(builder, "framerate", hb_video_rates, hb_video_rates_count);
- if (all || strcmp(name, "audio_mix") == 0)
mix_opts_set(builder, "audio_mix");
- if (all || strcmp(name, "pref_audio_mix1") == 0)
- mix_opts_set(builder, "pref_audio_mix1");
- if (all || strcmp(name, "pref_audio_mix2") == 0)
- mix_opts_set(builder, "pref_audio_mix2");
- if (all || strcmp(name, "pref_source_audio_lang") == 0)
- language_opts_set(builder, "pref_source_audio_lang");
- if (all || strcmp(name, "subtitle_lang") == 0)
+ language_opts_set(builder, "source_audio_lang");
subtitle_opts_set(builder, "subtitle_lang", user_data);
- if (all || strcmp(name, "title") == 0)
title_opts_set(builder, "title");
- if (all || strcmp(name, "audio_track") == 0)
audio_track_opts_set(builder, "audio_track", user_data);
- if (all || strcmp(name, "container") == 0)
generic_opts_set(builder, "container", &container_opts);
- if (all || strcmp(name, "deinterlace") == 0)
generic_opts_set(builder, "deinterlace", &deint_opts);
- if (all || strcmp(name, "denoise") == 0)
+ generic_opts_set(builder, "tweak_deinterlace", &deint_opts);
generic_opts_set(builder, "denoise", &denoise_opts);
- if (all || strcmp(name, "video_codec") == 0)
+ generic_opts_set(builder, "tweak_denoise", &denoise_opts);
generic_opts_set(builder, "video_codec", &vcodec_opts);
- if (all || strcmp(name, "audio_codec") == 0)
generic_opts_set(builder, "audio_codec", &acodec_opts);
- if (all || strcmp(name, "pref_audio_codec1") == 0)
- generic_opts_set(builder, "pref_audio_codec1", &pref_acodec_opts);
- if (all || strcmp(name, "pref_audio_codec2") == 0)
- generic_opts_set(builder, "pref_audio_codec2", &pref_acodec_opts);
- if (all || strcmp(name, "pref_source_audio_codec") == 0)
- generic_opts_set(builder, "pref_source_audio_codec", &source_acodec_opts);
- if (all || strcmp(name, "x264_direct") == 0)
generic_opts_set(builder, "x264_direct", &direct_opts);
- if (all || strcmp(name, "x264_me") == 0)
generic_opts_set(builder, "x264_me", &me_opts);
- if (all || strcmp(name, "x264_subme") == 0)
generic_opts_set(builder, "x264_subme", &subme_opts);
- if (all || strcmp(name, "x264_analyse") == 0)
generic_opts_set(builder, "x264_analyse", &analyse_opts);
- if (all || strcmp(name, "x264_trellis") == 0)
generic_opts_set(builder, "x264_trellis", &trellis_opts);
+ }
+ else
+ {
+ if (strcmp(name, "audio_bitrate") == 0)
+ audio_bitrate_opts_set(builder, "audio_bitrate");
+ else if (strcmp(name, "audio_rate") == 0)
+ audio_samplerate_opts_set(builder, "audio_rate", hb_audio_rates, hb_audio_rates_count);
+ else if (strcmp(name, "framerate") == 0)
+ video_rate_opts_set(builder, "framerate", hb_video_rates, hb_video_rates_count);
+ else if (strcmp(name, "audio_mix") == 0)
+ mix_opts_set(builder, "audio_mix");
+ else if (strcmp(name, "source_audio_lang") == 0)
+ language_opts_set(builder, "source_audio_lang");
+ else if (strcmp(name, "subtitle_lang") == 0)
+ subtitle_opts_set(builder, "subtitle_lang", user_data);
+ else if (strcmp(name, "title") == 0)
+ title_opts_set(builder, "title");
+ else if (strcmp(name, "audio_track") == 0)
+ audio_track_opts_set(builder, "audio_track", user_data);
+ else
+ generic_opts_set(builder, name, find_combo_table(name));
+ }
if (handler_id > 0)
{
g_signal_handler_unblock ((gpointer)combo, handler_id);
static void
init_ui_combo_boxes(GtkBuilder *builder)
{
+ gint ii;
+
init_combo_box(builder, "audio_bitrate");
- init_combo_box(builder, "pref_audio_bitrate1");
- init_combo_box(builder, "pref_audio_bitrate2");
- init_combo_box(builder, "audio_sample_rate");
- init_combo_box(builder, "pref_audio_rate1");
- init_combo_box(builder, "pref_audio_rate2");
+ init_combo_box(builder, "audio_rate");
init_combo_box(builder, "framerate");
init_combo_box(builder, "audio_mix");
- init_combo_box(builder, "pref_audio_mix1");
- init_combo_box(builder, "pref_audio_mix2");
- init_combo_box(builder, "pref_source_audio_lang");
+ init_combo_box(builder, "source_audio_lang");
init_combo_box(builder, "subtitle_lang");
init_combo_box(builder, "title");
init_combo_box(builder, "audio_track");
- init_combo_box(builder, "container");
- init_combo_box(builder, "deinterlace");
- init_combo_box(builder, "denoise");
- init_combo_box(builder, "video_codec");
- init_combo_box(builder, "audio_codec");
- init_combo_box(builder, "pref_audio_codec1");
- init_combo_box(builder, "pref_audio_codec2");
- init_combo_box(builder, "pref_source_audio_codec");
- init_combo_box(builder, "x264_direct");
- init_combo_box(builder, "x264_me");
- init_combo_box(builder, "x264_subme");
- init_combo_box(builder, "x264_analyse");
- init_combo_box(builder, "x264_trellis");
+ for (ii = 0; combo_name_map[ii].name != NULL; ii++)
+ {
+ init_combo_box(builder, combo_name_map[ii].name);
+ }
}
static const char * turbo_opts =
// Construct the x264 options string
// The result is allocated, so someone must free it at some point.
gchar*
-ghb_build_x264opts_string(GHashTable *settings)
+ghb_build_x264opts_string(GValue *settings)
{
- GString *x264opts = g_string_new("");
- gint refs = ghb_settings_get_int(settings, "x264_refs");
- if (refs != 1)
- {
- g_string_append_printf(x264opts, "ref=%d:", refs);
- }
- if (refs > 1)
- {
- if (ghb_settings_get_bool(settings, "x264_mixed_refs"))
- {
- g_string_append(x264opts, "mixed-refs=1:");
- }
- }
- gint subme = ghb_settings_get_int(settings, "x264_subme");
- if (subme != 5) // 5 is default
+ gchar *result;
+ gchar *opts = ghb_settings_get_string(settings, "x264_options");
+ if (opts != NULL)
{
- g_string_append_printf(x264opts, "subme=%d:", subme);
+ result = opts;
}
- gint bframes = ghb_settings_get_int(settings, "x264_bframes");
- if (bframes > 0)
+ else
{
- g_string_append_printf(x264opts, "bframes=%d:", bframes);
- if (ghb_settings_get_bool(settings, "x264_weighted_bframes"))
- {
- g_string_append(x264opts, "weightb=1:");
- }
- if (subme >= 6)
- {
- if (ghb_settings_get_bool(settings, "x264_brdo"))
- {
- g_string_append(x264opts, "brdo=1:");
- }
- }
- if (ghb_settings_get_bool(settings, "x264_bime"))
- {
- g_string_append(x264opts, "bime=1:");
- }
+ result = g_strdup("");
}
- if (bframes > 1)
+ return result;
+}
+
+GValue*
+ghb_get_chapters(gint titleindex)
+{
+ hb_list_t * list;
+ hb_title_t * title;
+ hb_chapter_t * chapter;
+ gint count, ii;
+ GValue *chapters = NULL;
+
+ g_debug("ghb_get_chapters (title = %d)\n", titleindex);
+ if (h_scan == NULL) return NULL;
+ list = hb_get_titles( h_scan );
+ title = (hb_title_t*)hb_list_item( list, titleindex );
+ if (title == NULL) return NULL;
+ count = hb_list_count( title->list_chapter );
+ chapters = ghb_array_value_new(count);
+ for (ii = 0; ii < count; ii++)
{
- if (ghb_settings_get_bool(settings, "x264_bpyramid"))
+ chapter = hb_list_item(title->list_chapter, ii);
+ if (chapter == NULL) break;
+ if (chapter->title == NULL || chapter->title[0] == 0)
{
- g_string_append(x264opts, "b-pyramid=1:");
+ gchar *str;
+ str = g_strdup_printf ("Chapter %2d", ii+1);
+ ghb_array_append(chapters, ghb_string_value_new(str));
+ g_free(str);
}
- }
- if (ghb_settings_get_bool(settings, "x264_no_fast_pskip"))
- {
- g_string_append(x264opts, "no-fast-pskip=1:");
- }
- if (ghb_settings_get_bool(settings, "x264_no_dct_decimate"))
- {
- g_string_append(x264opts, "no-dct-decimate=1:");
- }
- if (!ghb_settings_get_bool(settings, "x264_cabac"))
- {
- g_string_append(x264opts, "cabac=0:");
- }
- else
- {
- gint trellis = ghb_settings_get_int(settings, "x264_trellis");
- if (trellis != 0); // != None
+ else
{
- g_string_append_printf(x264opts, "trellis=%d:", trellis);
+ ghb_array_append(chapters, ghb_string_value_new(chapter->title));
}
}
- gint dba, dbb;
- dba = ghb_settings_get_int(settings, "x264_deblock_alpha");
- dbb = ghb_settings_get_int(settings, "x264_deblock_beta");
- if (dba != 0 || dbb != 0)
- {
- g_string_append_printf(x264opts, "deblock=%d,%d:", dba, dbb);
- }
- const gchar *me = ghb_settings_get_string(settings, "x264_me");
- g_string_append_printf(x264opts, "me=%s:", me);
- gint analyse = ghb_settings_get_int(settings, "x264_analyse");
- if (analyse != 0) // != Some
+ return chapters;
+}
+
+gboolean
+ghb_ac3_in_audio_list(const GValue *audio_list)
+{
+ gint count, ii;
+
+ count = ghb_array_len(audio_list);
+ for (ii = 0; ii < count; ii++)
{
- g_string_append_printf(x264opts, "analyse=%s:",
- ghb_settings_get_string(settings, "x264_analyse"));
+ GValue *asettings;
+ gint acodec;
+
+ asettings = ghb_array_get_nth(audio_list, ii);
+ acodec = ghb_settings_combo_int(asettings, "audio_codec");
+ if (acodec == HB_ACODEC_AC3)
+ return TRUE;
}
- if (analyse != 1) // != none
+ return FALSE;
+}
+
+static void
+audio_bitrate_opts_add(GtkBuilder *builder, const gchar *name, gint rate)
+{
+ GtkTreeIter iter;
+ GtkListStore *store;
+ gchar *str;
+
+ g_debug("audio_rate_opts_add ()\n");
+ store = get_combo_box_store(builder, name);
+ if (!find_combo_item_by_int(GTK_TREE_MODEL(store), rate, &iter))
{
- gint direct = ghb_settings_get_int(settings, "x264_direct");
- if (direct != 1) // !spatial
- {
- g_string_append_printf(x264opts, "direct=%s:",
- ghb_settings_get_string(settings, "x264_direct"));
- }
+ str = g_strdup_printf ("%d", rate);
+ gtk_list_store_append(store, &iter);
+ gtk_list_store_set(store, &iter,
+ 0, str,
+ 1, TRUE,
+ 2, str,
+ 3, rate,
+ 4, str,
+ -1);
+ g_free(str);
}
- g_string_append_printf(x264opts, "merange=%d:",
- ghb_settings_get_int(settings, "x264_merange"));
+}
- const gchar *opts = ghb_settings_get_string(settings, "x264_options");
- if (opts != NULL && opts[0] != 0)
+static void
+audio_bitrate_opts_clean(GtkBuilder *builder, const gchar *name, gint last_rate)
+{
+ GtkTreeIter iter;
+ GtkListStore *store;
+ gint ivalue;
+ gboolean done = FALSE;
+ gint ii = 0;
+ guint last = (guint)last_rate;
+
+ g_debug("audio_bitrate_opts_clean ()\n");
+ store = get_combo_box_store(builder, name);
+ if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL(store), &iter))
{
- g_string_append_printf(x264opts, "%s:", opts);
+ do
+ {
+ gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, 3, &ivalue, -1);
+ if (search_rates(
+ hb_audio_bitrates, ivalue, hb_audio_bitrates_count) < 0)
+ {
+ done = !gtk_list_store_remove(store, &iter);
+ }
+ else if (ivalue > last)
+ {
+ ii++;
+ gtk_list_store_set(store, &iter, 1, FALSE, -1);
+ done = !gtk_tree_model_iter_next (GTK_TREE_MODEL(store), &iter);
+ }
+ else
+ {
+ ii++;
+ gtk_list_store_set(store, &iter, 1, TRUE, -1);
+ done = !gtk_tree_model_iter_next (GTK_TREE_MODEL(store), &iter);
+ }
+ } while (!done);
}
- // strip the trailing ":"
- gchar *result;
- gint len;
- result = g_string_free(x264opts, FALSE);
- len = strlen(result);
- if (len > 0) result[len - 1] = 0;
- return result;
}
-gchar **
-ghb_get_chapters(gint titleindex)
+static void
+audio_bitrate_opts_set(GtkBuilder *builder, const gchar *name)
{
- hb_list_t * list;
- hb_title_t * title;
- hb_chapter_t * chapter;
- gint count, ii;
- gchar **result = NULL;
+ GtkTreeIter iter;
+ GtkListStore *store;
+ gint ii;
- g_debug("ghb_get_chapters (title = %d)\n", titleindex);
- if (h == NULL) return NULL;
- list = hb_get_titles( h );
- title = (hb_title_t*)hb_list_item( list, titleindex );
- if (title == NULL) return NULL;
- count = hb_list_count( title->list_chapter );
- result = g_malloc((count+1) * sizeof(gchar*));
- for (ii = 0; ii < count; ii++)
+ g_debug("audio_bitrate_opts_set ()\n");
+ store = get_combo_box_store(builder, name);
+ gtk_list_store_clear(store);
+ for (ii = 0; ii < hb_audio_bitrates_count; ii++)
{
- chapter = hb_list_item(title->list_chapter, ii);
- if (chapter == NULL) break;
- if (chapter->title == NULL || chapter->title[0] == 0)
- result[ii] = g_strdup_printf ("Chapter %2d", ii);
- else
- result[ii] = g_strdup(chapter->title);
+ gtk_list_store_append(store, &iter);
+ gtk_list_store_set(store, &iter,
+ 0, hb_audio_bitrates[ii].string,
+ 1, TRUE,
+ 2, hb_audio_bitrates[ii].string,
+ 3, hb_audio_bitrates[ii].rate,
+ 4, hb_audio_bitrates[ii].string,
+ -1);
}
- result[ii] = NULL;
- return result;
}
-gboolean
-ghb_set_passthru_rate_opts(GtkBuilder *builder, gint bitrate)
+void
+ghb_set_passthru_bitrate_opts(GtkBuilder *builder, gint bitrate)
{
- gboolean changed = FALSE;
- changed = audio_rate_opts_add(builder, "audio_bitrate", bitrate);
- return changed;
+ audio_bitrate_opts_add(builder, "audio_bitrate", bitrate);
}
-gboolean
-ghb_set_default_rate_opts(GtkBuilder *builder)
+void
+ghb_set_default_bitrate_opts(GtkBuilder *builder, gint last_rate)
{
- gboolean changed = FALSE;
- changed = audio_bitrate_opts_clean(builder, "audio_bitrate", hb_audio_bitrates, hb_audio_bitrates_count);
- return changed;
+ audio_bitrate_opts_clean(builder, "audio_bitrate", last_rate);
}
+static ghb_status_t hb_status;
+
void
ghb_backend_init(GtkBuilder *builder, gint debug, gint update)
{
/* Init libhb */
- h = hb_init( debug, update );
+ h_scan = hb_init( debug, update );
+ h_queue = hb_init( debug, 0 );
// Set up the list model for the combos
init_ui_combo_boxes(builder);
// Populate all the combos
}
void
+ghb_backend_close()
+{
+ hb_close(&h_queue);
+ hb_close(&h_scan);
+}
+
+void
ghb_backend_scan(const gchar *path, gint titleindex)
{
- hb_scan( h, path, titleindex );
+ hb_scan( h_scan, path, titleindex );
+ hb_status.state |= GHB_STATE_SCANNING;
+ // initialize count and cur to something that won't cause FPE
+ // when computing progress
+ hb_status.title_count = 1;
+ hb_status.title_cur = 0;
+}
+
+void
+ghb_backend_queue_scan(const gchar *path, gint titlenum)
+{
+ g_debug("ghb_backend_queue_scan()");
+ hb_scan( h_queue, path, titlenum );
+ hb_status.queue_state |= GHB_STATE_SCANNING;
+}
+
+gint
+ghb_get_state()
+{
+ return hb_status.state;
+}
+
+gint
+ghb_get_queue_state()
+{
+ return hb_status.queue_state;
+}
+
+void
+ghb_clear_state(gint state)
+{
+ hb_status.state &= ~state;
}
-gint
-ghb_backend_events(signal_user_data_t *ud, gint *unique_id)
+void
+ghb_clear_queue_state(gint state)
+{
+ hb_status.queue_state &= ~state;
+}
+
+void
+ghb_set_state(gint state)
+{
+ hb_status.state |= state;
+}
+
+void
+ghb_set_queue_state(gint state)
+{
+ hb_status.queue_state |= state;
+}
+
+void
+ghb_get_status(ghb_status_t *status)
+{
+ memcpy(status, &hb_status, sizeof(ghb_status_t));
+}
+
+void
+ghb_track_status()
{
hb_state_t s;
- gchar * status;
- GtkProgressBar *progress;
-
- if (h == NULL) return GHB_EVENT_NONE;
- hb_get_state( h, &s );
- *unique_id = s.param.working.sequence_id & 0xFFFFFF;
- progress = GTK_PROGRESS_BAR(GHB_WIDGET (ud->builder, "progressbar"));
+ hb_state_t s_queue;
+
+ if (h_scan == NULL) return;
+ hb_get_state( h_scan, &s );
switch( s.state )
{
- case HB_STATE_IDLE:
- /* Nothing to do */
- //fprintf( stderr, "HB Idle\n");
- break;
-
#define p s.param.scanning
case HB_STATE_SCANNING:
{
- status = g_strdup_printf ("Scanning title %d of %d...",
- p.title_cur, p.title_count );
- gtk_progress_bar_set_text (progress, status);
- g_free(status);
- gtk_progress_bar_set_fraction (progress, (gdouble)p.title_cur / p.title_count);
- /* Show what title is currently being scanned */
+ hb_status.state |= GHB_STATE_SCANNING;
+ hb_status.title_count = p.title_count;
+ hb_status.title_cur = p.title_cur;
} break;
#undef p
case HB_STATE_SCANDONE:
{
- status = g_strdup_printf ("Scan done");
- gtk_progress_bar_set_text (progress, status);
- g_free(status);
- gtk_progress_bar_set_fraction (progress, 1.0);
- return GHB_EVENT_SCAN_DONE;
- break;
- }
+ hb_status.state &= ~GHB_STATE_SCANNING;
+ hb_status.state |= GHB_STATE_SCANDONE;
+ } break;
+
+ }
+ hb_get_state( h_queue, &s_queue );
+ switch( s_queue.state )
+ {
+ case HB_STATE_SCANNING:
+ {
+ hb_status.queue_state |= GHB_STATE_SCANNING;
+ } break;
+
+ case HB_STATE_SCANDONE:
+ {
+ hb_status.queue_state &= ~GHB_STATE_SCANNING;
+ hb_status.queue_state |= GHB_STATE_SCANDONE;
+ } break;
-#define p s.param.working
+#define p s_queue.param.working
case HB_STATE_WORKING:
- if( p.seconds > -1 )
- {
- status= g_strdup_printf(
- "Encoding: task %d of %d, %.2f %%"
- " (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)",
- p.job_cur, p.job_count, 100.0 * p.progress,
- p.rate_cur, p.rate_avg, p.hours, p.minutes, p.seconds );
- }
- else
- {
- status= g_strdup_printf("Encoding: task %d of %d, %.2f %%",
- p.job_cur, p.job_count, 100.0 * p.progress );
- }
- gtk_progress_bar_set_text (progress, status);
- gtk_progress_bar_set_fraction (progress, p.progress);
- g_free(status);
- return GHB_EVENT_WORKING;
+ hb_status.queue_state |= GHB_STATE_WORKING;
+ hb_status.queue_state &= ~GHB_STATE_PAUSED;
+ hb_status.job_cur = p.job_cur;
+ hb_status.job_count = p.job_count;
+ hb_status.progress = p.progress;
+ hb_status.rate_cur = p.rate_cur;
+ hb_status.rate_avg = p.rate_avg;
+ hb_status.hours = p.hours;
+ hb_status.minutes = p.minutes;
+ hb_status.seconds = p.seconds;
+ hb_status.unique_id = p.sequence_id & 0xFFFFFF;
break;
#undef p
case HB_STATE_PAUSED:
- status = g_strdup_printf ("Paused");
- gtk_progress_bar_set_text (progress, status);
- g_free(status);
- return GHB_EVENT_PAUSED;
+ hb_status.queue_state |= GHB_STATE_PAUSED;
break;
-#define p s.param.muxing
case HB_STATE_MUXING:
{
- gtk_progress_bar_set_text( progress, "Muxing: this may take awhile...");
- break;
- }
-#undef p
+ hb_status.queue_state |= GHB_STATE_MUXING;
+ } break;
-#define p s.param.workdone
+#define p s_queue.param.workdone
case HB_STATE_WORKDONE:
{
hb_job_t *job;
+ hb_status.queue_state |= GHB_STATE_WORKDONE;
+ hb_status.queue_state &= ~GHB_STATE_MUXING;
+ hb_status.queue_state &= ~GHB_STATE_PAUSED;
+ hb_status.queue_state &= ~GHB_STATE_WORKING;
+ switch (p.error)
+ {
+ case HB_ERROR_NONE:
+ hb_status.error = GHB_ERROR_NONE;
+ case HB_ERROR_CANCELED:
+ hb_status.error = GHB_ERROR_CANCELED;
+ default:
+ hb_status.error = GHB_ERROR_FAIL;
+ }
+ hb_status.error = p.error;
// Delete all remaining jobs of this encode.
// An encode can be composed of multiple associated jobs.
// When a job is stopped, libhb removes it from the job list,
// but does not remove other jobs that may be associated with it.
// Associated jobs are taged in the sequence id.
- while (((job = hb_job(h, 0)) != NULL) && ((job->sequence_id >> 24) != 0) )
- hb_rem( h, job );
-
- switch( p.error )
- {
- case HB_ERROR_NONE:
- gtk_progress_bar_set_text( progress, "Rip done!" );
- break;
- case HB_ERROR_CANCELED:
- gtk_progress_bar_set_text( progress, "Rip canceled." );
- return GHB_EVENT_WORK_CANCELED;
- break;
- default:
- gtk_progress_bar_set_text( progress, "Rip failed.");
- }
- gtk_progress_bar_set_fraction (progress, 1.0);
- return GHB_EVENT_WORK_DONE;
- break;
- }
+ while ((job = hb_job(h_queue, 0)) != NULL)
+ hb_rem( h_queue, job );
+ } break;
#undef p
}
- return GHB_EVENT_NONE;
}
gboolean
hb_list_t * list;
hb_title_t * title;
- if (h == NULL) return FALSE;
- list = hb_get_titles( h );
+ if (h_scan == NULL) return FALSE;
+ list = hb_get_titles( h_scan );
if( !hb_list_count( list ) )
{
/* No valid title, stop right there */
tinfo->hours = title->hours;
tinfo->minutes = title->minutes;
tinfo->seconds = title->seconds;
+ tinfo->duration = title->duration;
return TRUE;
}
hb_list_t * list;
hb_title_t * title;
hb_job_t * job;
- GHashTable *settings = ud->settings;
gboolean keep_aspect, round_dims, anamorphic;
gboolean autocrop, autoscale, noscale;
gint crop[4], width, height, par_width, par_height;
g_debug("ghb_set_scale ()\n");
- if (h == NULL) return;
- list = hb_get_titles( h );
+ if (h_scan == NULL) return;
+ list = hb_get_titles( h_scan );
if( !hb_list_count( list ) )
{
/* No valid title, stop right there */
return;
}
- gint titleindex = ghb_settings_get_index(settings, "title");
+ gint titleindex;
+
+ titleindex = ghb_settings_combo_int(ud->settings, "title");
title = hb_list_item( list, titleindex );
if (title == NULL) return;
job = title->job;
if (job == NULL) return;
// First configure widgets
- round_dims = ghb_settings_get_bool(ud->settings, "round_dimensions");
- anamorphic = ghb_settings_get_bool(ud->settings, "anamorphic");
- keep_aspect = ghb_settings_get_bool(ud->settings, "keep_aspect");
- autocrop = ghb_settings_get_bool(ud->settings, "autocrop");
- autoscale = ghb_settings_get_bool(ud->settings, "autoscale");
+ round_dims = ghb_settings_get_boolean(ud->settings, "round_dimensions");
+ anamorphic = ghb_settings_get_boolean(ud->settings, "anamorphic");
+ keep_aspect = ghb_settings_get_boolean(ud->settings, "keep_aspect");
+ autocrop = ghb_settings_get_boolean(ud->settings, "autocrop");
+ autoscale = ghb_settings_get_boolean(ud->settings, "autoscale");
// "Noscale" is a flag that says we prefer to crop extra to satisfy
// alignment constraints rather than scaling to satisfy them.
- noscale = ghb_settings_get_bool(ud->settings, "noscale");
+ noscale = ghb_settings_get_boolean(ud->settings, "noscale");
// Align dimensions to either 16 or 2 pixels
// The scaler crashes if the dimensions are not divisible by 2
// x264 also will not accept dims that are not multiple of 2
crop[2] += need1;
crop[3] += need2;
}
- ghb_ui_update_int (ud, "crop_top", crop[0]);
- ghb_ui_update_int (ud, "crop_bottom", crop[1]);
- ghb_ui_update_int (ud, "crop_left", crop[2]);
- ghb_ui_update_int (ud, "crop_right", crop[3]);
+ ghb_ui_update(ud, "crop_top", ghb_int64_value(crop[0]));
+ ghb_ui_update(ud, "crop_bottom", ghb_int64_value(crop[1]));
+ ghb_ui_update(ud, "crop_left", ghb_int64_value(crop[2]));
+ ghb_ui_update(ud, "crop_right", ghb_int64_value(crop[3]));
}
}
crop[0] = ghb_settings_get_int(ud->settings, "crop_top");
job->maxHeight = max_height;
job->crop[0] = crop[0]; job->crop[1] = crop[1];
job->crop[2] = crop[2]; job->crop[3] = crop[3];
- hb_set_anamorphic_size( job, &width, &height, &par_width, &par_height );
+ hb_set_anamorphic_size( job, &width, &height,
+ &par_width, &par_height );
}
else
{
width = ((width + modround) >> modshift) << modshift;
height = ((height + modround) >> modshift) << modshift;
}
- ghb_ui_update_int (ud, "scale_width", width);
- ghb_ui_update_int (ud, "scale_height", height);
+ ghb_ui_update(ud, "scale_width", ghb_int64_value(width));
+ ghb_ui_update(ud, "scale_height", ghb_int64_value(height));
}
static void
-set_job_picture_settings(hb_job_t *job, GHashTable *settings)
+set_preview_job_settings(hb_job_t *job, GValue *settings)
{
job->crop[0] = ghb_settings_get_int(settings, "crop_top");
job->crop[1] = ghb_settings_get_int(settings, "crop_bottom");
job->crop[2] = ghb_settings_get_int(settings, "crop_left");
job->crop[3] = ghb_settings_get_int(settings, "crop_right");
- gboolean anamorphic = ghb_settings_get_bool(settings, "anamorphic");
- gboolean round_dimensions = ghb_settings_get_bool(settings, "round_dimensions");
+ gboolean anamorphic, round_dimensions;
+ anamorphic = ghb_settings_get_boolean(settings, "anamorphic");
+ round_dimensions = ghb_settings_get_boolean(settings, "round_dimensions");
if (round_dimensions && anamorphic)
{
job->modulus = 16;
}
job->width = ghb_settings_get_int(settings, "scale_width");
job->height = ghb_settings_get_int(settings, "scale_height");
- gint deint = ghb_settings_get_int(settings, "deinterlace");
- job->deinterlace = (deint == 0) ? 0 : 1;
+ gint deint = ghb_settings_combo_int(settings, "deinterlace");
+ gboolean decomb = ghb_settings_get_boolean(settings, "decomb");
+ job->deinterlace = (!decomb && deint == 0) ? 0 : 1;
}
gint
-ghb_calculate_target_bitrate(GHashTable *settings, gint titleindex)
+ghb_calculate_target_bitrate(GValue *settings, gint titleindex)
{
hb_list_t * list;
hb_title_t * title;
hb_job_t * job;
gint size;
- if (h == NULL) return 2000;
- list = hb_get_titles( h );
+ if (h_scan == NULL) return 2000;
+ list = hb_get_titles( h_scan );
title = hb_list_item( list, titleindex );
if (title == NULL) return 2000;
job = title->job;
}
gint
-ghb_guess_bitrate(GHashTable *settings)
+ghb_guess_bitrate(GValue *settings)
{
gint bitrate;
- if (ghb_settings_get_bool(settings, "vquality_type_constant"))
+ if (ghb_settings_get_boolean(settings, "vquality_type_constant"))
{
// This is really rough. I'm trying to err on the high
// side since this is used to estimate if there is
// sufficient disk space left
- gint vcodec = ghb_settings_get_int(settings, "video_codec");
- gdouble vquality = ghb_settings_get_dbl(settings, "video_quality")/100;
+ gint vcodec;
+ gdouble vquality;
+
+ vcodec = ghb_settings_combo_int(settings, "video_codec");
+ vquality = ghb_settings_get_double(settings, "video_quality")/100;
if (vcodec == HB_VCODEC_X264 &&
- !ghb_settings_get_bool(settings, "linear_vquality"))
+ !ghb_settings_get_boolean(settings, "linear_vquality"))
{
vquality = 51.0 - vquality * 51.0;
// Convert log curve to linear
}
gboolean
+ghb_validate_filter_string(const gchar *str, gint max_fields)
+{
+ gint fields = 0;
+ gchar *end;
+ gdouble val;
+
+ if (str == NULL || *str == 0) return TRUE;
+ while (*str)
+ {
+ val = g_strtod(str, &end);
+ if (str != end)
+ { // Found a numeric value
+ fields++;
+ // negative max_fields means infinate
+ if (max_fields >= 0 && fields > max_fields) return FALSE;
+ if (*end == 0)
+ return TRUE;
+ if (*end != ':')
+ return FALSE;
+ str = end + 1;
+ }
+ else
+ return FALSE;
+ }
+ return FALSE;
+}
+
+gboolean
+ghb_validate_filters(signal_user_data_t *ud)
+{
+ gboolean tweaks;
+ gchar *str;
+ gint index;
+ gchar *message;
+ gboolean enabled;
+
+ tweaks = ghb_settings_get_boolean(ud->settings, "allow_tweaks");
+ if (tweaks)
+ {
+ // detele 6
+ str = ghb_settings_get_string(ud->settings, "tweak_detelecine");
+ enabled = ghb_settings_get_boolean(ud->settings, "detelecine");
+ if (enabled && !ghb_validate_filter_string(str, 6))
+ {
+ message = g_strdup_printf(
+ "Invalid Detelecine Settings:\n\n%s\n",
+ str);
+ ghb_message_dialog(GTK_MESSAGE_ERROR, message, "Cancel", NULL);
+ g_free(str);
+ g_free(message);
+ return FALSE;
+ }
+ g_free(str);
+ // decomb 7
+ str = ghb_settings_get_string(ud->settings, "tweak_decomb");
+ enabled = ghb_settings_get_boolean(ud->settings, "decomb");
+ if (enabled && !ghb_validate_filter_string(str, 7))
+ {
+ message = g_strdup_printf(
+ "Invalid Decomb Settings:\n\n%s\n",
+ str);
+ ghb_message_dialog(GTK_MESSAGE_ERROR, message, "Cancel", NULL);
+ g_free(str);
+ g_free(message);
+ return FALSE;
+ }
+ g_free(str);
+ // deinte 4
+ index = ghb_lookup_combo_int("tweak_deinterlace",
+ ghb_settings_get_value(ud->settings, "tweak_deinterlace"));
+ if (index < 0)
+ {
+ str = ghb_settings_get_string(ud->settings, "tweak_deinterlace");
+ if (!ghb_validate_filter_string(str, 4))
+ {
+ message = g_strdup_printf(
+ "Invalid Deinterlace Settings:\n\n%s\n",
+ str);
+ ghb_message_dialog(GTK_MESSAGE_ERROR, message, "Cancel", NULL);
+ g_free(message);
+ g_free(str);
+ return FALSE;
+ }
+ g_free(str);
+ }
+#if 0
+ // Deblock is being reworked
+ // debloc 2
+ str = ghb_settings_get_string(ud->settings, "tweak_deblock");
+ enabled = ghb_settings_get_boolean(ud->settings, "deblock");
+ if (enabled && !ghb_validate_filter_string(str, 2))
+ {
+ message = g_strdup_printf(
+ "Invalid Deblock Settings:\n\n%s\n",
+ str);
+ ghb_message_dialog(GTK_MESSAGE_ERROR, message, "Cancel", NULL);
+ g_free(str);
+ g_free(message);
+ return FALSE;
+ }
+ g_free(str);
+#endif
+ // denois 4
+ index = ghb_lookup_combo_int("tweak_denoise",
+ ghb_settings_get_value(ud->settings, "tweak_denoise"));
+ if (index < 0)
+ {
+ str = ghb_settings_get_string(ud->settings, "tweak_denoise");
+ if (!ghb_validate_filter_string(str, 4))
+ {
+ message = g_strdup_printf(
+ "Invalid Denoise Settings:\n\n%s\n",
+ str);
+ ghb_message_dialog(GTK_MESSAGE_ERROR, message, "Cancel", NULL);
+ g_free(str);
+ g_free(message);
+ return FALSE;
+ }
+ g_free(str);
+ }
+ }
+ return TRUE;
+}
+
+gboolean
ghb_validate_video(signal_user_data_t *ud)
{
- GHashTable *settings = ud->settings;
gint vcodec, mux;
gchar *message;
- mux = ghb_settings_get_int(settings, "container");
- vcodec = ghb_settings_get_int(settings, "video_codec");
+ mux = ghb_settings_combo_int(ud->settings, "container");
+ vcodec = ghb_settings_combo_int(ud->settings, "video_codec");
if ((mux == HB_MUX_MP4 || mux == HB_MUX_AVI) &&
(vcodec == HB_VCODEC_THEORA))
{
}
g_free(message);
vcodec = HB_VCODEC_XVID;
- ghb_ui_update_int(ud, "video_codec", vcodec);
+ ghb_ui_update(ud, "video_codec", ghb_int64_value(vcodec));
+ }
+ return TRUE;
+}
+
+gboolean
+ghb_validate_container(signal_user_data_t *ud)
+{
+ gint container;
+ gchar *message;
+
+ container = ghb_settings_combo_int(ud->settings, "container");
+ if (container == HB_MUX_MP4)
+ {
+ const GValue *audio_list;
+ gboolean httpopt;
+
+ audio_list = ghb_settings_get_value(ud->settings, "audio_list");
+ httpopt = ghb_settings_get_boolean(ud->settings, "http_optimize_mp4");
+ if (httpopt && ghb_ac3_in_audio_list(audio_list))
+ {
+ message = g_strdup_printf(
+ "AC3 audio in HTTP optimized MP4 is not supported.\n\n"
+ "You should choose a different audio codec.\n"
+ "If you continue, FAAC will be chosen for you.");
+ if (!ghb_message_dialog(GTK_MESSAGE_WARNING, message, "Cancel", "Continue"))
+ {
+ g_free(message);
+ return FALSE;
+ }
+ g_free(message);
+
+ gint count, ii;
+
+ count = ghb_array_len(audio_list);
+ for (ii = 0; ii < count; ii++)
+ {
+ GValue *asettings;
+
+ asettings = ghb_array_get_nth(audio_list, ii);
+ gint acodec = ghb_settings_combo_int(asettings, "audio_codec");
+ if (acodec == HB_ACODEC_AC3)
+ {
+ GValue *value;
+ value = get_acodec_value(HB_ACODEC_FAAC);
+ ghb_settings_take_value(asettings, "audio_codec", value);
+ value = get_abitrate_value(160);
+ ghb_settings_take_value(asettings, "audio_bitrate", value);
+ }
+ }
+ }
}
return TRUE;
}
{
hb_list_t * list;
hb_title_t * title;
- GHashTable *settings = ud->settings;
gchar *message;
- setting_value_t *value;
+ GValue *value;
- if (h == NULL) return FALSE;
- list = hb_get_titles( h );
+ if (h_scan == NULL) return FALSE;
+ list = hb_get_titles( h_scan );
if( !hb_list_count( list ) )
{
/* No valid title, stop right there */
return FALSE;
}
- gint titleindex = ghb_settings_get_index(settings, "title");
+ gint titleindex;
+
+ titleindex = ghb_settings_combo_int(ud->settings, "title");
title = hb_list_item( list, titleindex );
if (title == NULL) return FALSE;
- GSList *link = ud->audio_settings;
- gint mux = ghb_settings_get_int(settings, "container");
- while (link != NULL)
+ gint mux = ghb_settings_combo_int(ud->settings, "container");
+
+ const GValue *audio_list;
+ gint count, ii;
+
+ audio_list = ghb_settings_get_value(ud->settings, "audio_list");
+ count = ghb_array_len(audio_list);
+ for (ii = 0; ii < count; ii++)
{
- GHashTable *asettings;
+ GValue *asettings;
hb_audio_config_t *taudio;
- asettings = (GHashTable*)link->data;
- gint track = ghb_settings_get_index(asettings, "audio_track");
- gint codec = ghb_settings_get_int(asettings, "audio_codec");
- taudio = (hb_audio_config_t *) hb_list_audio_config_item( title->list_audio, track );
+ asettings = ghb_array_get_nth(audio_list, ii);
+ gint track = ghb_settings_combo_int(asettings, "audio_track");
+ gint codec = ghb_settings_combo_int(asettings, "audio_codec");
+ taudio = (hb_audio_config_t *) hb_list_audio_config_item(
+ title->list_audio, track );
if ((taudio->in.codec != HB_ACODEC_AC3) && (codec == HB_ACODEC_AC3))
{
// Not supported. AC3 is passthrough only, so input must be AC3
codec = HB_ACODEC_FAAC;
}
value = get_acodec_value(codec);
- ghb_settings_set(asettings, "audio_codec", value);
+ ghb_settings_take_value(asettings, "audio_codec", value);
}
gchar *a_unsup = NULL;
gchar *mux_s = NULL;
}
g_free(message);
value = get_acodec_value(codec);
- ghb_settings_set(asettings, "audio_codec", value);
+ ghb_settings_take_value(asettings, "audio_codec", value);
}
- gint mix = ghb_settings_get_int (asettings, "audio_mix");
+ gint mix = ghb_settings_combo_int (asettings, "audio_mix");
gboolean allow_mono = TRUE;
gboolean allow_stereo = TRUE;
gboolean allow_dolby = TRUE;
g_free(message);
mix = ghb_get_best_mix(titleindex, track, codec, mix);
value = get_amix_value(mix);
- ghb_settings_set(asettings, "audio_mix", value);
+ ghb_settings_take_value(asettings, "audio_mix", value);
}
- link = link->next;
}
return TRUE;
}
gboolean
-ghb_validate_vquality(GHashTable *settings)
+ghb_validate_vquality(GValue *settings)
{
gint vcodec;
gchar *message;
gint min, max;
- if (ghb_settings_get_bool(settings, "nocheckvquality")) return TRUE;
- vcodec = ghb_settings_get_int(settings, "video_codec");
- if (ghb_settings_get_bool(settings, "vquality_type_constant"))
+ if (ghb_settings_get_boolean(settings, "nocheckvquality")) return TRUE;
+ vcodec = ghb_settings_combo_int(settings, "video_codec");
+ if (ghb_settings_get_boolean(settings, "vquality_type_constant"))
{
- if (!ghb_settings_get_bool(settings, "directqp"))
+ if (!ghb_settings_get_boolean(settings, "directqp"))
{
if (vcodec != HB_VCODEC_X264 ||
- ghb_settings_get_bool(settings, "linear_vquality"))
+ ghb_settings_get_boolean(settings, "linear_vquality"))
{
min = 68;
max = 97;
max = 97;
}
}
- gint vquality = ghb_settings_get_dbl(settings, "video_quality");
+ gint vquality = ghb_settings_get_double(settings, "video_quality");
if (vquality < min || vquality > max)
{
message = g_strdup_printf(
}
void
-ghb_add_job(job_settings_t *js, gint unique_id)
+ghb_add_job(GValue *js, gint unique_id)
{
hb_list_t * list;
hb_title_t * title;
hb_job_t * job;
- GHashTable *settings = js->settings;
static gchar *x264opts;
gint sub_id = 0;
+ gboolean tweaks = FALSE;
+ gchar *detel_str = NULL;
+ gchar *decomb_str = NULL;
+ gchar *deint_str = NULL;
+ gchar *deblock_str = NULL;
+ gchar *denoise_str = NULL;
+ gchar *dest_str = NULL;
g_debug("ghb_add_job()\n");
- if (h == NULL) return;
- list = hb_get_titles( h );
+ if (h_queue == NULL) return;
+ list = hb_get_titles( h_queue );
if( !hb_list_count( list ) )
{
/* No valid title, stop right there */
return;
}
- gint titleindex = ghb_settings_get_index(settings, "title");
+ // Since I'm doing a scan of the single title I want just prior
+ // to adding the job, there is only the one title to choose from.
+ //gint titleindex = ghb_settings_get_int(js, "title");
+ gint titleindex = 0;
title = hb_list_item( list, titleindex );
if (title == NULL) return;
job = title->job;
if (job == NULL) return;
- job->mux = ghb_settings_get_int(settings, "container");
+ tweaks = ghb_settings_get_boolean(js, "allow_tweaks");
+ job->mux = ghb_settings_combo_int(js, "container");
if (job->mux == HB_MUX_MP4)
{
- job->largeFileSize = ghb_settings_get_bool(settings, "large_mp4");
- job->mp4_optimize = ghb_settings_get_bool(settings, "http_optimize_mp4");
+ job->largeFileSize = ghb_settings_get_boolean(js, "large_mp4");
+ job->mp4_optimize = ghb_settings_get_boolean(js, "http_optimize_mp4");
}
else
{
job->mp4_optimize = FALSE;
}
gint chapter_start, chapter_end;
- chapter_start = ghb_settings_get_int(settings, "start_chapter");
- chapter_end = ghb_settings_get_int(settings, "end_chapter");
+ chapter_start = ghb_settings_get_int(js, "start_chapter");
+ chapter_end = ghb_settings_get_int(js, "end_chapter");
gint num_chapters = hb_list_count(title->list_chapter);
job->chapter_start = MIN( num_chapters, chapter_start );
job->chapter_end = MAX( job->chapter_start, chapter_end );
- job->chapter_markers = ghb_settings_get_bool(settings, "chapter_markers");
+ job->chapter_markers = ghb_settings_get_boolean(js, "chapter_markers");
if ( job->chapter_markers )
{
- gint chapter;
+ GValue *chapters;
+ GValue *chapter;
+ gint chap;
+ gint count;
- for(chapter = chapter_start; chapter <= chapter_end; chapter++)
+ chapters = ghb_settings_get_value(js, "chapter_list");
+ count = ghb_array_len(chapters);
+ for(chap = chapter_start; chap <= chapter_end; chap++)
{
hb_chapter_t * chapter_s;
gchar *name;
- if (js->chapter_list == NULL || js->chapter_list[chapter-1] == 0)
+ name = NULL;
+ if (chap-1 < count)
{
- name = g_strdup_printf ("Chapter %2d", chapter);
+ chapter = ghb_array_get_nth(chapters, chap-1);
+ name = ghb_value_string(chapter);
}
- else
+ if (name == NULL)
{
- name = g_strdup(js->chapter_list[chapter-1]);
+ name = g_strdup_printf ("Chapter %2d", chap);
}
- chapter_s = hb_list_item( job->title->list_chapter, chapter - 1);
+ chapter_s = hb_list_item( job->title->list_chapter, chap - 1);
strncpy(chapter_s->title, name, 1023);
chapter_s->title[1023] = '\0';
g_free(name);
}
}
- job->crop[0] = ghb_settings_get_int(settings, "crop_top");
- job->crop[1] = ghb_settings_get_int(settings, "crop_bottom");
- job->crop[2] = ghb_settings_get_int(settings, "crop_left");
- job->crop[3] = ghb_settings_get_int(settings, "crop_right");
+ job->crop[0] = ghb_settings_get_int(js, "crop_top");
+ job->crop[1] = ghb_settings_get_int(js, "crop_bottom");
+ job->crop[2] = ghb_settings_get_int(js, "crop_left");
+ job->crop[3] = ghb_settings_get_int(js, "crop_right");
- gboolean decomb = ghb_settings_get_bool(settings, "decomb");
- gint deint = ghb_settings_get_int(settings, "deinterlace");
+ gboolean decomb = ghb_settings_get_boolean(js, "decomb");
+ gint deint = ghb_settings_combo_int(js,
+ tweaks ? "tweak_deinterlace":"deinterlace");
if (!decomb)
- job->deinterlace = (deint == 0) ? 0 : 1;
+ job->deinterlace = (deint != 0) ? 1 : 0;
else
job->deinterlace = 0;
- job->grayscale = ghb_settings_get_bool(settings, "grayscale");
+ job->grayscale = ghb_settings_get_boolean(js, "grayscale");
- gboolean anamorphic = ghb_settings_get_bool(settings, "anamorphic");
- gboolean round_dimensions = ghb_settings_get_bool(settings, "round_dimensions");
+ gboolean anamorphic = ghb_settings_get_boolean(js, "anamorphic");
+ gboolean round_dimensions = ghb_settings_get_boolean(js, "round_dimensions");
if (round_dimensions && anamorphic)
{
job->pixel_ratio = 2;
job->pixel_ratio = 0;
job->modulus = 2;
}
- job->vfr = ghb_settings_get_bool(settings, "variable_frame_rate");
/* Add selected filters */
job->filters = hb_list_init();
- if( ghb_settings_get_bool(settings, "detelecine" ) || job->vfr )
+ gint vrate = ghb_settings_combo_int(js, "framerate");
+ if( vrate == 0 && ghb_settings_get_boolean(js, "detelecine" ) )
+ job->vfr = 1;
+ else
+ job->vfr = 0;
+
+ if( ghb_settings_get_boolean(js, "detelecine" ) )
{
hb_filter_detelecine.settings = NULL;
+ if (tweaks)
+ {
+ detel_str = ghb_settings_get_string(js, "tweak_detelecine");
+ if (detel_str && detel_str[0])
+ {
+ hb_filter_detelecine.settings = detel_str;
+ }
+ }
hb_list_add( job->filters, &hb_filter_detelecine );
}
if( decomb )
{
// Use default settings
hb_filter_decomb.settings = NULL;
- hb_filter_decomb.settings = "1:2:6:9:40:16:16";
+ if (tweaks)
+ {
+ decomb_str = ghb_settings_get_string(js, "tweak_decomb");
+ if (decomb_str && decomb_str[0])
+ {
+ hb_filter_decomb.settings = (gchar*)decomb_str;
+ }
+ }
hb_list_add( job->filters, &hb_filter_decomb );
}
if( job->deinterlace )
{
- hb_filter_deinterlace.settings = (gchar*)ghb_settings_get_string(settings, "deinterlace");
+ if (deint > 0)
+ deint_str = g_strdup(deint_opts.map[deint].svalue);
+ else
+ deint_str = ghb_settings_get_string(js,
+ tweaks ? "tweak_deinterlace" : "deinterlace");
+ hb_filter_deinterlace.settings = deint_str;
hb_list_add( job->filters, &hb_filter_deinterlace );
}
- if( ghb_settings_get_bool(settings, "deblock") )
+ gint deblock = ghb_settings_get_int(js, "deblock");
+ if( deblock >= 5 )
{
- hb_filter_deblock.settings = NULL;
+ deblock_str = g_strdup_printf("%d", deblock);
+ hb_filter_deblock.settings = deblock_str;
hb_list_add( job->filters, &hb_filter_deblock );
}
- gint denoise = ghb_settings_get_int(settings, "denoise");
+ gint denoise = ghb_settings_combo_int(js,
+ tweaks ? "tweak_denoise" : "denoise");
if( denoise != 0 )
{
- hb_filter_denoise.settings = (gchar*)ghb_settings_get_string(settings, "denoise");
+ if (denoise > 0)
+ denoise_str = g_strdup(denoise_opts.map[denoise].svalue);
+ else
+ denoise_str = (gchar*)ghb_settings_get_string(
+ js, tweaks ? "tweak_denoise" : "denoise");
+ hb_filter_denoise.settings = denoise_str;
hb_list_add( job->filters, &hb_filter_denoise );
}
- job->width = ghb_settings_get_int(settings, "scale_width");
- job->height = ghb_settings_get_int(settings, "scale_height");
+ job->width = ghb_settings_get_int(js, "scale_width");
+ job->height = ghb_settings_get_int(js, "scale_height");
- job->vcodec = ghb_settings_get_int(settings, "video_codec");
+ job->vcodec = ghb_settings_combo_int(js, "video_codec");
if ((job->mux == HB_MUX_MP4 || job->mux == HB_MUX_AVI) &&
(job->vcodec == HB_VCODEC_THEORA))
{
}
if ((job->vcodec == HB_VCODEC_X264) && (job->mux == HB_MUX_MP4))
{
- job->ipod_atom = ghb_settings_get_bool(settings, "ipod_file");
+ job->ipod_atom = ghb_settings_get_boolean(js, "ipod_file");
}
- if (ghb_settings_get_bool(settings, "vquality_type_constant"))
+ if (ghb_settings_get_boolean(js, "vquality_type_constant"))
{
- gdouble vquality = ghb_settings_get_dbl(settings, "video_quality");
- if (!ghb_settings_get_bool(settings, "directqp"))
+ gdouble vquality;
+ vquality = ghb_settings_get_double(js, "video_quality");
+ if (!ghb_settings_get_boolean(js, "directqp"))
{
vquality /= 100.0;
- if (ghb_settings_get_bool(settings, "linear_vquality"))
+ if (ghb_settings_get_boolean(js, "linear_vquality"))
{
if (job->vcodec == HB_VCODEC_X264)
{
job->vquality = vquality;
job->vbitrate = 0;
}
- else if (ghb_settings_get_bool(settings, "vquality_type_bitrate"))
+ else if (ghb_settings_get_boolean(js, "vquality_type_bitrate"))
{
job->vquality = -1.0;
- job->vbitrate = ghb_settings_get_int(settings, "video_bitrate");
+ job->vbitrate = ghb_settings_get_int(js, "video_bitrate");
}
// AVI container does not support variable frame rate.
if (job->mux == HB_MUX_AVI)
{
job->vfr = FALSE;
+ job->cfr = 1;
}
- gint vrate = ghb_settings_get_int(settings, "framerate");
- if( vrate == 0 || job->vfr )
+ if( vrate == 0 )
{
job->vrate = title->rate;
job->vrate_base = title->rate_base;
hb_audio_t *audio = (hb_audio_t*)hb_list_item(job->list_audio, 0);
hb_list_rem(job->list_audio, audio);
}
- GSList *link = js->audio_settings;
- gint count = 0;
- while (link != NULL)
+
+ const GValue *audio_list;
+ gint count;
+ gint tcount = 0;
+
+ audio_list = ghb_settings_get_value(js, "audio_list");
+ count = ghb_array_len(audio_list);
+ for (ii = 0; ii < count; ii++)
{
- GHashTable *asettings;
+ GValue *asettings;
hb_audio_config_t audio;
hb_audio_config_t *taudio;
hb_audio_config_init(&audio);
- asettings = (GHashTable*)link->data;
- audio.in.track = ghb_settings_get_index(asettings, "audio_track");
- audio.out.track = count;
- audio.out.codec = ghb_settings_get_int(asettings, "audio_codec");
- taudio = (hb_audio_config_t *) hb_list_audio_config_item( title->list_audio, audio.in.track );
+ asettings = ghb_array_get_nth(audio_list, ii);
+ audio.in.track = ghb_settings_get_int(asettings, "audio_track");
+ audio.out.track = tcount;
+ audio.out.codec = ghb_settings_combo_int(asettings, "audio_codec");
+ taudio = (hb_audio_config_t *) hb_list_audio_config_item(
+ title->list_audio, audio.in.track );
if ((taudio->in.codec != HB_ACODEC_AC3) && (audio.out.codec == HB_ACODEC_AC3))
{
// Not supported. AC3 is passthrough only, so input must be AC3
// ogm/faac|ac3 combination is not supported.
audio.out.codec = HB_ACODEC_VORBIS;
}
- audio.out.dynamic_range_compression = ghb_settings_get_dbl(asettings, "audio_drc");
+ audio.out.dynamic_range_compression =
+ ghb_settings_get_double(asettings, "audio_drc");
// It would be better if this were done in libhb for us, but its not yet.
if (audio.out.codec == HB_ACODEC_AC3 || audio.out.codec == HB_ACODEC_DCA)
{
}
else
{
- audio.out.mixdown = ghb_settings_get_int (asettings, "audio_mix");
+ audio.out.mixdown = ghb_settings_combo_int(asettings, "audio_mix");
// Make sure the mixdown is valid and pick a new one if not.
- audio.out.mixdown = ghb_get_best_mix(titleindex, audio.in.track, audio.out.codec,
- audio.out.mixdown);
- audio.out.bitrate = ghb_settings_get_int(asettings, "audio_bitrate") / 1000;
- gint srate = ghb_settings_get_int(asettings, "audio_sample_rate");
+ audio.out.mixdown = ghb_get_best_mix(titleindex,
+ audio.in.track, audio.out.codec, audio.out.mixdown);
+ audio.out.bitrate =
+ ghb_settings_combo_int(asettings, "audio_bitrate");
+ gint srate = ghb_settings_combo_int(asettings, "audio_rate");
if (srate == 0) // 0 is same as source
audio.out.samplerate = taudio->in.samplerate;
else
// Add it to the jobs audio list
hb_audio_add( job, &audio );
- count++;
- link = link->next;
+ tcount++;
}
// I was tempted to move this up with the reset of the video quality
// settings, but I suspect the settings above need to be made
// first in order for hb_calc_bitrate to be accurate.
- if (ghb_settings_get_bool(settings, "vquality_type_target"))
+ if (ghb_settings_get_boolean(js, "vquality_type_target"))
{
gint size;
- size = ghb_settings_get_int(settings, "video_target_size");
+ size = ghb_settings_get_int(js, "video_target_size");
job->vbitrate = hb_calc_bitrate( job, size );
job->vquality = -1.0;
}
- job->file = ghb_settings_get_string(settings, "destination");
- job->crf = ghb_settings_get_bool(settings, "constant_rate_factor");
+ dest_str = ghb_settings_get_string(js, "destination");
+ job->file = dest_str;
+ job->crf = ghb_settings_get_boolean(js, "constant_rate_factor");
// TODO: libhb holds onto a reference to the x264opts and is not
// finished with it until encoding the job is done. But I can't
// find a way to get at the job before it is removed in order to
// free up the memory I am allocating here.
// The short story is THIS LEAKS.
- x264opts = ghb_build_x264opts_string(settings);
+ x264opts = ghb_build_x264opts_string(js);
if( x264opts != NULL && *x264opts != '\0' )
{
{
job->x264opts = NULL;
}
- gint subtitle = ghb_settings_get_int(settings, "subtitle_lang");
- gboolean forced_subtitles = ghb_settings_get_bool (settings, "forced_subtitles");
+ gint subtitle;
+ gchar *slang = ghb_settings_get_string(js, "subtitle_lang");
+ subtitle = -2; // default to none
+ if (strcmp(slang, "auto") == 0)
+ {
+ subtitle = -1;
+ }
+ else
+ {
+ gint scount;
+ hb_subtitle_t * subt;
+
+ scount = hb_list_count(title->list_subtitle);
+ for (ii = 0; ii < scount; ii++)
+ {
+ subt = (hb_subtitle_t *)hb_list_item(title->list_subtitle, ii);
+ if (strcmp(slang, subt->iso639_2) == 0)
+ {
+ subtitle = ii;
+ break;
+ }
+ }
+ }
+ gboolean forced_subtitles = ghb_settings_get_boolean(js, "forced_subtitles");
job->subtitle_force = forced_subtitles;
if (subtitle >= 0)
job->subtitle = subtitle;
* Add the pre-scan job
*/
job->sequence_id = (unique_id & 0xFFFFFF) | (sub_id++ << 24);
- hb_add( h, job );
+ hb_add( h_queue, job );
//if (job->x264opts != NULL)
// g_free(job->x264opts);
{
job->select_subtitle = NULL;
}
- if( ghb_settings_get_bool(settings, "two_pass") &&
- !ghb_settings_get_bool(settings, "vquality_type_constant"))
+ if( ghb_settings_get_boolean(js, "two_pass") &&
+ !ghb_settings_get_boolean(js, "vquality_type_constant"))
{
/*
* If subtitle_scan is enabled then only turn it on
* If turbo options have been selected then append them
* to the x264opts now (size includes one ':' and the '\0')
*/
- if( ghb_settings_get_bool(settings, "turbo") )
+ if( ghb_settings_get_boolean(js, "turbo") )
{
char *tmp_x264opts;
job->x264opts = x264opts;
}
job->sequence_id = (unique_id & 0xFFFFFF) | (sub_id++ << 24);
- hb_add( h, job );
+ hb_add( h_queue, job );
//if (job->x264opts != NULL)
// g_free(job->x264opts);
job->indepth_scan = 0;
job->x264opts = x264opts2;
job->sequence_id = (unique_id & 0xFFFFFF) | (sub_id++ << 24);
- hb_add( h, job );
+ hb_add( h_queue, job );
//if (job->x264opts != NULL)
// g_free(job->x264opts);
}
job->indepth_scan = 0;
job->pass = 0;
job->sequence_id = (unique_id & 0xFFFFFF) | (sub_id++ << 24);
- hb_add( h, job );
+ hb_add( h_queue, job );
//if (job->x264opts != NULL)
// g_free(job->x264opts);
}
+ if (detel_str) g_free(detel_str);
+ if (decomb_str) g_free(decomb_str);
+ if (deint_str) g_free(deint_str);
+ if (deblock_str) g_free(deblock_str);
+ if (denoise_str) g_free(denoise_str);
+ if (dest_str) g_free(dest_str);
}
void
// Multiples passes all get the same id
// remove them all.
// Go backwards through list, so reordering doesn't screw me.
- ii = hb_count(h) - 1;
- while ((job = hb_job(h, ii--)) != NULL)
+ ii = hb_count(h_queue) - 1;
+ while ((job = hb_job(h_queue, ii--)) != NULL)
{
if ((job->sequence_id & 0xFFFFFF) == unique_id)
- hb_rem(h, job);
+ hb_rem(h_queue, job);
}
}
void
ghb_start_queue()
{
- hb_start( h );
+ hb_start( h_queue );
}
void
ghb_stop_queue()
{
- hb_stop( h );
+ hb_stop( h_queue );
}
void
ghb_pause_queue()
{
hb_state_t s;
- hb_get_state2( h, &s );
+ hb_get_state2( h_queue, &s );
if( s.state == HB_STATE_PAUSED )
{
- hb_resume( h );
+ hb_resume( h_queue );
}
else
{
- hb_pause( h );
+ hb_pause( h_queue );
}
}
GdkPixbuf*
-ghb_get_preview_image(gint titleindex, gint index, GHashTable *settings, gboolean borders)
+ghb_get_preview_image(
+ gint titleindex,
+ gint index,
+ GValue *settings,
+ gboolean borders)
{
hb_title_t *title;
hb_list_t *list;
- list = hb_get_titles( h );
+ list = hb_get_titles( h_scan );
if( !hb_list_count( list ) )
{
/* No valid title, stop right there */
title = hb_list_item( list, titleindex );
if (title == NULL) return NULL;
if (title->job == NULL) return NULL;
- set_job_picture_settings(title->job, settings);
+ set_preview_job_settings(title->job, settings);
// hb_get_preview can't handle sizes that are larger than the original title
// dimensions
bufferSize = newSize;
buffer = (guint8*) g_realloc( buffer, bufferSize );
}
- hb_get_preview( h, title, index, buffer );
+ hb_get_preview( h_scan, title, index, buffer );
// Create an GdkPixbuf and copy the libhb image into it, converting it from
// libhb's format something suitable. Along the way, we'll strip off the
// Got it, but hb_get_preview doesn't compensate for anamorphic, so lets
// scale
gint width, height, par_width, par_height;
- gboolean anamorphic = ghb_settings_get_bool (settings, "anamorphic");
+ gboolean anamorphic = ghb_settings_get_boolean(settings, "anamorphic");
if (anamorphic)
{
hb_set_anamorphic_size( title->job, &width, &height, &par_width, &par_height );