X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=gtk%2Fsrc%2Fhb-backend.c;h=53188820fc0756867c1d69584e51e896ed2b0ead;hb=2cea0d49ba2d6aa6ba96d575b47d2d313515be11;hp=fb8c271a4cc2243dce3dc6221ae789f0fc484f38;hpb=5bbee758f39cbec144fba3e9464315c9b9126420;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c index fb8c271a..53188820 100644 --- a/gtk/src/hb-backend.c +++ b/gtk/src/hb-backend.c @@ -31,14 +31,15 @@ #include "hb-backend.h" #include "settings.h" #include "callbacks.h" +#include "preview.h" #include "values.h" +#include "lang.h" typedef struct { const gchar *option; const gchar *shortOpt; gint ivalue; - gdouble dvalue; const gchar *svalue; } options_map_t; @@ -48,13 +49,40 @@ typedef struct options_map_t *map; } combo_opts_t; +static const gchar *index_str[] = +{ + "0", + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10", +}; + +static options_map_t d_logging_opts[] = +{ + {"0", "0", 0, "0"}, + {"1", "1", 1, "1"}, + {"2", "2", 2, "2"}, +}; +combo_opts_t logging_opts = +{ + sizeof(d_logging_opts)/sizeof(options_map_t), + d_logging_opts +}; + 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 = { @@ -64,10 +92,10 @@ 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 = { @@ -77,10 +105,10 @@ 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 = { @@ -90,10 +118,10 @@ 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 = { @@ -103,10 +131,10 @@ combo_opts_t vcodec_opts = static options_map_t d_acodec_opts[] = { - {"AAC (faac)", "faac", HB_ACODEC_FAAC, 0.0, "faac"}, - {"MP3 (lame)", "lame", HB_ACODEC_LAME, 0.0, "lame"}, - {"Vorbis", "vorbis", HB_ACODEC_VORBIS, 0.0, "vorbis"}, - {"AC3 (pass-thru)", "ac3", HB_ACODEC_AC3, 0.0, "ac3"}, + {"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 = { @@ -116,10 +144,10 @@ combo_opts_t 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 = { @@ -129,10 +157,11 @@ 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"}, + {"Hadamard Exhaustive", "tesa", 4, "tesa"}, }; combo_opts_t me_opts = { @@ -142,13 +171,15 @@ 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 = { @@ -158,10 +189,10 @@ 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"}, - {"Custom", "custom", 3, 0.0, "all"}, + {"Some", "some", 0, "some"}, + {"None", "none", 1, "none"}, + {"All", "all", 2, "all"}, + {"Custom", "custom", 3, "all"}, }; combo_opts_t analyse_opts = { @@ -171,9 +202,9 @@ combo_opts_t analyse_opts = static options_map_t d_trellis_opts[] = { - {"Disabled", "0", 0, 0.0, "0"}, - {"Final Macro Block", "1", 1, 0.0, "1"}, - {"Always", "2", 2, 0.0, "2"}, + {"Disabled", "0", 0, "0"}, + {"Final Macro Block", "1", 1, "1"}, + {"Always", "2", 2, "2"}, }; combo_opts_t trellis_opts = { @@ -181,6 +212,52 @@ 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[] = +{ + {"LoggingLevel", &logging_opts}, + {"FileFormat", &container_opts}, + {"PictureDeinterlace", &deint_opts}, + {"tweak_PictureDeinterlace", &deint_opts}, + {"PictureDenoise", &denoise_opts}, + {"tweak_PictureDenoise", &denoise_opts}, + {"VideoEncoder", &vcodec_opts}, + {"AudioEncoder", &acodec_opts}, + {"x264_direct", &direct_opts}, + {"x264_me", &me_opts}, + {"x264_subme", &subme_opts}, + {"x264_analyse", &analyse_opts}, + {"x264_trellis", &trellis_opts}, + {"Subtitles", &subtitle_opts}, + {"title", &title_opts}, + {"AudioTrack", &audio_track_opts}, + {NULL, NULL} +}; + +#if 0 typedef struct iso639_lang_t { char * eng_name; /* Description in English */ @@ -189,11 +266,12 @@ typedef struct iso639_lang_t char * iso639_2; /* ISO-639-2/t (3 character) code */ char * iso639_2b; /* ISO-639-2/b code (if different from above) */ } iso639_lang_t; +#endif -static const iso639_lang_t language_table[] = +const iso639_lang_t ghb_language_table[] = { { "Any", "", "zz", "und" }, - { "Afar", "", "aa", "aar" }, + { "Afar", "", "aa", "aar" }, { "Abkhazian", "", "ab", "abk" }, { "Afrikaans", "", "af", "afr" }, { "Akan", "", "ak", "aka" }, @@ -378,8 +456,11 @@ static const iso639_lang_t language_table[] = { "Yoruba", "", "yo", "yor" }, { "Zhuang", "", "za", "zha" }, { "Zulu", "", "zu", "zul" }, + {NULL, NULL, NULL, NULL} }; -#define LANG_TABLE_SIZE (sizeof(language_table)/ sizeof(iso639_lang_t)) +#define LANG_TABLE_SIZE (sizeof(ghb_language_table)/ sizeof(iso639_lang_t)-1) + +static void audio_bitrate_opts_set(GtkBuilder *builder, const gchar *name); static void del_tree(const gchar *name, gboolean del_top) @@ -415,12 +496,21 @@ ghb_version() } void -ghb_vquality_range(signal_user_data_t *ud, gint *min, gint *max) +ghb_vquality_range( + signal_user_data_t *ud, + gdouble *min, + gdouble *max, + gdouble *step, + gdouble *page, + gint *digits) { 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, "VideoEncoder"); // Only x264 and ffmpeg currently support direct qp/crf entry + *step = 1; + *page = 10; + *digits = 0; if (vcodec == HB_VCODEC_X264) { *min = 0; @@ -434,295 +524,313 @@ ghb_vquality_range(signal_user_data_t *ud, gint *min, gint *max) else { *min = 0; - *max = 100; + *max = 1.0; + *step = 0.001; + *page = 0.1; + *digits = 3; } } else { *min = 0; - *max = 100; + *max = 1.0; + *step = 0.001; + *page = 0.1; + *digits = 3; } } -gint -ghb_lookup_vrate(const GValue *vrate) +static gint +lookup_generic_int(combo_opts_t *opts, const GValue *gval) { gint ii; gchar *str; - gint result = 0; + gint result = -1; - str = ghb_value_string(vrate); - for (ii = 0; ii < hb_video_rates_count; ii++) + str = ghb_value_string(gval); + for (ii = 0; ii < opts->count; ii++) { - if (strcmp(hb_video_rates[ii].string, str) == 0) + if (strcmp(opts->map[ii].shortOpt, str) == 0) { - result = hb_video_rates[ii].rate; + result = opts->map[ii].ivalue; + break; } } g_free(str); - // Default to "same as source" return result; } -gint -ghb_lookup_vcodec(const GValue *vcodec) +static const gchar* +lookup_generic_option(combo_opts_t *opts, const GValue *gval) { gint ii; gchar *str; - gint result = HB_VCODEC_FFMPEG; + const gchar *result = ""; - str = ghb_value_string(vcodec); - for (ii = 0; ii < vcodec_opts.count; ii++) + str = ghb_value_string(gval); + for (ii = 0; ii < opts->count; ii++) { - if (strcmp(vcodec_opts.map[ii].shortOpt, str) == 0) + if (strcmp(opts->map[ii].shortOpt, str) == 0) { - result = vcodec_opts.map[ii].ivalue; + result = opts->map[ii].option; + break; } } g_free(str); return result; } -const gchar* -ghb_lookup_vcodec_option(const GValue *vcodec) +static gint +lookup_mix_int(const GValue *mix) { gint ii; gchar *str; - const gchar *result = ""; + gint result = 0; + - str = ghb_value_string(vcodec); - for (ii = 0; ii < vcodec_opts.count; ii++) + str = ghb_value_string(mix); + for (ii = 0; ii < hb_audio_mixdowns_count; ii++) { - if (strcmp(vcodec_opts.map[ii].shortOpt, str) == 0) + if (strcmp(hb_audio_mixdowns[ii].short_name, str) == 0) { - result = vcodec_opts.map[ii].option; + result = hb_audio_mixdowns[ii].amixdown; + break; } } g_free(str); return result; } -const gchar* -ghb_lookup_container_option(const GValue *container) +static const gchar* +lookup_mix_option(const GValue *mix) { gint ii; gchar *str; - const gchar *result = ""; + gchar *result = "None"; - str = ghb_value_string(container); - for (ii = 0; ii < container_opts.count; ii++) + + str = ghb_value_string(mix); + for (ii = 0; ii < hb_audio_mixdowns_count; ii++) { - if (strcmp(container_opts.map[ii].shortOpt, str) == 0) + if (strcmp(hb_audio_mixdowns[ii].short_name, str) == 0) { - result = container_opts.map[ii].option; + result = hb_audio_mixdowns[ii].human_readable_name; + break; } } g_free(str); return result; } -gint -ghb_lookup_denoise(const GValue *denoise) +static gint +lookup_video_rate_int(const GValue *vrate) { gint ii; gchar *str; - gint result = -1; + gint result = 0; - str = ghb_value_string(denoise); - for (ii = 0; ii < denoise_opts.count; ii++) + str = ghb_value_string(vrate); + for (ii = 0; ii < hb_video_rates_count; ii++) { - if (strcmp(denoise_opts.map[ii].shortOpt, str) == 0) + if (strcmp(hb_video_rates[ii].string, str) == 0) { - result = denoise_opts.map[ii].ivalue; + result = hb_video_rates[ii].rate; + break; } } g_free(str); - // Custom + // Default to "same as source" return result; } -gint -ghb_lookup_deint(const GValue *deint) +static const gchar* +lookup_video_rate_option(const GValue *vrate) { gint ii; gchar *str; - gint result = -1; + const gchar *result = "Same as source"; - str = ghb_value_string(deint); - for (ii = 0; ii < deint_opts.count; ii++) + str = ghb_value_string(vrate); + for (ii = 0; ii < hb_video_rates_count; ii++) { - if (strcmp(deint_opts.map[ii].shortOpt, str) == 0) + if (strcmp(hb_video_rates[ii].string, str) == 0) { - result = deint_opts.map[ii].ivalue; + result = hb_video_rates[ii].string; + break; } } g_free(str); - // Custom + // Default to "same as source" return result; } -gint -ghb_lookup_mux(const GValue *mux) +static gint +lookup_audio_rate_int(const GValue *rate) { gint ii; gchar *str; - gint result = HB_MUX_MKV; + gint result = 0; - str = ghb_value_string(mux); - for (ii = 0; ii < container_opts.count; ii++) + // 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(container_opts.map[ii].shortOpt, str) == 0) + if (strcmp(hb_audio_rates[ii].string, str) == 0) { - result = container_opts.map[ii].ivalue; + result = hb_audio_rates[ii].rate; + break; } } g_free(str); return result; } -gint -ghb_lookup_acodec(const GValue *acodec) +static const gchar* +lookup_audio_rate_option(const GValue *rate) { gint ii; gchar *str; - gint result = HB_ACODEC_FAAC; + const gchar *result = "Same as source"; - str = ghb_value_string(acodec); - for (ii = 0; ii < acodec_opts.count; ii++) + // 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(acodec_opts.map[ii].shortOpt, str) == 0) + if (strcmp(hb_audio_rates[ii].string, str) == 0) { - result = acodec_opts.map[ii].ivalue; + result = hb_audio_rates[ii].string; + break; } } g_free(str); return result; } -const gchar* -ghb_lookup_acodec_option(const GValue *acodec) +static gint +lookup_audio_bitrate_int(const GValue *rate) { gint ii; gchar *str; - const gchar *result = ""; + gint result = 0; - str = ghb_value_string(acodec); - for (ii = 0; ii < acodec_opts.count; ii++) + // 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(acodec_opts.map[ii].shortOpt, str) == 0) + if (strcmp(hb_audio_bitrates[ii].string, str) == 0) { - result = acodec_opts.map[ii].option; + result = hb_audio_bitrates[ii].rate; + break; } } g_free(str); return result; } -const gchar* -ghb_lookup_mix_option(const GValue *mix) +static const gchar* +lookup_audio_bitrate_option(const GValue *rate) { gint ii; gchar *str; - gchar *result = "None"; + const gchar *result = "Same as source"; - - str = ghb_value_string(mix); - for (ii = 0; ii < hb_audio_mixdowns_count; ii++) + // 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_mixdowns[ii].short_name, str) == 0) + if (strcmp(hb_audio_bitrates[ii].string, str) == 0) { - result = hb_audio_mixdowns[ii].human_readable_name; + result = hb_audio_bitrates[ii].string; + break; } } g_free(str); return result; } -gint -ghb_lookup_mix(const GValue *mix) +static gint +lookup_audio_lang_int(const GValue *rate) { gint ii; gchar *str; - gint result = HB_AMIXDOWN_DOLBYPLII; - + gint result = 0; - str = ghb_value_string(mix); - for (ii = 0; ii < hb_audio_mixdowns_count; ii++) + // 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(hb_audio_mixdowns[ii].short_name, str) == 0) + if (strcmp(ghb_language_table[ii].iso639_2, str) == 0) { - result = hb_audio_mixdowns[ii].amixdown; + result = ii; + break; } } g_free(str); return result; } -#if 0 -gint -ghb_lookup_bitrate(const gchar *bitrate) +static const gchar* +lookup_audio_lang_option(const GValue *rate) { gint ii; + gchar *str; + const gchar *result = "Same as source"; - for (ii = 0; ii < hb_audio_bitrates_count; ii++) + // 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(hb_audio_bitrates[ii].string, bitrate) == 0) + if (strcmp(ghb_language_table[ii].iso639_2, str) == 0) { - return hb_audio_bitrates[ii].rate * 1000; + result = ghb_language_table[ii].eng_name; + break; } } - return 160 * 1000; + g_free(str); + return result; } -gint -ghb_lookup_rate(const gchar *rate) +static GValue* +get_acodec_value(gint val) { + GValue *value = NULL; gint ii; - for (ii = 0; ii < hb_audio_rates_count; ii++) + for (ii = 0; ii < acodec_opts.count; ii++) { - if (strcmp(hb_audio_rates[ii].string, rate) == 0) + if (acodec_opts.map[ii].ivalue == val) { - return hb_audio_rates[ii].rate; + value = ghb_string_value_new(acodec_opts.map[ii].shortOpt); + break; } } - // Coincidentally, the string "source" will return 0 - // which is our flag to use "same as source" - return 0; -} - -gdouble -ghb_lookup_drc(const gchar *drc) -{ - gdouble dval; - dval = g_strtod(drc, NULL); - if (dval < 1.0) dval = 1.0; - if (dval > 4.0) dval = 4.0; - return dval; + return value; } -#endif +#if 0 static GValue* -get_acodec_value(gint val) +get_abitrate_value(gint val) { GValue *value = NULL; gint ii; - for (ii = 0; ii < acodec_opts.count; ii++) + for (ii = 0; ii < hb_audio_bitrates_count; ii++) { - if (acodec_opts.map[ii].ivalue == val) + if (hb_audio_bitrates[ii].rate == val) { - value = ghb_combo_value_new( - ii, - acodec_opts.map[ii].option, - acodec_opts.map[ii].shortOpt, - acodec_opts.map[ii].svalue, - acodec_opts.map[ii].ivalue); + value = ghb_string_value_new(hb_audio_bitrates[ii].string); break; } } return value; } +#endif static GValue* get_amix_value(gint val) @@ -734,12 +842,7 @@ get_amix_value(gint val) { if (hb_audio_mixdowns[ii].amixdown == val) { - value = ghb_combo_value_new( - ii, - hb_audio_mixdowns[ii].human_readable_name, - hb_audio_mixdowns[ii].short_name, - hb_audio_mixdowns[ii].internal_name, - hb_audio_mixdowns[ii].amixdown); + value = ghb_string_value_new(hb_audio_mixdowns[ii].short_name); break; } } @@ -752,6 +855,15 @@ static hb_handle_t * h_queue = NULL; extern void hb_get_tempory_directory(hb_handle_t *h, char path[512]); +gchar* +ghb_get_tmp_dir() +{ + char dir[512]; + + hb_get_tempory_directory(h_scan, dir); + return g_strdup(dir); +} + void ghb_hb_cleanup(gboolean partial) { @@ -850,63 +962,68 @@ ghb_grey_combo_options(GtkBuilder *builder) { GtkWidget *widget; gint container, track, titleindex, acodec; - gboolean httpopt; hb_audio_config_t *audio = NULL; + GValue *gval; widget = GHB_WIDGET (builder, "title"); - titleindex = ghb_widget_int(widget); - widget = GHB_WIDGET (builder, "audio_track"); - track = ghb_widget_int(widget); + gval = ghb_widget_value(widget); + titleindex = ghb_lookup_combo_int("title", gval); + ghb_value_free(gval); + widget = GHB_WIDGET (builder, "AudioTrack"); + gval = ghb_widget_value(widget); + track = ghb_lookup_combo_int("AudioTrack", gval); + ghb_value_free(gval); audio = get_hb_audio(titleindex, track); - widget = GHB_WIDGET (builder, "container"); - container = ghb_widget_int(widget); - widget = GHB_WIDGET (builder, "http_optimize_mp4"); - httpopt = ghb_widget_int(widget); + widget = GHB_WIDGET (builder, "FileFormat"); + gval = ghb_widget_value(widget); + container = ghb_lookup_combo_int("FileFormat", gval); + ghb_value_free(gval); - grey_combo_box_item(builder, "audio_codec", HB_ACODEC_FAAC, FALSE); - grey_combo_box_item(builder, "audio_codec", HB_ACODEC_LAME, FALSE); - grey_combo_box_item(builder, "audio_codec", HB_ACODEC_VORBIS, FALSE); + grey_combo_box_item(builder, "x264_analyse", 3, TRUE); + grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_FAAC, FALSE); + grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_LAME, FALSE); + grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_VORBIS, FALSE); gboolean allow_ac3 = TRUE; - allow_ac3 = - !(container == HB_MUX_MP4 && httpopt) && - (container != HB_MUX_OGM); + allow_ac3 = (container != HB_MUX_OGM); if (allow_ac3) { - grey_combo_box_item(builder, "audio_codec", HB_ACODEC_AC3, FALSE); + grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_AC3, FALSE); } else { - grey_combo_box_item(builder, "audio_codec", HB_ACODEC_AC3, TRUE); + grey_combo_box_item(builder, "AudioEncoder", 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, "AudioEncoder", HB_ACODEC_AC3, TRUE); } - grey_combo_box_item(builder, "video_codec", HB_VCODEC_THEORA, FALSE); + grey_combo_box_item(builder, "VideoEncoder", HB_VCODEC_THEORA, FALSE); - widget = GHB_WIDGET (builder, "audio_codec"); - acodec = ghb_widget_int(widget); + widget = GHB_WIDGET (builder, "AudioEncoder"); + gval = ghb_widget_value(widget); + acodec = ghb_lookup_combo_int("AudioEncoder", gval); + ghb_value_free(gval); if (acodec != HB_ACODEC_AC3) { - grey_combo_box_item(builder, "audio_mix", 0, TRUE); + grey_combo_box_item(builder, "AudioMixdown", 0, TRUE); } if (container == HB_MUX_MP4) { - grey_combo_box_item(builder, "audio_codec", HB_ACODEC_LAME, TRUE); - grey_combo_box_item(builder, "audio_codec", HB_ACODEC_VORBIS, TRUE); - grey_combo_box_item(builder, "video_codec", HB_VCODEC_THEORA, TRUE); + grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_LAME, TRUE); + grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_VORBIS, TRUE); + grey_combo_box_item(builder, "VideoEncoder", 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, "audio_codec", HB_ACODEC_VORBIS, TRUE); - grey_combo_box_item(builder, "video_codec", HB_VCODEC_THEORA, TRUE); + grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_FAAC, TRUE); + grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_VORBIS, TRUE); + grey_combo_box_item(builder, "VideoEncoder", 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, "AudioEncoder", HB_ACODEC_FAAC, TRUE); } gboolean allow_mono = TRUE; @@ -933,11 +1050,11 @@ ghb_grey_combo_options(GtkBuilder *builder) (layout == HB_INPUT_CH_LAYOUT_3F2R) && (audio->in.channel_layout & HB_INPUT_CH_LAYOUT_HAS_LFE); } - grey_combo_box_item(builder, "audio_mix", HB_AMIXDOWN_MONO, !allow_mono); - grey_combo_box_item(builder, "audio_mix", HB_AMIXDOWN_STEREO, !allow_stereo); - grey_combo_box_item(builder, "audio_mix", HB_AMIXDOWN_DOLBY, !allow_dolby); - grey_combo_box_item(builder, "audio_mix", HB_AMIXDOWN_DOLBYPLII, !allow_dpl2); - grey_combo_box_item(builder, "audio_mix", HB_AMIXDOWN_6CH, !allow_6ch); + grey_combo_box_item(builder, "AudioMixdown", HB_AMIXDOWN_MONO, !allow_mono); + grey_combo_box_item(builder, "AudioMixdown", HB_AMIXDOWN_STEREO, !allow_stereo); + grey_combo_box_item(builder, "AudioMixdown", HB_AMIXDOWN_DOLBY, !allow_dolby); + grey_combo_box_item(builder, "AudioMixdown", HB_AMIXDOWN_DOLBYPLII, !allow_dpl2); + grey_combo_box_item(builder, "AudioMixdown", HB_AMIXDOWN_6CH, !allow_6ch); } gint @@ -1034,87 +1151,19 @@ init_combo_box(GtkBuilder *builder, const gchar *name) 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); -} - -// Set up the model for the combo box -static void -init_combo_box_entry(GtkBuilder *builder, const gchar *name) -{ - GtkComboBox *combo; - GtkListStore *store; - - g_debug("init_combo_box_entry() %s\n", name); - // First modify the combobox model to allow greying out of options - combo = GTK_COMBO_BOX(GHB_WIDGET(builder, name)); - // Store contains: - // 1 - String to display - // 2 - bool indicating whether the entry is selectable (grey or not) - // 3 - String that is used for presets - // 4 - Int value determined by backend - // 5 - String value determined by backend - store = gtk_list_store_new(5, G_TYPE_STRING, G_TYPE_BOOLEAN, - G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING); - gtk_combo_box_set_model(combo, GTK_TREE_MODEL(store)); - gtk_combo_box_entry_set_text_column(GTK_COMBO_BOX_ENTRY(combo), 0); -} - -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) @@ -1241,22 +1290,24 @@ language_opts_set(GtkBuilder *builder, const gchar *name) { gtk_list_store_append(store, &iter); gtk_list_store_set(store, &iter, - 0, language_table[ii].eng_name, + 0, ghb_language_table[ii].eng_name, 1, TRUE, - 2, language_table[ii].iso639_2, + 2, ghb_language_table[ii].iso639_2, 3, ii, - 4, language_table[ii].iso639_1, + 4, ghb_language_table[ii].iso639_1, -1); } } +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; @@ -1269,6 +1320,20 @@ title_opts_set(GtkBuilder *builder, const gchar *name) 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. @@ -1280,32 +1345,38 @@ title_opts_set(GtkBuilder *builder, const gchar *name) 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); if (title->duration != 0) { - option = g_strdup_printf ("%d - %02dh%02dm%02ds", + titles[ii] = g_strdup_printf ("%d - %02dh%02dm%02ds", title->index, title->hours, title->minutes, title->seconds); } else { - option = g_strdup_printf ("%d - Unknown Length", title->index); + 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); - g_free(option); + 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 @@ -1329,39 +1400,13 @@ find_combo_item_by_int(GtkTreeModel *store, gint value, GtkTreeIter *iter) 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); - g_free(str); - return TRUE; - } - return FALSE; -} - 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; @@ -1379,6 +1424,17 @@ audio_track_opts_set(GtkBuilder *builder, const gchar *name, gint titleindex) } } 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 @@ -1390,6 +1446,10 @@ audio_track_opts_set(GtkBuilder *builder, const gchar *name, gint titleindex) 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++) @@ -1399,25 +1459,30 @@ audio_track_opts_set(GtkBuilder *builder, const gchar *name, gint titleindex) 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_scan != NULL) @@ -1430,6 +1495,17 @@ subtitle_opts_set(GtkBuilder *builder, const gchar *name, gint titleindex) } } 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, @@ -1439,38 +1515,57 @@ subtitle_opts_set(GtkBuilder *builder, const gchar *name, gint titleindex) 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, "Autoselect", 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++) { gtk_list_store_append(store, &iter); gtk_list_store_set(store, &iter, - 0, language_table[ii].eng_name, + 0, ghb_language_table[ii].eng_name, 1, TRUE, - 2, language_table[ii].iso639_2, + 2, ghb_language_table[ii].iso639_2, 3, ii, - 4, language_table[ii].iso639_2, + 4, ghb_language_table[ii].iso639_2, -1); + subtitle_opts.map[ii+2].option = ghb_language_table[ii].eng_name; + subtitle_opts.map[ii+2].shortOpt = ghb_language_table[ii].iso639_2; + subtitle_opts.map[ii+2].ivalue = ii; + subtitle_opts.map[ii+2].svalue = ghb_language_table[ii].iso639_2; } } } @@ -1538,6 +1633,9 @@ ghb_find_audio_track(gint titleindex, const gchar *lang, gint index) match++; } } + if (match) return track; + if (index < count) + track = index; return track; } @@ -1549,6 +1647,7 @@ generic_opts_set(GtkBuilder *builder, const gchar *name, combo_opts_t *opts) 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++) @@ -1564,6 +1663,63 @@ generic_opts_set(GtkBuilder *builder, const gchar *name, combo_opts_t *opts) } } +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, "AudioBitrate") == 0) + return lookup_audio_bitrate_int(gval); + else if (strcmp(name, "AudioSamplerate") == 0) + return lookup_audio_rate_int(gval); + else if (strcmp(name, "VideoFramerate") == 0) + return lookup_video_rate_int(gval); + else if (strcmp(name, "AudioMixdown") == 0) + return lookup_mix_int(gval); + else if (strcmp(name, "SourceAudioLang") == 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, "AudioBitrate") == 0) + return lookup_audio_bitrate_option(gval); + else if (strcmp(name, "AudioSamplerate") == 0) + return lookup_audio_rate_option(gval); + else if (strcmp(name, "VideoFramerate") == 0) + return lookup_video_rate_option(gval); + else if (strcmp(name, "AudioMixdown") == 0) + return lookup_mix_option(gval); + else if (strcmp(name, "SourceAudioLang") == 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) { @@ -1591,46 +1747,51 @@ ghb_update_ui_combo_box(GtkBuilder *builder, const gchar *name, gint user_data, } } } - 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, "audio_rate") == 0) - audio_samplerate_opts_set(builder, "audio_rate", hb_audio_rates, hb_audio_rates_count); - if (all || strcmp(name, "framerate") == 0) - 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, "source_audio_lang") == 0) - language_opts_set(builder, "source_audio_lang"); - if (all || strcmp(name, "subtitle_lang") == 0) - subtitle_opts_set(builder, "subtitle_lang", user_data); - if (all || strcmp(name, "title") == 0) + if (all) + { + audio_bitrate_opts_set(builder, "AudioBitrate"); + audio_samplerate_opts_set(builder, "AudioSamplerate", hb_audio_rates, hb_audio_rates_count); + video_rate_opts_set(builder, "VideoFramerate", hb_video_rates, hb_video_rates_count); + mix_opts_set(builder, "AudioMixdown"); + language_opts_set(builder, "SourceAudioLang"); + subtitle_opts_set(builder, "Subtitles", user_data); 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, "tweak_deinterlace") == 0) - generic_opts_set(builder, "tweak_deinterlace", &deint_opts); - if (all || strcmp(name, "denoise") == 0) - generic_opts_set(builder, "denoise", &denoise_opts); - if (all || strcmp(name, "tweak_denoise") == 0) - generic_opts_set(builder, "tweak_denoise", &denoise_opts); - if (all || strcmp(name, "video_codec") == 0) - 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, "x264_direct") == 0) + audio_track_opts_set(builder, "AudioTrack", user_data); + generic_opts_set(builder, "LoggingLevel", &logging_opts); + generic_opts_set(builder, "FileFormat", &container_opts); + generic_opts_set(builder, "PictureDeinterlace", &deint_opts); + generic_opts_set(builder, "tweak_PictureDeinterlace", &deint_opts); + generic_opts_set(builder, "PictureDenoise", &denoise_opts); + generic_opts_set(builder, "tweak_PictureDenoise", &denoise_opts); + generic_opts_set(builder, "VideoEncoder", &vcodec_opts); + generic_opts_set(builder, "AudioEncoder", &acodec_opts); 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, "AudioBitrate") == 0) + audio_bitrate_opts_set(builder, "AudioBitrate"); + else if (strcmp(name, "AudioSamplerate") == 0) + audio_samplerate_opts_set(builder, "AudioSamplerate", hb_audio_rates, hb_audio_rates_count); + else if (strcmp(name, "VideoFramerate") == 0) + video_rate_opts_set(builder, "VideoFramerate", hb_video_rates, hb_video_rates_count); + else if (strcmp(name, "AudioMixdown") == 0) + mix_opts_set(builder, "AudioMixdown"); + else if (strcmp(name, "SourceAudioLang") == 0) + language_opts_set(builder, "SourceAudioLang"); + else if (strcmp(name, "Subtitles") == 0) + subtitle_opts_set(builder, "Subtitles", user_data); + else if (strcmp(name, "title") == 0) + title_opts_set(builder, "title"); + else if (strcmp(name, "AudioTrack") == 0) + audio_track_opts_set(builder, "AudioTrack", user_data); + else + generic_opts_set(builder, name, find_combo_table(name)); + } if (handler_id > 0) { g_signal_handler_unblock ((gpointer)combo, handler_id); @@ -1640,26 +1801,20 @@ ghb_update_ui_combo_box(GtkBuilder *builder, const gchar *name, gint user_data, static void init_ui_combo_boxes(GtkBuilder *builder) { - init_combo_box(builder, "audio_bitrate"); - init_combo_box(builder, "audio_rate"); - init_combo_box(builder, "framerate"); - init_combo_box(builder, "audio_mix"); - init_combo_box(builder, "source_audio_lang"); - init_combo_box(builder, "subtitle_lang"); + gint ii; + + init_combo_box(builder, "AudioBitrate"); + init_combo_box(builder, "AudioSamplerate"); + init_combo_box(builder, "VideoFramerate"); + init_combo_box(builder, "AudioMixdown"); + init_combo_box(builder, "SourceAudioLang"); + init_combo_box(builder, "Subtitles"); init_combo_box(builder, "title"); - init_combo_box(builder, "audio_track"); - init_combo_box(builder, "container"); - init_combo_box(builder, "deinterlace"); - init_combo_box_entry(builder, "tweak_deinterlace"); - init_combo_box(builder, "denoise"); - init_combo_box_entry(builder, "tweak_denoise"); - init_combo_box(builder, "video_codec"); - init_combo_box(builder, "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"); + init_combo_box(builder, "AudioTrack"); + for (ii = 0; combo_name_map[ii].name != NULL; ii++) + { + init_combo_box(builder, combo_name_map[ii].name); + } } static const char * turbo_opts = @@ -1672,7 +1827,7 @@ gchar* ghb_build_x264opts_string(GValue *settings) { gchar *result; - gchar *opts = ghb_settings_get_string(settings, "x264_options"); + gchar *opts = ghb_settings_get_string(settings, "x264Option"); if (opts != NULL) { result = opts; @@ -1731,37 +1886,115 @@ ghb_ac3_in_audio_list(const GValue *audio_list) gint acodec; asettings = ghb_array_get_nth(audio_list, ii); - acodec = ghb_settings_get_int(asettings, "audio_codec"); + acodec = ghb_settings_combo_int(asettings, "AudioEncoder"); if (acodec == HB_ACODEC_AC3) return TRUE; } return FALSE; } -gboolean -ghb_set_passthru_rate_opts(GtkBuilder *builder, gint bitrate) +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)) + { + 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); + } +} + +static void +audio_bitrate_opts_clean(GtkBuilder *builder, const gchar *name, gint last_rate) { - gboolean changed = FALSE; - changed = audio_rate_opts_add(builder, "audio_bitrate", bitrate); - return changed; + 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)) + { + 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); + } } -gboolean -ghb_set_default_rate_opts(GtkBuilder *builder) +static void +audio_bitrate_opts_set(GtkBuilder *builder, const gchar *name) +{ + 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 < hb_audio_bitrates_count; ii++) + { + 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); + } +} + +void +ghb_set_passthru_bitrate_opts(GtkBuilder *builder, gint bitrate) +{ + audio_bitrate_opts_add(builder, "AudioBitrate", bitrate); +} + +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, "AudioBitrate", last_rate); } static ghb_status_t hb_status; void -ghb_backend_init(GtkBuilder *builder, gint debug, gint update) +ghb_combo_init(GtkBuilder *builder) { - /* Init libhb */ - 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 @@ -1769,6 +2002,14 @@ ghb_backend_init(GtkBuilder *builder, gint debug, gint update) } void +ghb_backend_init(gint debug) +{ + /* Init libhb */ + h_scan = hb_init( debug, 0 ); + h_queue = hb_init( debug, 0 ); +} + +void ghb_backend_close() { hb_close(&h_queue); @@ -1776,58 +2017,58 @@ ghb_backend_close() } void -ghb_backend_scan(const gchar *path, gint titleindex) +ghb_backend_scan(const gchar *path, gint titleindex, gint preview_count) { - hb_scan( h_scan, path, titleindex ); - hb_status.state |= GHB_STATE_SCANNING; + hb_scan( h_scan, path, titleindex, preview_count, 1 ); + hb_status.scan.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; + hb_status.scan.title_count = 1; + hb_status.scan.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; + hb_scan( h_queue, path, titlenum, 10, 0 ); + hb_status.queue.state |= GHB_STATE_SCANNING; } gint -ghb_get_state() +ghb_get_scan_state() { - return hb_status.state; + return hb_status.scan.state; } gint ghb_get_queue_state() { - return hb_status.queue_state; + return hb_status.queue.state; } void -ghb_clear_state(gint state) +ghb_clear_scan_state(gint state) { - hb_status.state &= ~state; + hb_status.scan.state &= ~state; } void ghb_clear_queue_state(gint state) { - hb_status.queue_state &= ~state; + hb_status.queue.state &= ~state; } void -ghb_set_state(gint state) +ghb_set_scan_state(gint state) { - hb_status.state |= state; + hb_status.scan.state |= state; } void ghb_set_queue_state(gint state) { - hb_status.queue_state |= state; + hb_status.queue.state |= state; } void @@ -1839,66 +2080,125 @@ ghb_get_status(ghb_status_t *status) void ghb_track_status() { - hb_state_t s; + hb_state_t s_scan; hb_state_t s_queue; if (h_scan == NULL) return; - hb_get_state( h_scan, &s ); - switch( s.state ) + hb_get_state( h_scan, &s_scan ); + switch( s_scan.state ) { -#define p s.param.scanning +#define p s_scan.param.scanning case HB_STATE_SCANNING: { - hb_status.state |= GHB_STATE_SCANNING; - hb_status.title_count = p.title_count; - hb_status.title_cur = p.title_cur; + hb_status.scan.state |= GHB_STATE_SCANNING; + hb_status.scan.title_count = p.title_count; + hb_status.scan.title_cur = p.title_cur; } break; #undef p case HB_STATE_SCANDONE: { - hb_status.state &= ~GHB_STATE_SCANNING; - hb_status.state |= GHB_STATE_SCANDONE; + hb_status.scan.state &= ~GHB_STATE_SCANNING; + hb_status.scan.state |= GHB_STATE_SCANDONE; } break; +#define p s_scan.param.working + case HB_STATE_WORKING: + hb_status.scan.state |= GHB_STATE_WORKING; + hb_status.scan.state &= ~GHB_STATE_PAUSED; + hb_status.scan.job_cur = p.job_cur; + hb_status.scan.job_count = p.job_count; + hb_status.scan.progress = p.progress; + hb_status.scan.rate_cur = p.rate_cur; + hb_status.scan.rate_avg = p.rate_avg; + hb_status.scan.hours = p.hours; + hb_status.scan.minutes = p.minutes; + hb_status.scan.seconds = p.seconds; + hb_status.scan.unique_id = p.sequence_id & 0xFFFFFF; + break; +#undef p + + case HB_STATE_PAUSED: + hb_status.scan.state |= GHB_STATE_PAUSED; + break; + + case HB_STATE_MUXING: + { + hb_status.scan.state |= GHB_STATE_MUXING; + } break; + +#define p s_scan.param.workdone + case HB_STATE_WORKDONE: + { + hb_job_t *job; + + hb_status.scan.state |= GHB_STATE_WORKDONE; + hb_status.scan.state &= ~GHB_STATE_MUXING; + hb_status.scan.state &= ~GHB_STATE_PAUSED; + hb_status.scan.state &= ~GHB_STATE_WORKING; + switch (p.error) + { + case HB_ERROR_NONE: + hb_status.scan.error = GHB_ERROR_NONE; + break; + case HB_ERROR_CANCELED: + hb_status.scan.error = GHB_ERROR_CANCELED; + break; + default: + hb_status.scan.error = GHB_ERROR_FAIL; + break; + } + // 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_scan, 0)) != NULL) + hb_rem( h_scan, job ); + } break; +#undef p } hb_get_state( h_queue, &s_queue ); switch( s_queue.state ) { +#define p s_queue.param.scanning case HB_STATE_SCANNING: { - hb_status.queue_state |= GHB_STATE_SCANNING; + hb_status.queue.state |= GHB_STATE_SCANNING; + hb_status.queue.title_count = p.title_count; + hb_status.queue.title_cur = p.title_cur; } break; +#undef p case HB_STATE_SCANDONE: { - hb_status.queue_state &= ~GHB_STATE_SCANNING; - hb_status.queue_state |= GHB_STATE_SCANDONE; + hb_status.queue.state &= ~GHB_STATE_SCANNING; + hb_status.queue.state |= GHB_STATE_SCANDONE; } break; #define p s_queue.param.working case HB_STATE_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; + hb_status.queue.state |= GHB_STATE_WORKING; + hb_status.queue.state &= ~GHB_STATE_PAUSED; + hb_status.queue.job_cur = p.job_cur; + hb_status.queue.job_count = p.job_count; + hb_status.queue.progress = p.progress; + hb_status.queue.rate_cur = p.rate_cur; + hb_status.queue.rate_avg = p.rate_avg; + hb_status.queue.hours = p.hours; + hb_status.queue.minutes = p.minutes; + hb_status.queue.seconds = p.seconds; + hb_status.queue.unique_id = p.sequence_id & 0xFFFFFF; break; #undef p case HB_STATE_PAUSED: - hb_status.queue_state |= GHB_STATE_PAUSED; + hb_status.queue.state |= GHB_STATE_PAUSED; break; case HB_STATE_MUXING: { - hb_status.queue_state |= GHB_STATE_MUXING; + hb_status.queue.state |= GHB_STATE_MUXING; } break; #define p s_queue.param.workdone @@ -1906,20 +2206,22 @@ ghb_track_status() { 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; + 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; + hb_status.queue.error = GHB_ERROR_NONE; + break; case HB_ERROR_CANCELED: - hb_status.error = GHB_ERROR_CANCELED; + hb_status.queue.error = GHB_ERROR_CANCELED; + break; default: - hb_status.error = GHB_ERROR_FAIL; + hb_status.queue.error = GHB_ERROR_FAIL; + break; } - 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, @@ -2025,17 +2327,19 @@ ghb_set_scale(signal_user_data_t *ud, gint mode) /* No valid title, stop right there */ return; } - gint titleindex = ghb_settings_get_int(ud->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_boolean(ud->settings, "round_dimensions"); + round_dims = ghb_settings_get_boolean(ud->settings, "ModDimensions"); 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"); + keep_aspect = ghb_settings_get_boolean(ud->settings, "PictureKeepRatio"); + autocrop = ghb_settings_get_boolean(ud->settings, "PictureAutoCrop"); 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. @@ -2088,16 +2392,16 @@ ghb_set_scale(signal_user_data_t *ud, gint mode) crop[2] += need1; crop[3] += need2; } - 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])); + ghb_ui_update(ud, "PictureTopCrop", ghb_int64_value(crop[0])); + ghb_ui_update(ud, "PictureBottomCrop", ghb_int64_value(crop[1])); + ghb_ui_update(ud, "PictureLeftCrop", ghb_int64_value(crop[2])); + ghb_ui_update(ud, "PictureRightCrop", ghb_int64_value(crop[3])); } } - crop[0] = ghb_settings_get_int(ud->settings, "crop_top"); - crop[1] = ghb_settings_get_int(ud->settings, "crop_bottom"); - crop[2] = ghb_settings_get_int(ud->settings, "crop_left"); - crop[3] = ghb_settings_get_int(ud->settings, "crop_right"); + crop[0] = ghb_settings_get_int(ud->settings, "PictureTopCrop"); + crop[1] = ghb_settings_get_int(ud->settings, "PictureBottomCrop"); + crop[2] = ghb_settings_get_int(ud->settings, "PictureLeftCrop"); + crop[3] = ghb_settings_get_int(ud->settings, "PictureRightCrop"); hb_reduce(&aspect_n, &aspect_d, title->width * title->pixel_aspect_width, title->height * title->pixel_aspect_height); @@ -2107,15 +2411,15 @@ ghb_set_scale(signal_user_data_t *ud, gint mode) { width = crop_width; height = crop_height; - max_width = crop_width; - max_height = crop_height; + max_width = 0; + max_height = 0; } else { width = ghb_settings_get_int(ud->settings, "scale_width"); height = ghb_settings_get_int(ud->settings, "scale_height"); - max_width = ghb_settings_get_int(ud->settings, "max_width"); - max_height = ghb_settings_get_int(ud->settings, "max_width"); + max_width = ghb_settings_get_int(ud->settings, "PictureWidth"); + max_height = ghb_settings_get_int(ud->settings, "PictureHeight"); // Align max dims max_width = (max_width >> modshift) << modshift; max_height = (max_height >> modshift) << modshift; @@ -2154,7 +2458,8 @@ ghb_set_scale(signal_user_data_t *ud, gint mode) 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 { @@ -2174,12 +2479,13 @@ ghb_set_scale(signal_user_data_t *ud, gint mode) // Height and width are always multiples of 2, so do the rounding new_height = ((new_height + 1) >> 1) << 1; new_width = ((new_width + 1) >> 1) << 1; - g_debug("max w %d, new w %d\n", max_width, new_width); - if (max_width && (new_width > max_width)) + if ((max_width && new_width > max_width) || + new_width > title->width) { height = new_height; } - else if (max_height && (new_height > max_height)) + else if ((max_height && new_height > max_height) || + new_height > title->height) { width = new_width; } @@ -2211,14 +2517,14 @@ ghb_set_scale(signal_user_data_t *ud, gint mode) static void 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"); + job->crop[0] = ghb_settings_get_int(settings, "PictureTopCrop"); + job->crop[1] = ghb_settings_get_int(settings, "PictureBottomCrop"); + job->crop[2] = ghb_settings_get_int(settings, "PictureLeftCrop"); + job->crop[3] = ghb_settings_get_int(settings, "PictureRightCrop"); gboolean anamorphic, round_dimensions; anamorphic = ghb_settings_get_boolean(settings, "anamorphic"); - round_dimensions = ghb_settings_get_boolean(settings, "round_dimensions"); + round_dimensions = ghb_settings_get_boolean(settings, "ModDimensions"); if (round_dimensions && anamorphic) { job->modulus = 16; @@ -2236,8 +2542,8 @@ set_preview_job_settings(hb_job_t *job, GValue *settings) } 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"); - gboolean decomb = ghb_settings_get_boolean(settings, "decomb"); + gint deint = ghb_settings_combo_int(settings, "PictureDeinterlace"); + gboolean decomb = ghb_settings_get_boolean(settings, "PictureDecomb"); job->deinterlace = (!decomb && deint == 0) ? 0 : 1; } @@ -2249,57 +2555,16 @@ ghb_calculate_target_bitrate(GValue *settings, gint titleindex) hb_job_t * job; gint size; - if (h_scan == NULL) return 2000; + if (h_scan == NULL) return 1500; list = hb_get_titles( h_scan ); title = hb_list_item( list, titleindex ); - if (title == NULL) return 2000; + if (title == NULL) return 1500; job = title->job; - if (job == NULL) return 2000; - size = ghb_settings_get_int(settings, "video_target_size"); + if (job == NULL) return 1500; + size = ghb_settings_get_int(settings, "VideoTargetSize"); return hb_calc_bitrate( job, size ); } -gint -ghb_guess_bitrate(GValue *settings) -{ - gint bitrate; - 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; - gdouble vquality; - - vcodec = ghb_settings_get_int(settings, "video_codec"); - vquality = ghb_settings_get_double(settings, "video_quality")/100; - if (vcodec == HB_VCODEC_X264 && - !ghb_settings_get_boolean(settings, "linear_vquality")) - { - vquality = 51.0 - vquality * 51.0; - // Convert log curve to linear - vquality = exp2((vquality-12)/6); - // Don't let it go to 0 - if (vquality >= 31) vquality = 30; - vquality = (31 - vquality) / 31; - } - // bitrate seems to be a log relasionship to quality - // with typical source material - // This is a real wag - bitrate = 20*1024*1024*exp10(vquality*14)/exp10(14); - // Add some bits for audio - bitrate += 500*1024; - } - else - { - // Add some fudge to the bitrate to leave breathing room - bitrate = ghb_settings_get_int(settings, "video_bitrate")*1024; - // Add some bits for audio - bitrate += 500*1024; - } - return bitrate; -} - gboolean ghb_validate_filter_string(const gchar *str, gint max_fields) { @@ -2341,8 +2606,8 @@ ghb_validate_filters(signal_user_data_t *ud) if (tweaks) { // detele 6 - str = ghb_settings_get_string(ud->settings, "tweak_detelecine"); - enabled = ghb_settings_get_boolean(ud->settings, "detelecine"); + str = ghb_settings_get_string(ud->settings, "tweak_PictureDetelecine"); + enabled = ghb_settings_get_boolean(ud->settings, "PictureDetelecine"); if (enabled && !ghb_validate_filter_string(str, 6)) { message = g_strdup_printf( @@ -2355,8 +2620,8 @@ ghb_validate_filters(signal_user_data_t *ud) } g_free(str); // decomb 7 - str = ghb_settings_get_string(ud->settings, "tweak_decomb"); - enabled = ghb_settings_get_boolean(ud->settings, "decomb"); + str = ghb_settings_get_string(ud->settings, "tweak_PictureDecomb"); + enabled = ghb_settings_get_boolean(ud->settings, "PictureDecomb"); if (enabled && !ghb_validate_filter_string(str, 7)) { message = g_strdup_printf( @@ -2369,10 +2634,11 @@ ghb_validate_filters(signal_user_data_t *ud) } g_free(str); // deinte 4 - index = ghb_settings_get_combo_index(ud->settings, "tweak_deinterlace"); + index = ghb_lookup_combo_int("tweak_PictureDeinterlace", + ghb_settings_get_value(ud->settings, "tweak_PictureDeinterlace")); if (index < 0) { - str = ghb_settings_get_string(ud->settings, "tweak_deinterlace"); + str = ghb_settings_get_string(ud->settings, "tweak_PictureDeinterlace"); if (!ghb_validate_filter_string(str, 4)) { message = g_strdup_printf( @@ -2385,28 +2651,12 @@ ghb_validate_filters(signal_user_data_t *ud) } 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_settings_get_combo_index(ud->settings, "tweak_denoise"); + index = ghb_lookup_combo_int("tweak_PictureDenoise", + ghb_settings_get_value(ud->settings, "tweak_PictureDenoise")); if (index < 0) { - str = ghb_settings_get_string(ud->settings, "tweak_denoise"); + str = ghb_settings_get_string(ud->settings, "tweak_PictureDenoise"); if (!ghb_validate_filter_string(str, 4)) { message = g_strdup_printf( @@ -2429,8 +2679,8 @@ ghb_validate_video(signal_user_data_t *ud) gint vcodec, mux; gchar *message; - mux = ghb_settings_get_int(ud->settings, "container"); - vcodec = ghb_settings_get_int(ud->settings, "video_codec"); + mux = ghb_settings_combo_int(ud->settings, "FileFormat"); + vcodec = ghb_settings_combo_int(ud->settings, "VideoEncoder"); if ((mux == HB_MUX_MP4 || mux == HB_MUX_AVI) && (vcodec == HB_VCODEC_THEORA)) { @@ -2446,71 +2696,7 @@ ghb_validate_video(signal_user_data_t *ud) } g_free(message); vcodec = HB_VCODEC_XVID; - ghb_ui_update(ud, "video_codec", ghb_int64_value(vcodec)); - } - gboolean decomb; - gboolean vfr; - decomb = ghb_settings_get_boolean(ud->settings, "decomb"); - vfr = ghb_settings_get_boolean(ud->settings, "variable_frame_rate"); - if (decomb && !vfr) - { - message = g_strdup_printf( - "Decomb is intended to be used in conjunction\n" - "with variable frame rate.\n\n" - "Would you like me to enable VFR for you?"); - if (ghb_message_dialog(GTK_MESSAGE_WARNING, message, "No", "Yes")) - { - ghb_ui_update(ud, "variable_frame_rate", ghb_boolean_value(TRUE)); - } - g_free(message); - } - return TRUE; -} - -gboolean -ghb_validate_container(signal_user_data_t *ud) -{ - gint container; - gchar *message; - - container = ghb_settings_get_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_get_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); - } - } - } + ghb_ui_update(ud, "VideoEncoder", ghb_int64_value(vcodec)); } return TRUE; } @@ -2532,10 +2718,12 @@ ghb_validate_audio(signal_user_data_t *ud) return FALSE; } - gint titleindex = ghb_settings_get_int(ud->settings, "title"); + gint titleindex; + + titleindex = ghb_settings_combo_int(ud->settings, "title"); title = hb_list_item( list, titleindex ); if (title == NULL) return FALSE; - gint mux = ghb_settings_get_int(ud->settings, "container"); + gint mux = ghb_settings_combo_int(ud->settings, "FileFormat"); const GValue *audio_list; gint count, ii; @@ -2548,9 +2736,10 @@ ghb_validate_audio(signal_user_data_t *ud) hb_audio_config_t *taudio; asettings = ghb_array_get_nth(audio_list, ii); - gint track = ghb_settings_get_int(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 ); + gint track = ghb_settings_combo_int(asettings, "AudioTrack"); + gint codec = ghb_settings_combo_int(asettings, "AudioEncoder"); + 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 @@ -2573,7 +2762,7 @@ ghb_validate_audio(signal_user_data_t *ud) codec = HB_ACODEC_FAAC; } value = get_acodec_value(codec); - ghb_settings_take_value(asettings, "audio_codec", value); + ghb_settings_take_value(asettings, "AudioEncoder", value); } gchar *a_unsup = NULL; gchar *mux_s = NULL; @@ -2635,9 +2824,9 @@ ghb_validate_audio(signal_user_data_t *ud) } g_free(message); value = get_acodec_value(codec); - ghb_settings_take_value(asettings, "audio_codec", value); + ghb_settings_take_value(asettings, "AudioEncoder", value); } - gint mix = ghb_settings_get_int (asettings, "audio_mix"); + gint mix = ghb_settings_combo_int (asettings, "AudioMixdown"); gboolean allow_mono = TRUE; gboolean allow_stereo = TRUE; gboolean allow_dolby = TRUE; @@ -2695,7 +2884,7 @@ ghb_validate_audio(signal_user_data_t *ud) g_free(message); mix = ghb_get_best_mix(titleindex, track, codec, mix); value = get_amix_value(mix); - ghb_settings_take_value(asettings, "audio_mix", value); + ghb_settings_take_value(asettings, "AudioMixdown", value); } } return TRUE; @@ -2709,18 +2898,20 @@ ghb_validate_vquality(GValue *settings) gint min, max; if (ghb_settings_get_boolean(settings, "nocheckvquality")) return TRUE; - vcodec = ghb_settings_get_int(settings, "video_codec"); + vcodec = ghb_settings_combo_int(settings, "VideoEncoder"); + gdouble vquality; + vquality = ghb_settings_get_double(settings, "VideoQualitySlider"); if (ghb_settings_get_boolean(settings, "vquality_type_constant")) { if (!ghb_settings_get_boolean(settings, "directqp")) { - if (vcodec != HB_VCODEC_X264 || - ghb_settings_get_boolean(settings, "linear_vquality")) + vquality *= 100.0; + if (vcodec != HB_VCODEC_X264) { min = 68; max = 97; } - else if (vcodec == HB_VCODEC_X264) + else { min = 40; max = 70; @@ -2742,16 +2933,16 @@ ghb_validate_vquality(GValue *settings) { min = 68; max = 97; + vquality *= 100.0; } } - gint vquality = ghb_settings_get_double(settings, "video_quality"); if (vquality < min || vquality > max) { message = g_strdup_printf( "Interesting video quality choise: %d\n\n" "Typical values range from %d to %d.\n" "Are you sure you wish to use this setting?", - vquality, min, max); + (gint)vquality, min, max); if (!ghb_message_dialog(GTK_MESSAGE_QUESTION, message, "Cancel", "Continue")) { @@ -2764,8 +2955,8 @@ ghb_validate_vquality(GValue *settings) return TRUE; } -void -ghb_add_job(GValue *js, gint unique_id) +static void +add_job(hb_handle_t *h, GValue *js, gint unique_id, gint titleindex) { hb_list_t * list; hb_title_t * title; @@ -2780,20 +2971,15 @@ ghb_add_job(GValue *js, gint unique_id) gchar *denoise_str = NULL; gchar *dest_str = NULL; - g_debug("ghb_add_job()\n"); - if (h_queue == NULL) return; - list = hb_get_titles( h_queue ); + g_debug("add_job()\n"); + if (h == NULL) return; + list = hb_get_titles( h ); if( !hb_list_count( list ) ) { /* No valid title, stop right there */ - g_message("No title found.\n"); return; } - // 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; @@ -2801,73 +2987,84 @@ ghb_add_job(GValue *js, gint unique_id) job = title->job; if (job == NULL) return; - tweaks = ghb_settings_get_int(js, "allow_tweaks"); - job->mux = ghb_lookup_mux(ghb_settings_get_value(js, "container")); + job->start_at_preview = ghb_settings_get_int(js, "start_frame") + 1; + if (job->start_at_preview) + { +g_message("duration %d", ghb_settings_get_int(js, "live_duration")); + job->seek_points = ghb_settings_get_int(js, "preview_count"); + job->pts_to_stop = ghb_settings_get_int(js, "live_duration") * 90000LL; + } + + tweaks = ghb_settings_get_boolean(js, "allow_tweaks"); + job->mux = ghb_settings_combo_int(js, "FileFormat"); if (job->mux == HB_MUX_MP4) { - job->largeFileSize = ghb_settings_get_boolean(js, "large_mp4"); - job->mp4_optimize = ghb_settings_get_boolean(js, "http_optimize_mp4"); + job->largeFileSize = ghb_settings_get_boolean(js, "Mp4LargeFile"); + job->mp4_optimize = ghb_settings_get_boolean(js, "Mp4HttpOptimize"); } else { job->largeFileSize = FALSE; job->mp4_optimize = FALSE; } - gint chapter_start, chapter_end; - 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_boolean(js, "chapter_markers"); - if ( job->chapter_markers ) + if (!job->start_at_preview) { - GValue *chapters; - GValue *chapter; - gint chap; - gint count; - - chapters = ghb_settings_get_value(js, "chapter_list"); - count = ghb_array_len(chapters); - for(chap = chapter_start; chap <= chapter_end; chap++) + gint chapter_start, chapter_end; + 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_boolean(js, "ChapterMarkers"); + if ( job->chapter_markers ) { - hb_chapter_t * chapter_s; - gchar *name; - - name = NULL; - if (chap-1 < count) - { - chapter = ghb_array_get_nth(chapters, chap-1); - name = ghb_value_string(chapter); - } - if (name == NULL) + GValue *chapters; + GValue *chapter; + gint chap; + gint count; + + chapters = ghb_settings_get_value(js, "chapter_list"); + count = ghb_array_len(chapters); + for(chap = chapter_start; chap <= chapter_end; chap++) { - name = g_strdup_printf ("Chapter %2d", chap); + hb_chapter_t * chapter_s; + gchar *name; + + name = NULL; + if (chap-1 < count) + { + chapter = ghb_array_get_nth(chapters, chap-1); + name = ghb_value_string(chapter); + } + if (name == NULL) + { + name = g_strdup_printf ("Chapter %2d", chap); + } + 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); } - 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(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"); + job->crop[0] = ghb_settings_get_int(js, "PictureTopCrop"); + job->crop[1] = ghb_settings_get_int(js, "PictureBottomCrop"); + job->crop[2] = ghb_settings_get_int(js, "PictureLeftCrop"); + job->crop[3] = ghb_settings_get_int(js, "PictureRightCrop"); - gboolean decomb = ghb_settings_get_boolean(js, "decomb"); - gint deint = ghb_lookup_deint( - ghb_settings_get_value(js, tweaks ? "tweak_deinterlace":"deinterlace")); + gboolean decomb = ghb_settings_get_boolean(js, "PictureDecomb"); + gint deint = ghb_settings_combo_int(js, + tweaks ? "tweak_PictureDeinterlace":"PictureDeinterlace"); if (!decomb) job->deinterlace = (deint != 0) ? 1 : 0; else job->deinterlace = 0; - job->grayscale = ghb_settings_get_boolean(js, "grayscale"); + job->grayscale = ghb_settings_get_boolean(js, "VideoGrayScale"); gboolean anamorphic = ghb_settings_get_boolean(js, "anamorphic"); - gboolean round_dimensions = ghb_settings_get_boolean(js, "round_dimensions"); + gboolean round_dimensions = ghb_settings_get_boolean(js, "ModDimensions"); if (round_dimensions && anamorphic) { job->pixel_ratio = 2; @@ -2887,15 +3084,20 @@ ghb_add_job(GValue *js, gint unique_id) job->pixel_ratio = 0; job->modulus = 2; } - job->vfr = ghb_settings_get_boolean(js, "variable_frame_rate"); /* Add selected filters */ job->filters = hb_list_init(); - if( ghb_settings_get_boolean(js, "detelecine" ) || job->vfr ) + gint vrate = ghb_settings_combo_int(js, "VideoFramerate"); + if( vrate == 0 && ghb_settings_get_boolean(js, "PictureDetelecine" ) ) + job->vfr = 1; + else + job->vfr = 0; + + if( ghb_settings_get_boolean(js, "PictureDetelecine" ) ) { hb_filter_detelecine.settings = NULL; if (tweaks) { - detel_str = ghb_settings_get_string(js, "tweak_detelecine"); + detel_str = ghb_settings_get_string(js, "tweak_PictureDetelecine"); if (detel_str && detel_str[0]) { hb_filter_detelecine.settings = detel_str; @@ -2909,7 +3111,7 @@ ghb_add_job(GValue *js, gint unique_id) hb_filter_decomb.settings = NULL; if (tweaks) { - decomb_str = ghb_settings_get_string(js, "tweak_decomb"); + decomb_str = ghb_settings_get_string(js, "tweak_PictureDecomb"); if (decomb_str && decomb_str[0]) { hb_filter_decomb.settings = (gchar*)decomb_str; @@ -2923,33 +3125,33 @@ ghb_add_job(GValue *js, gint unique_id) deint_str = g_strdup(deint_opts.map[deint].svalue); else deint_str = ghb_settings_get_string(js, - tweaks ? "tweak_deinterlace" : "deinterlace"); + tweaks ? "tweak_PictureDeinterlace" : "PictureDeinterlace"); hb_filter_deinterlace.settings = deint_str; hb_list_add( job->filters, &hb_filter_deinterlace ); } - gint deblock = ghb_settings_get_int(js, "deblock"); - if( deblock > 0 ) + gint deblock = ghb_settings_get_int(js, "PictureDeblock"); + if( deblock >= 5 ) { deblock_str = g_strdup_printf("%d", deblock); hb_filter_deblock.settings = deblock_str; hb_list_add( job->filters, &hb_filter_deblock ); } - gint denoise = ghb_lookup_denoise( - ghb_settings_get_value(js, tweaks ? "tweak_denoise" : "denoise")); + gint denoise = ghb_settings_combo_int(js, + tweaks ? "tweak_PictureDenoise" : "PictureDenoise"); if( denoise != 0 ) { 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"); + js, tweaks ? "tweak_PictureDenoise" : "PictureDenoise"); hb_filter_denoise.settings = denoise_str; hb_list_add( job->filters, &hb_filter_denoise ); } job->width = ghb_settings_get_int(js, "scale_width"); job->height = ghb_settings_get_int(js, "scale_height"); - job->vcodec = ghb_lookup_vcodec(ghb_settings_get_value(js, "video_codec")); + job->vcodec = ghb_settings_combo_int(js, "VideoEncoder"); if ((job->mux == HB_MUX_MP4 || job->mux == HB_MUX_AVI) && (job->vcodec == HB_VCODEC_THEORA)) { @@ -2958,37 +3160,16 @@ ghb_add_job(GValue *js, gint unique_id) } if ((job->vcodec == HB_VCODEC_X264) && (job->mux == HB_MUX_MP4)) { - job->ipod_atom = ghb_settings_get_boolean(js, "ipod_file"); + job->ipod_atom = ghb_settings_get_boolean(js, "Mp4iPodCompatible"); } if (ghb_settings_get_boolean(js, "vquality_type_constant")) { gdouble vquality; - vquality = ghb_settings_get_double(js, "video_quality"); + vquality = ghb_settings_get_double(js, "VideoQualitySlider"); if (!ghb_settings_get_boolean(js, "directqp")) { - vquality /= 100.0; - if (ghb_settings_get_boolean(js, "linear_vquality")) - { - if (job->vcodec == HB_VCODEC_X264) - { - // Adjust to same range as xvid and ffmpeg - vquality = 31.0 - vquality * 31.0; - if (vquality > 0) - { - // Convert linear to log curve - vquality = 12 + 6 * log2(vquality); - if (vquality > 51) vquality = 51; - if (vquality < 1) vquality = 1; - } - else - vquality = 0; - } - } - else - { - if (vquality == 0.0) vquality = 0.01; - if (vquality == 1.0) vquality = 0.0; - } + if (vquality == 0.0) vquality = 0.01; + if (vquality == 1.0) vquality = 0.0; } job->vquality = vquality; job->vbitrate = 0; @@ -2996,16 +3177,16 @@ ghb_add_job(GValue *js, gint unique_id) else if (ghb_settings_get_boolean(js, "vquality_type_bitrate")) { job->vquality = -1.0; - job->vbitrate = ghb_settings_get_int(js, "video_bitrate"); + job->vbitrate = ghb_settings_get_int(js, "VideoAvgBitrate"); } // AVI container does not support variable frame rate. if (job->mux == HB_MUX_AVI) { job->vfr = FALSE; + job->cfr = 1; } - gint vrate = ghb_lookup_vrate(ghb_settings_get_value(js, "framerate")); - if( vrate == 0 || job->vfr ) + if( vrate == 0 ) { job->vrate = title->rate; job->vrate_base = title->rate_base; @@ -3041,11 +3222,11 @@ ghb_add_job(GValue *js, gint unique_id) hb_audio_config_init(&audio); asettings = ghb_array_get_nth(audio_list, ii); - audio.in.track = ghb_settings_get_int(asettings, "audio_track"); + audio.in.track = ghb_settings_get_int(asettings, "AudioTrack"); audio.out.track = tcount; - audio.out.codec = ghb_lookup_acodec( - ghb_settings_get_value(asettings, "audio_codec")); - taudio = (hb_audio_config_t *) hb_list_audio_config_item( title->list_audio, audio.in.track ); + audio.out.codec = ghb_settings_combo_int(asettings, "AudioEncoder"); + 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 @@ -3055,6 +3236,7 @@ ghb_add_job(GValue *js, gint unique_id) } else { +printf("switching to faac\n"); audio.out.codec = HB_ACODEC_FAAC; } } @@ -3080,7 +3262,7 @@ ghb_add_job(GValue *js, gint unique_id) audio.out.codec = HB_ACODEC_VORBIS; } audio.out.dynamic_range_compression = - ghb_settings_get_double(asettings, "audio_drc"); + ghb_settings_get_double(asettings, "AudioTrackDRCSlider"); // 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) { @@ -3088,14 +3270,13 @@ ghb_add_job(GValue *js, gint unique_id) } else { - audio.out.mixdown = ghb_lookup_mix( - ghb_settings_get_value (asettings, "audio_mix")); + audio.out.mixdown = ghb_settings_combo_int(asettings, "AudioMixdown"); // 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_rate"); + ghb_settings_combo_int(asettings, "AudioBitrate"); + gint srate = ghb_settings_combo_int(asettings, "AudioSamplerate"); if (srate == 0) // 0 is same as source audio.out.samplerate = taudio->in.samplerate; else @@ -3113,7 +3294,7 @@ ghb_add_job(GValue *js, gint unique_id) { gint size; - size = ghb_settings_get_int(js, "video_target_size"); + size = ghb_settings_get_int(js, "VideoTargetSize"); job->vbitrate = hb_calc_bitrate( job, size ); job->vquality = -1.0; } @@ -3136,8 +3317,8 @@ ghb_add_job(GValue *js, gint unique_id) { job->x264opts = NULL; } - gint subtitle = ghb_settings_get_int(js, "subtitle_lang"); - gchar *slang = ghb_settings_get_string(js, "subtitle_lang"); + gint subtitle; + gchar *slang = ghb_settings_get_string(js, "Subtitles"); subtitle = -2; // default to none if (strcmp(slang, "auto") == 0) { @@ -3159,7 +3340,7 @@ ghb_add_job(GValue *js, gint unique_id) } } } - gboolean forced_subtitles = ghb_settings_get_boolean(js, "forced_subtitles"); + gboolean forced_subtitles = ghb_settings_get_boolean(js, "SubtitlesForced"); job->subtitle_force = forced_subtitles; if (subtitle >= 0) job->subtitle = subtitle; @@ -3187,7 +3368,7 @@ ghb_add_job(GValue *js, gint unique_id) * Add the pre-scan job */ job->sequence_id = (unique_id & 0xFFFFFF) | (sub_id++ << 24); - hb_add( h_queue, job ); + hb_add( h, job ); //if (job->x264opts != NULL) // g_free(job->x264opts); @@ -3197,7 +3378,7 @@ ghb_add_job(GValue *js, gint unique_id) { job->select_subtitle = NULL; } - if( ghb_settings_get_boolean(js, "two_pass") && + if( ghb_settings_get_boolean(js, "VideoTwoPass") && !ghb_settings_get_boolean(js, "vquality_type_constant")) { /* @@ -3218,7 +3399,7 @@ ghb_add_job(GValue *js, gint unique_id) * If turbo options have been selected then append them * to the x264opts now (size includes one ':' and the '\0') */ - if( ghb_settings_get_boolean(js, "turbo") ) + if( ghb_settings_get_boolean(js, "VideoTurboTwoPass") ) { char *tmp_x264opts; @@ -3240,7 +3421,7 @@ ghb_add_job(GValue *js, gint unique_id) job->x264opts = x264opts; } job->sequence_id = (unique_id & 0xFFFFFF) | (sub_id++ << 24); - hb_add( h_queue, job ); + hb_add( h, job ); //if (job->x264opts != NULL) // g_free(job->x264opts); @@ -3255,7 +3436,7 @@ ghb_add_job(GValue *js, gint unique_id) job->indepth_scan = 0; job->x264opts = x264opts2; job->sequence_id = (unique_id & 0xFFFFFF) | (sub_id++ << 24); - hb_add( h_queue, job ); + hb_add( h, job ); //if (job->x264opts != NULL) // g_free(job->x264opts); } @@ -3264,7 +3445,7 @@ ghb_add_job(GValue *js, gint unique_id) job->indepth_scan = 0; job->pass = 0; job->sequence_id = (unique_id & 0xFFFFFF) | (sub_id++ << 24); - hb_add( h_queue, job ); + hb_add( h, job ); //if (job->x264opts != NULL) // g_free(job->x264opts); } @@ -3277,6 +3458,23 @@ ghb_add_job(GValue *js, gint unique_id) } void +ghb_add_job(GValue *js, gint unique_id) +{ + // 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. + add_job(h_queue, js, unique_id, 0); +} + +void +ghb_add_live_job(GValue *js, gint unique_id) +{ + // 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_combo_int(js, "title"); + add_job(h_scan, js, unique_id, titleindex); +} + +void ghb_remove_job(gint unique_id) { hb_job_t * job; @@ -3306,6 +3504,18 @@ ghb_stop_queue() } void +ghb_start_live_encode() +{ + hb_start( h_scan ); +} + +void +ghb_stop_live_encode() +{ + hb_stop( h_scan ); +} + +void ghb_pause_queue() { hb_state_t s; @@ -3321,16 +3531,23 @@ ghb_pause_queue() } } +#define RED_HEIGHT 720.0 +#define RED_WIDTH 1280.0 + GdkPixbuf* ghb_get_preview_image( gint titleindex, gint index, - GValue *settings, - gboolean borders) + signal_user_data_t *ud, + gboolean borders, + gint *out_width, + gint *out_height) { + GValue *settings; hb_title_t *title; hb_list_t *list; + settings = ud->settings; list = hb_get_titles( h_scan ); if( !hb_list_count( list ) ) { @@ -3452,12 +3669,37 @@ ghb_get_preview_image( if (anamorphic) { hb_set_anamorphic_size( title->job, &width, &height, &par_width, &par_height ); - if (par_width > par_height) - dstWidth = dstWidth * par_width / par_height; - else - dstHeight = dstHeight * par_height / par_width; + ghb_par_scale(ud, &dstWidth, &dstHeight, par_width, par_height); + } + else + { + ghb_par_scale(ud, &dstWidth, &dstHeight, 1, 1); + } + *out_width = dstWidth; + *out_height = dstHeight; + if (ghb_settings_get_boolean(settings, "reduce_hd_preview")) + { + GdkScreen *ss; + gint s_w, s_h; + gint num, den; + + ss = gdk_screen_get_default(); + s_w = gdk_screen_get_width(ss); + s_h = gdk_screen_get_height(ss); + num = dstWidth * par_width; + den = dstHeight * par_height; + + if (dstWidth > s_w * 80 / 100) + { + dstWidth = s_w * 80 / 100; + dstHeight = dstWidth * den / num; + } + if (dstHeight > s_h * 80 / 100) + { + dstHeight = s_h * 80 / 100; + dstWidth = dstHeight * num / den; + } } - g_debug("scaled %d x %d\n", dstWidth, dstHeight); GdkPixbuf *scaled_preview; scaled_preview = gdk_pixbuf_scale_simple(preview, dstWidth, dstHeight, GDK_INTERP_HYPER);