X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=gtk%2Fsrc%2Fhb-backend.c;h=7ac71720b3a5d4dd4ee08303cf679bc5cd61b5c2;hb=80330e859f794e9ae218d54260c70e961f1af204;hp=c36e182ed5f6faa320a3a4feb75cdde86b4a2695;hpb=29ee7f3969d20c24931b9f605b08897d4c4e677f;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c index c36e182e..7ac71720 100644 --- a/gtk/src/hb-backend.c +++ b/gtk/src/hb-backend.c @@ -25,37 +25,145 @@ #include #include #include "hb.h" -#include "hbversion.h" #include #include #include "hb-backend.h" #include "settings.h" #include "callbacks.h" +#include "subtitlehandler.h" +#include "audiohandler.h" +#include "x264handler.h" +#include "preview.h" +#include "values.h" +#include "lang.h" typedef struct { const gchar *option; const gchar *shortOpt; - gint ivalue; - gdouble dvalue; + gdouble ivalue; const gchar *svalue; - gboolean sensitive; } options_map_t; typedef struct { gint count; options_map_t *map; - gint *grey_options; } combo_opts_t; +static gchar **index_str = NULL; +static gint index_str_size = 0; + +static void +index_str_init(gint max_index) +{ + int ii; + + if (max_index+1 > index_str_size) + { + index_str = realloc(index_str, (max_index+1) * sizeof(char*)); + for (ii = index_str_size; ii <= max_index; ii++) + { + index_str[ii] = g_strdup_printf("%d", ii); + } + index_str_size = max_index + 1; + } +} + +static options_map_t d_when_complete_opts[] = +{ + {"Do Nothing", "nothing", 0, "0"}, + {"Show Notification", "notify", 1, "1"}, + {"Put Computer To Sleep", "sleep", 2, "2"}, + {"Shutdown Computer", "shutdown", 3, "3"}, +}; +combo_opts_t when_complete_opts = +{ + sizeof(d_when_complete_opts)/sizeof(options_map_t), + d_when_complete_opts +}; + +static options_map_t d_par_opts[] = +{ + {"Off", "0", 0, "0"}, + {"Strict", "1", 1, "1"}, + {"Loose", "2", 2, "2"}, + {"Custom", "3", 3, "3"}, +}; +combo_opts_t par_opts = +{ + sizeof(d_par_opts)/sizeof(options_map_t), + d_par_opts +}; + +static options_map_t d_alignment_opts[] = +{ + {"2", "2", 2, "2"}, + {"4", "4", 4, "4"}, + {"8", "8", 8, "8"}, + {"16", "16", 16, "16"}, +}; +combo_opts_t alignment_opts = +{ + sizeof(d_alignment_opts)/sizeof(options_map_t), + d_alignment_opts +}; + +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_log_longevity_opts[] = +{ + {"Week", "week", 7, "7"}, + {"Month", "month", 30, "30"}, + {"Year", "year", 365, "365"}, + {"Immortal", "immortal", 366, "366"}, +}; +combo_opts_t log_longevity_opts = +{ + sizeof(d_log_longevity_opts)/sizeof(options_map_t), + d_log_longevity_opts +}; + +static options_map_t d_appcast_update_opts[] = +{ + {"Never", "never", 0, "never"}, + {"Daily", "daily", 1, "daily"}, + {"Weekly", "weekly", 2, "weekly"}, + {"Monthly", "monthly", 3, "monthly"}, +}; +combo_opts_t appcast_update_opts = +{ + sizeof(d_appcast_update_opts)/sizeof(options_map_t), + d_appcast_update_opts +}; + +static options_map_t d_vqual_granularity_opts[] = +{ + {"0.2", "0.2", 0.2, "0.2"}, + {"0.25", "0.25", 0.25, "0.25"}, + {"0.5", "0.5", 0.5, "0.5"}, + {"1", "1", 1, "1"}, +}; +combo_opts_t vqual_granularity_opts = +{ + sizeof(d_vqual_granularity_opts)/sizeof(options_map_t), + d_vqual_granularity_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"}, }; combo_opts_t container_opts = { @@ -63,12 +171,37 @@ combo_opts_t container_opts = d_container_opts }; +static options_map_t d_detel_opts[] = +{ + {"Off", "off", 0, ""}, + {"Custom", "custom", 1, ""}, + {"Default","default",2, NULL}, +}; +combo_opts_t detel_opts = +{ + sizeof(d_detel_opts)/sizeof(options_map_t), + d_detel_opts +}; + +static options_map_t d_decomb_opts[] = +{ + {"Off", "off", 0, ""}, + {"Custom", "custom", 1, ""}, + {"Default","default",2, NULL}, +}; +combo_opts_t decomb_opts = +{ + sizeof(d_decomb_opts)/sizeof(options_map_t), + d_decomb_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"}, + {"Off", "off", 0, ""}, + {"Custom", "custom", 1, ""}, + {"Fast", "fast", 2, "-1:-1:-1:0:1"}, + {"Slow", "slow", 3, "2:-1:-1:0:1"}, + {"Slower", "slower", 4, "0:-1:-1:0:1"}, }; combo_opts_t deint_opts = { @@ -78,10 +211,11 @@ 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"}, + {"Off", "off", 0, ""}, + {"Custom", "custom", 1, ""}, + {"Weak", "weak", 2, "2:1:2:3"}, + {"Medium", "medium", 3, "3:2:2:3"}, + {"Strong", "strong", 4, "7:7:5:5"}, }; combo_opts_t denoise_opts = { @@ -91,10 +225,9 @@ 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 (FFmpeg)", "ffmpeg", HB_VCODEC_FFMPEG, ""}, + {"VP3 (Theora)", "theora", HB_VCODEC_THEORA, ""}, }; combo_opts_t vcodec_opts = { @@ -104,10 +237,12 @@ 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"}, + {"DTS (pass-thru)", "dts", HB_ACODEC_DCA, "dts"}, + {"Choose For Me", "auto", HB_ACODEC_MASK, "auto"}, }; combo_opts_t acodec_opts = { @@ -115,52 +250,38 @@ 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[] = +static options_map_t d_direct_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, ""}, + {"None", "none", 0, "none"}, + {"Spatial", "spatial", 1, "spatial"}, + {"Temporal", "temporal", 2, "temporal"}, + {"Automatic", "auto", 3, "auto"}, }; -combo_opts_t source_acodec_opts = +combo_opts_t direct_opts = { - sizeof(d_source_acodec_opts)/sizeof(options_map_t), - d_source_acodec_opts + sizeof(d_direct_opts)/sizeof(options_map_t), + d_direct_opts }; -static options_map_t d_direct_opts[] = +static options_map_t d_badapt_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"}, + {"Off", "0", 0, "0"}, + {"Fast", "1", 1, "1"}, + {"Optimal", "2", 2, "2"}, }; -combo_opts_t direct_opts = +combo_opts_t badapt_opts = { - sizeof(d_direct_opts)/sizeof(options_map_t), - d_direct_opts + sizeof(d_badapt_opts)/sizeof(options_map_t), + d_badapt_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 = { @@ -170,13 +291,16 @@ 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"}, + {"10", "10", 10, "10"}, }; combo_opts_t subme_opts = { @@ -186,9 +310,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:8x8dct=1"}, + {"Some", "some", 0, "some"}, + {"None", "none", 1, "none"}, + {"All", "all", 2, "all"}, + {"Custom", "custom", 3, "all"}, }; combo_opts_t analyse_opts = { @@ -198,9 +323,9 @@ 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 = { @@ -208,6 +333,100 @@ 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[] = +{ + {"WhenComplete", &when_complete_opts}, + {"PicturePAR", &par_opts}, + {"PictureModulus", &alignment_opts}, + {"LoggingLevel", &logging_opts}, + {"LogLongevity", &log_longevity_opts}, + {"check_updates", &appcast_update_opts}, + {"VideoQualityGranularity", &vqual_granularity_opts}, + {"FileFormat", &container_opts}, + {"PictureDeinterlace", &deint_opts}, + {"PictureDecomb", &decomb_opts}, + {"PictureDetelecine", &detel_opts}, + {"PictureDenoise", &denoise_opts}, + {"VideoEncoder", &vcodec_opts}, + {"AudioEncoder", &acodec_opts}, + {"x264_direct", &direct_opts}, + {"x264_b_adapt", &badapt_opts}, + {"x264_me", &me_opts}, + {"x264_subme", &subme_opts}, + {"x264_analyse", &analyse_opts}, + {"x264_trellis", &trellis_opts}, + {"SubtitleTrack", &subtitle_opts}, + {"title", &title_opts}, + {"AudioTrack", &audio_track_opts}, + {NULL, NULL} +}; + +const gchar *srt_codeset_table[] = +{ + "ANSI_X3.4-1968", + "ANSI_X3.4-1986", + "ANSI_X3.4", + "ANSI_X3.110-1983", + "ANSI_X3.110", + "ASCII", + "ECMA-114", + "ECMA-118", + "ECMA-128", + "ECMA-CYRILLIC", + "IEC_P27-1", + "ISO-8859-1", + "ISO-8859-2", + "ISO-8859-3", + "ISO-8859-4", + "ISO-8859-5", + "ISO-8859-6", + "ISO-8859-7", + "ISO-8859-8", + "ISO-8859-9", + "ISO-8859-9E", + "ISO-8859-10", + "ISO-8859-11", + "ISO-8859-13", + "ISO-8859-14", + "ISO-8859-15", + "ISO-8859-16", + "UTF-7", + "UTF-8", + "UTF-16", + "UTF-16LE", + "UTF-16BE", + "UTF-32", + "UTF-32LE", + "UTF-32BE", + NULL +}; +#define SRT_TABLE_SIZE (sizeof(srt_codeset_table)/ sizeof(char*)-1) + +#if 0 typedef struct iso639_lang_t { char * eng_name; /* Description in English */ @@ -216,11 +435,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" }, @@ -256,21 +476,20 @@ static const iso639_lang_t language_table[] = { "Cree", "", "cr", "cre" }, { "Czech", "", "cs", "ces", "cze" }, { "Danish", "Dansk", "da", "dan" }, + { "German", "Deutsch", "de", "deu", "ger" }, { "Divehi", "", "dv", "div" }, - { "Dutch", "Nederlands", "nl", "nld", "dut" }, { "Dzongkha", "", "dz", "dzo" }, { "English", "English", "en", "eng" }, + { "Spanish", "Espanol", "es", "spa" }, { "Esperanto", "", "eo", "epo" }, { "Estonian", "", "et", "est" }, { "Ewe", "", "ee", "ewe" }, { "Faroese", "", "fo", "fao" }, { "Fijian", "", "fj", "fij" }, - { "Finnish", "Suomi", "fi", "fin" }, { "French", "Francais", "fr", "fra", "fre" }, { "Western Frisian", "", "fy", "fry" }, { "Fulah", "", "ff", "ful" }, { "Georgian", "", "ka", "kat", "geo" }, - { "German", "Deutsch", "de", "deu", "ger" }, { "Gaelic (Scots)", "", "gd", "gla" }, { "Irish", "", "ga", "gle" }, { "Galician", "", "gl", "glg" }, @@ -284,10 +503,10 @@ static const iso639_lang_t language_table[] = { "Herero", "", "hz", "her" }, { "Hindi", "", "hi", "hin" }, { "Hiri Motu", "", "ho", "hmo" }, - { "Hungarian", "Magyar", "hu", "hun" }, + { "Croatian", "Hrvatski", "hr", "hrv", "scr" }, { "Igbo", "", "ig", "ibo" }, - { "Icelandic", "Islenska", "is", "isl", "ice" }, { "Ido", "", "io", "ido" }, + { "Icelandic", "Islenska", "is", "isl", "ice" }, { "Sichuan Yi", "", "ii", "iii" }, { "Inuktitut", "", "iu", "iku" }, { "Interlingue", "", "ie", "ile" }, @@ -321,6 +540,7 @@ static const iso639_lang_t language_table[] = { "Luba-Katanga", "", "lu", "lub" }, { "Ganda", "", "lg", "lug" }, { "Macedonian", "", "mk", "mkd", "mac" }, + { "Hungarian", "Magyar", "hu", "hun" }, { "Marshallese", "", "mh", "mah" }, { "Malayalam", "", "ml", "mal" }, { "Maori", "", "mi", "mri", "mao" }, @@ -332,13 +552,14 @@ static const iso639_lang_t language_table[] = { "Mongolian", "", "mn", "mon" }, { "Nauru", "", "na", "nau" }, { "Navajo", "", "nv", "nav" }, + { "Dutch", "Nederlands", "nl", "nld", "dut" }, { "Ndebele, South", "", "nr", "nbl" }, { "Ndebele, North", "", "nd", "nde" }, { "Ndonga", "", "ng", "ndo" }, { "Nepali", "", "ne", "nep" }, + { "Norwegian", "Norsk", "no", "nor" }, { "Norwegian Nynorsk", "", "nn", "nno" }, { "Norwegian Bokmål", "", "nb", "nob" }, - { "Norwegian", "Norsk", "no", "nor" }, { "Chichewa; Nyanja", "", "ny", "nya" }, { "Occitan", "", "oc", "oci" }, { "Ojibwa", "", "oj", "oji" }, @@ -359,7 +580,6 @@ static const iso639_lang_t language_table[] = { "Sango", "", "sg", "sag" }, { "Sanskrit", "", "sa", "san" }, { "Serbian", "", "sr", "srp", "scc" }, - { "Croatian", "Hrvatski", "hr", "hrv", "scr" }, { "Sinhala", "", "si", "sin" }, { "Slovak", "", "sk", "slk", "slo" }, { "Slovenian", "", "sl", "slv" }, @@ -369,10 +589,10 @@ static const iso639_lang_t language_table[] = { "Sindhi", "", "sd", "snd" }, { "Somali", "", "so", "som" }, { "Sotho, Southern", "", "st", "sot" }, - { "Spanish", "Espanol", "es", "spa" }, { "Sardinian", "", "sc", "srd" }, { "Swati", "", "ss", "ssw" }, { "Sundanese", "", "su", "sun" }, + { "Finnish", "Suomi", "fi", "fin" }, { "Swahili", "", "sw", "swa" }, { "Swedish", "Svenska", "sv", "swe" }, { "Tahitian", "", "ty", "tah" }, @@ -405,11 +625,14 @@ 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) +del_tree(const gchar *name, gboolean del_top) { const gchar *file; @@ -421,11 +644,13 @@ del_tree(const gchar *name) { 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 { @@ -436,264 +661,692 @@ del_tree(const gchar *name) const gchar* ghb_version() { - return HB_VERSION; + return hb_get_version(NULL); } 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, + gboolean *inverted) { - if (ghb_settings_get_bool(ud->settings, "directqp")) + gint vcodec = ghb_settings_combo_int(ud->settings, "VideoEncoder"); + *page = 10; + *digits = 0; + switch (vcodec) { - gint vcodec = ghb_settings_get_int(ud->settings, "video_codec"); - // Only x264 and ffmpeg currently support direct qp/crf entry - if (vcodec == HB_VCODEC_X264) + case HB_VCODEC_X264: { *min = 0; *max = 51; - } - else if (vcodec == HB_VCODEC_FFMPEG) + *step = ghb_settings_combo_double(ud->settings, + "VideoQualityGranularity"); + if (*step == 0.2 || *step == 0.5) + *digits = 1; + else if (*step == 0.25) + *digits = 2; + *inverted = TRUE; + } break; + + case HB_VCODEC_FFMPEG: { - *min = 0; + *min = 1; *max = 31; - } - else + *step = 1; + *inverted = TRUE; + } break; + + case HB_VCODEC_THEORA: + { + *min = 0; + *max = 63; + *step = 1; + *inverted = FALSE; + } break; + + default: { *min = 0; *max = 100; - } - } - else - { - *min = 0; - *max = 100; + *step = 1; + *inverted = FALSE; + } break; } } -static setting_value_t* -get_acodec_value(gint val) +static const gchar* +lookup_generic_string(combo_opts_t *opts, const GValue *gval) { - setting_value_t *value = NULL; gint ii; + gchar *str; + const gchar *result = ""; - for (ii = 0; ii < acodec_opts.count; ii++) + str = ghb_value_string(gval); + for (ii = 0; ii < opts->count; ii++) { - if (acodec_opts.map[ii].ivalue == val) + if (strcmp(opts->map[ii].shortOpt, str) == 0) { - 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; + result = opts->map[ii].svalue; break; } } - return value; + g_free(str); + return result; } -static setting_value_t* -get_amix_value(gint val) +static gint +lookup_generic_int(combo_opts_t *opts, const GValue *gval) { - setting_value_t *value = NULL; gint ii; + gchar *str; + gint result = -1; - for (ii = 0; ii < hb_audio_mixdowns_count; ii++) + str = ghb_value_string(gval); + for (ii = 0; ii < opts->count; ii++) { - if (hb_audio_mixdowns[ii].amixdown == val) + if (strcmp(opts->map[ii].shortOpt, str) == 0) { - 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; + result = opts->map[ii].ivalue; break; } } - return value; + g_free(str); + return result; } -// Handle for libhb. Gets set by ghb_backend_init() -static hb_handle_t * h = NULL; - -extern void hb_get_tempory_directory(hb_handle_t *h, char path[512]); - -void -ghb_hb_cleanup() +static gdouble +lookup_generic_double(combo_opts_t *opts, const GValue *gval) { - char dir[512]; + gint ii; + gchar *str; + gdouble result = -1; - hb_get_tempory_directory(h, dir); - del_tree(dir); + 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 hb_audio_config_t* -get_hb_audio(gint titleindex, gint track) +static const gchar* +lookup_generic_option(combo_opts_t *opts, const GValue *gval) { - hb_list_t * list; - hb_title_t * title; - hb_audio_config_t *audio = NULL; - - if (h == NULL) return NULL; - list = hb_get_titles( h ); - if( !hb_list_count( list ) ) - { - /* No valid title, stop right there */ - return NULL; - } - title = hb_list_item( list, titleindex ); - if (title == NULL) return NULL; // Bad titleindex - if (!hb_list_count(title->list_audio)) + gint ii; + gchar *str; + const gchar *result = ""; + + str = ghb_value_string(gval); + for (ii = 0; ii < opts->count; ii++) { - return NULL; + if (strcmp(opts->map[ii].shortOpt, str) == 0) + { + result = opts->map[ii].option; + break; + } } - audio = (hb_audio_config_t *)hb_list_audio_config_item(title->list_audio, track); - return audio; + g_free(str); + return result; } static gint -search_rates(hb_rate_t *rates, gint rate, gint count) +lookup_mix_int(const GValue *mix) { gint ii; - for (ii = 0; ii < count; ii++) + gchar *str; + gint result = 0; + + + str = ghb_value_string(mix); + for (ii = 0; ii < hb_audio_mixdowns_count; ii++) { - if (rates[ii].rate == rate) - return ii; + if (strcmp(hb_audio_mixdowns[ii].short_name, str) == 0) + { + result = hb_audio_mixdowns[ii].amixdown; + break; + } } - return -1; + g_free(str); + return result; } -#if 0 -const gchar* -ghb_get_rate_string(gint rate, gint type) +static const gchar* +lookup_mix_option(const GValue *mix) { - gint index; - - switch (type) + gint ii; + gchar *str; + gchar *result = "None"; + + + str = ghb_value_string(mix); + for (ii = 0; ii < hb_audio_mixdowns_count; ii++) { - 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: + if (strcmp(hb_audio_mixdowns[ii].short_name, str) == 0) { - index = search_rates(hb_audio_rates, rate, hb_audio_rates_count); - if (index >= 0) return hb_audio_rates[index].string; - } break; + result = hb_audio_mixdowns[ii].human_readable_name; + break; + } } - return NULL; + g_free(str); + return result; } -#endif - -static gboolean find_combo_item_by_int(GtkTreeModel *store, gint value, GtkTreeIter *iter); -static GtkListStore* -get_combo_box_store(GtkBuilder *builder, const gchar *name) +static gint +lookup_video_rate_int(const GValue *vrate) { - GtkComboBox *combo; - GtkListStore *store; - - g_debug("get_combo_box_store() %s\n", name); - // First modify the combobox model to allow greying out of options - combo = GTK_COMBO_BOX(GHB_WIDGET(builder, name)); - store = GTK_LIST_STORE(gtk_combo_box_get_model (combo)); - return store; -} + gint ii; + gchar *str; + gint result = 0; -static void -grey_combo_box_item(GtkBuilder *builder, const gchar *name, gint value, gboolean grey) -{ - GtkListStore *store; - GtkTreeIter iter; - - store = get_combo_box_store(builder, name); - if (find_combo_item_by_int(GTK_TREE_MODEL(store), value, &iter)) + str = ghb_value_string(vrate); + for (ii = 0; ii < hb_video_rates_count; ii++) { - gtk_list_store_set(store, &iter, - 1, !grey, - -1); + 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; } -void -ghb_grey_combo_options(GtkBuilder *builder) +static const gchar* +lookup_video_rate_option(const GValue *vrate) { - GtkWidget *widget; - gint container, track, titleindex, acodec; - hb_audio_config_t *audio = NULL; - - widget = GHB_WIDGET (builder, "title"); - titleindex = ghb_widget_int(widget); - widget = GHB_WIDGET (builder, "audio_track"); - track = ghb_widget_int(widget); - audio = get_hb_audio(titleindex, track); + gint ii; + gchar *str; + const gchar *result = "Same as source"; - 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) + str = ghb_value_string(vrate); + for (ii = 0; ii < hb_video_rates_count; ii++) { - grey_combo_box_item(builder, "audio_codec", HB_ACODEC_AC3, TRUE); + if (strcmp(hb_video_rates[ii].string, str) == 0) + { + result = hb_video_rates[ii].string; + break; + } } - else - { - grey_combo_box_item(builder, "audio_codec", HB_ACODEC_AC3, FALSE); + 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; + } } - 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); + g_free(str); + return result; +} - widget = GHB_WIDGET (builder, "audio_codec"); - acodec = ghb_widget_int(widget); - if (acodec != HB_ACODEC_AC3) +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++) { - grey_combo_box_item(builder, "audio_mix", 0, TRUE); + if (strcmp(hb_audio_rates[ii].string, str) == 0) + { + result = hb_audio_rates[ii].string; + break; + } } - widget = GHB_WIDGET (builder, "container"); - container = ghb_widget_int(widget); - if (container == HB_MUX_MP4) + 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(ghb_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(ghb_language_table[ii].iso639_2, str) == 0) + { + if (ghb_language_table[ii].native_name[0] != 0) + result = ghb_language_table[ii].native_name; + else + result = ghb_language_table[ii].eng_name; + break; + } + } + g_free(str); + return result; +} + +static GValue* +get_acodec_value(gint val) +{ + GValue *value = NULL; + gint ii; + + for (ii = 0; ii < acodec_opts.count; ii++) + { + if ((int)acodec_opts.map[ii].ivalue == val) + { + value = ghb_string_value_new(acodec_opts.map[ii].shortOpt); + break; + } + } + return value; +} + +static GValue* +get_amix_value(gint val) +{ + GValue *value = NULL; + gint ii; + + for (ii = 0; ii < hb_audio_mixdowns_count; ii++) + { + if (hb_audio_mixdowns[ii].amixdown == val) + { + value = ghb_string_value_new(hb_audio_mixdowns[ii].short_name); + break; + } + } + return value; +} + +// Handle for libhb. Gets set by ghb_backend_init() +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]); + +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) +{ + char dir[512]; + + hb_get_tempory_directory(h_scan, dir); + del_tree(dir, !partial); +} + +gint +ghb_subtitle_track_source(signal_user_data_t *ud, gint track) +{ + gint titleindex; + + if (track == -2) + return SRTSUB; + if (track < 0) + return VOBSUB; + titleindex = ghb_settings_combo_int(ud->settings, "title"); + if (titleindex < 0) + return VOBSUB; + + hb_list_t * list; + hb_title_t * title; + hb_subtitle_t * sub; + + if (h_scan == NULL) return VOBSUB; + list = hb_get_titles( h_scan ); + if( !hb_list_count( list ) ) + { + /* No valid title, stop right there */ + return VOBSUB; + } + title = hb_list_item( list, titleindex ); + if (title == NULL) return VOBSUB; // Bad titleindex + sub = hb_list_item( title->list_subtitle, track); + if (sub != NULL) + return sub->source; + else + return VOBSUB; +} + +const char* +ghb_subtitle_track_source_name(signal_user_data_t *ud, gint track) +{ + gint titleindex; + const gchar * name = "Unknown"; + + if (track == -2) + { + name = "SRT"; + goto done; + } + if (track == -1) + { + name = "Bitmap"; + goto done; + } + + titleindex = ghb_settings_combo_int(ud->settings, "title"); + if (titleindex < 0) + goto done; + + hb_list_t * list; + hb_title_t * title; + hb_subtitle_t * sub; + + if (h_scan == NULL) + goto done; + list = hb_get_titles( h_scan ); + if( !hb_list_count( list ) ) + goto done; + + title = hb_list_item( list, titleindex ); + if (title == NULL) + goto done; + + sub = hb_list_item( title->list_subtitle, track); + if (sub != NULL) + { + switch (sub->source) + { + case VOBSUB: + name = "Bitmap"; + break; + case CC708SUB: + case CC608SUB: + name = "Text"; + break; + case SRTSUB: + name = "SRT"; + break; + default: + break; + } + } + +done: + return name; +} + +gchar* +ghb_subtitle_track_lang(signal_user_data_t *ud, gint track) +{ + gint titleindex; + + titleindex = ghb_settings_combo_int(ud->settings, "title"); + if (titleindex < 0) + goto fail; + if (track == -1) + return ghb_get_user_audio_lang(ud, titleindex, 0); + if (track < 0) + goto fail; + + hb_list_t * list; + hb_title_t * title; + hb_subtitle_t * sub; + + if (h_scan == NULL) + goto fail; + + list = hb_get_titles( h_scan ); + if( !hb_list_count( list ) ) + { + /* No valid title, stop right there */ + goto fail; + } + title = hb_list_item( list, titleindex ); + if (title == NULL) // Bad titleindex + goto fail; + sub = hb_list_item( title->list_subtitle, track); + if (sub != NULL) + return g_strdup(sub->iso639_2); + +fail: + return g_strdup("und"); +} + +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* +get_hb_audio(gint titleindex, gint track) +{ + hb_list_t * list; + hb_title_t * title; + hb_audio_config_t *audio = NULL; + + if (h_scan == NULL) return NULL; + list = hb_get_titles( h_scan ); + if( !hb_list_count( list ) ) + { + /* No valid title, stop right there */ + return NULL; + } + title = hb_list_item( list, titleindex ); + if (title == NULL) return NULL; // Bad titleindex + if (!hb_list_count(title->list_audio)) { - 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); + return NULL; } - else if (container == HB_MUX_AVI) + audio = (hb_audio_config_t *)hb_list_audio_config_item(title->list_audio, track); + return audio; +} + +static gint +search_rates(hb_rate_t *rates, gint rate, gint count) +{ + gint ii; + for (ii = 0; ii < count; ii++) { - 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); + if (rates[ii].rate == rate) + return ii; } - else if (container == HB_MUX_OGM) + return -1; +} + +static gboolean find_combo_item_by_int(GtkTreeModel *store, gint value, GtkTreeIter *iter); + +static GtkListStore* +get_combo_box_store(GtkBuilder *builder, const gchar *name) +{ + GtkComboBox *combo; + GtkListStore *store; + + g_debug("get_combo_box_store() %s\n", name); + // First modify the combobox model to allow greying out of options + combo = GTK_COMBO_BOX(GHB_WIDGET(builder, name)); + store = GTK_LIST_STORE(gtk_combo_box_get_model (combo)); + return store; +} + +static void +grey_combo_box_item(GtkBuilder *builder, const gchar *name, gint value, gboolean grey) +{ + GtkListStore *store; + GtkTreeIter iter; + + store = get_combo_box_store(builder, name); + if (find_combo_item_by_int(GTK_TREE_MODEL(store), value, &iter)) { - 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); + gtk_list_store_set(store, &iter, + 1, !grey, + -1); + } +} + +void +ghb_grey_combo_options(GtkBuilder *builder) +{ + GtkWidget *widget; + gint container, track, titleindex, acodec; + hb_audio_config_t *audio = NULL; + GValue *gval; + + widget = GHB_WIDGET (builder, "title"); + 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, "FileFormat"); + gval = ghb_widget_value(widget); + container = ghb_lookup_combo_int("FileFormat", gval); + ghb_value_free(gval); + + 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_dca = TRUE; + allow_dca = (container != HB_MUX_MP4); + + grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_AC3, FALSE); + if (allow_dca) + grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_DCA, FALSE); + else + grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_DCA, TRUE); + + if (audio && audio->in.codec != HB_ACODEC_AC3) + { + grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_AC3, TRUE); + } + if (audio && audio->in.codec != HB_ACODEC_DCA) + { + grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_DCA, TRUE); + } + grey_combo_box_item(builder, "VideoEncoder", HB_VCODEC_THEORA, FALSE); + + 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, "AudioMixdown", 0, TRUE); + } + if (container == HB_MUX_MP4) + { + 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); } gboolean allow_mono = TRUE; @@ -701,11 +1354,12 @@ ghb_grey_combo_options(GtkBuilder *builder) gboolean allow_dolby = TRUE; gboolean allow_dpl2 = TRUE; gboolean allow_6ch = TRUE; + allow_mono = acodec & ~HB_ACODEC_LAME; + allow_6ch = acodec & ~HB_ACODEC_LAME; if (audio) { - allow_mono = - (audio->in.codec & (HB_ACODEC_AC3|HB_ACODEC_DCA)) && - (acodec != HB_ACODEC_LAME); + allow_mono = allow_mono && + (audio->in.codec & (HB_ACODEC_AC3|HB_ACODEC_DCA)); gint layout = audio->in.channel_layout & HB_INPUT_CH_LAYOUT_DISCRETE_NO_LFE_MASK; allow_stereo = ((layout == HB_INPUT_CH_LAYOUT_MONO && !allow_mono) || layout >= HB_INPUT_CH_LAYOUT_STEREO); @@ -714,17 +1368,28 @@ ghb_grey_combo_options(GtkBuilder *builder) (layout == HB_INPUT_CH_LAYOUT_3F2R) || (layout == HB_INPUT_CH_LAYOUT_DOLBY); allow_dpl2 = (layout == HB_INPUT_CH_LAYOUT_3F2R); - allow_6ch = + allow_6ch = allow_6ch && (audio->in.codec & (HB_ACODEC_AC3|HB_ACODEC_DCA)) && - (acodec != HB_ACODEC_LAME) && (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 +ghb_get_best_audio_bitrate(gint acodec, gint br, gint channels) +{ + if (acodec & HB_ACODEC_FAAC) + { + int maxbr = channels * 80; + if (br > maxbr) + br = maxbr; + } + return br; } gint @@ -747,7 +1412,7 @@ ghb_get_best_mix(gint titleindex, gint track, gint acodec, gint mix) { allow_mono = (audio->in.codec & (HB_ACODEC_AC3|HB_ACODEC_DCA)) && - (acodec != HB_ACODEC_LAME); + (acodec & ~HB_ACODEC_LAME); gint layout = audio->in.channel_layout & HB_INPUT_CH_LAYOUT_DISCRETE_NO_LFE_MASK; allow_stereo = ((layout == HB_INPUT_CH_LAYOUT_MONO && !allow_mono) || layout >= HB_INPUT_CH_LAYOUT_STEREO); @@ -758,7 +1423,7 @@ ghb_get_best_mix(gint titleindex, gint track, gint acodec, gint mix) allow_dpl2 = (layout == HB_INPUT_CH_LAYOUT_3F2R); allow_6ch = (audio->in.codec & (HB_ACODEC_AC3|HB_ACODEC_DCA)) && - (acodec != HB_ACODEC_LAME) && + (acodec & ~HB_ACODEC_LAME) && (layout == HB_INPUT_CH_LAYOUT_3F2R) && (audio->in.channel_layout & HB_INPUT_CH_LAYOUT_HAS_LFE); } @@ -811,6 +1476,8 @@ init_combo_box(GtkBuilder *builder, const gchar *name) g_debug("init_combo_box() %s\n", name); // First modify the combobox model to allow greying out of options combo = GTK_COMBO_BOX(GHB_WIDGET(builder, name)); + if (combo == NULL) + return; // Store contains: // 1 - String to display // 2 - bool indicating whether the entry is selectable (grey or not) @@ -818,68 +1485,22 @@ init_combo_box(GtkBuilder *builder, const gchar *name) // 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); + G_TYPE_STRING, G_TYPE_DOUBLE, 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, + "markup", 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) @@ -887,6 +1508,7 @@ audio_samplerate_opts_set(GtkBuilder *builder, const gchar *name, hb_rate_t *rat GtkTreeIter iter; GtkListStore *store; gint ii; + gchar *str; g_debug("audio_samplerate_opts_set ()\n"); store = get_combo_box_store(builder, name); @@ -894,22 +1516,24 @@ audio_samplerate_opts_set(GtkBuilder *builder, const gchar *name, hb_rate_t *rat // Add an item for "Same As Source" gtk_list_store_append(store, &iter); gtk_list_store_set(store, &iter, - 0, "Same as source", + 0, "Same as source", 1, TRUE, 2, "source", - 3, 0, + 3, 0.0, 4, "source", -1); for (ii = 0; ii < count; ii++) { gtk_list_store_append(store, &iter); + str = g_strdup_printf("%s", rates[ii].string); gtk_list_store_set(store, &iter, - 0, rates[ii].string, + 0, str, 1, TRUE, 2, rates[ii].string, - 3, rates[ii].rate, + 3, (gdouble)rates[ii].rate, 4, rates[ii].string, -1); + g_free(str); } } @@ -929,7 +1553,7 @@ video_rate_opts_set(GtkBuilder *builder, const gchar *name, hb_rate_t *rates, gi 0, "Same as source", 1, TRUE, 2, "source", - 3, 0, + 3, 0.0, 4, "source", -1); for (ii = 0; ii < count; ii++) @@ -954,7 +1578,7 @@ video_rate_opts_set(GtkBuilder *builder, const gchar *name, hb_rate_t *rates, gi 0, option, 1, TRUE, 2, rates[ii].string, - 3, rates[ii].rate, + 3, (gdouble)rates[ii].rate, 4, rates[ii].string, -1); g_free(option); @@ -967,73 +1591,127 @@ mix_opts_set(GtkBuilder *builder, const gchar *name) GtkTreeIter iter; GtkListStore *store; gint ii; + gchar *str; - 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); gtk_list_store_set(store, &iter, - 0, "None", + 0, "None", 1, TRUE, 2, "none", - 3, 0, + 3, 0.0, 4, "none", -1); for (ii = 0; ii < hb_audio_mixdowns_count; ii++) { gtk_list_store_append(store, &iter); + str = g_strdup_printf("%s", + hb_audio_mixdowns[ii].human_readable_name); gtk_list_store_set(store, &iter, - 0, hb_audio_mixdowns[ii].human_readable_name, + 0, str, 1, TRUE, 2, hb_audio_mixdowns[ii].short_name, - 3, hb_audio_mixdowns[ii].amixdown, + 3, (gdouble)hb_audio_mixdowns[ii].amixdown, 4, hb_audio_mixdowns[ii].internal_name, -1); + g_free(str); } } static void +srt_codeset_opts_set(GtkBuilder *builder, const gchar *name) +{ + GtkTreeIter iter; + GtkListStore *store; + gint ii; + + g_debug("srt_codeset_opts_set ()\n"); + store = get_combo_box_store(builder, name); + gtk_list_store_clear(store); + for (ii = 0; ii < SRT_TABLE_SIZE; ii++) + { + gtk_list_store_append(store, &iter); + gtk_list_store_set(store, &iter, + 0, srt_codeset_table[ii], + 1, TRUE, + 2, srt_codeset_table[ii], + 3, (gdouble)ii, + 4, srt_codeset_table[ii], + -1); + } + GtkComboBoxEntry *cbe; + + cbe = GTK_COMBO_BOX_ENTRY(GHB_WIDGET(builder, name)); + //gtk_combo_box_entry_set_text_column(cbe, 0); +} + +static void language_opts_set(GtkBuilder *builder, const gchar *name) { GtkTreeIter 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++) { + const gchar *lang; + + if (ghb_language_table[ii].native_name[0] != 0) + lang = ghb_language_table[ii].native_name; + else + lang = ghb_language_table[ii].eng_name; + gtk_list_store_append(store, &iter); gtk_list_store_set(store, &iter, - 0, language_table[ii].eng_name, + 0, lang, 1, TRUE, - 2, language_table[ii].iso639_2, - 3, ii, - 4, language_table[ii].iso639_1, + 2, ghb_language_table[ii].iso639_2, + 3, (gdouble)ii, + 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; 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. @@ -1042,209 +1720,236 @@ title_opts_set(GtkBuilder *builder, const gchar *name) 0, "No Titles", 1, TRUE, 2, "none", - 3, -1, + 3, -1.0, 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); - gtk_list_store_append(store, &iter); - gtk_list_store_set(store, &iter, - 0, option, - 1, TRUE, - 2, option, - 3, ii, - 4, option, - -1); - } -} - -static gboolean -find_combo_item_by_int(GtkTreeModel *store, gint value, GtkTreeIter *iter) -{ - gint ivalue; - gboolean foundit = FALSE; - - if (gtk_tree_model_get_iter_first (store, iter)) - { - do - { - gtk_tree_model_get(store, iter, 3, &ivalue, -1); - if (value == ivalue) - { - foundit = TRUE; - break; - } - } while (gtk_tree_model_iter_next (store, 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)) + } + for (ii = 0; ii < count; ii++) { - str = g_strdup_printf ("%.8g", (gdouble)rate/1000.0); + title = (hb_title_t*)hb_list_item(list, ii); + 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, str, + 0, titles[ii], 1, TRUE, - 2, str, - 3, rate, - 4, str, + 2, titles[ii], + 3, (gdouble)ii, + 4, titles[ii], -1); - return TRUE; + 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]; } - return FALSE; + titles[ii] = NULL; } -#if 0 static gboolean -audio_rate_opts_remove(GtkBuilder *builder, const gchar *name, gint rate) +find_combo_item_by_int(GtkTreeModel *store, gint value, GtkTreeIter *iter) { - GtkTreeIter iter; - GtkListStore *store; + gdouble ivalue; + gboolean foundit = FALSE; - 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)) + if (gtk_tree_model_get_iter_first (store, iter)) { - gtk_list_store_remove (store, &iter); - return TRUE; + do + { + gtk_tree_model_get(store, iter, 3, &ivalue, -1); + if (value == (int)ivalue) + { + foundit = TRUE; + break; + } + } while (gtk_tree_model_iter_next (store, iter)); } - return FALSE; + return foundit; } -#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; + gchar *str; 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) { count = hb_list_count( title->list_audio ); } } - if (count > 10) count = 10; + if (count > 100) count = 100; + 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 gtk_list_store_append(store, &iter); gtk_list_store_set(store, &iter, - 0, "No Audio", + 0, "No Audio", 1, TRUE, 2, "none", - 3, -1, + 3, -1.0, 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; } + index_str_init(count-1); for (ii = 0; ii < count; ii++) { audio = (hb_audio_config_t *) hb_list_audio_config_item( title->list_audio, ii ); gtk_list_store_append(store, &iter); + str = g_strdup_printf("%s", audio->lang.description); gtk_list_store_set(store, &iter, - 0, audio->lang.description, + 0, str, 1, TRUE, - 2, audio->lang.description, - 3, ii, - 4, audio->lang.description, + 2, index_str[ii], + 3, (gdouble)ii, + 4, index_str[ii], -1); + g_free(str); + 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) +subtitle_track_opts_set(GtkBuilder *builder, const gchar *name, gint titleindex) { GtkTreeIter iter; GtkListStore *store; - hb_list_t * list; - hb_title_t * title; - hb_subtitle_t * subtitle; - gint ii; - gint count = 0; + hb_list_t * list = NULL; + hb_title_t * title = NULL; + hb_subtitle_t * subtitle; + gint ii, count = 0; + static char ** options = NULL; - g_debug("subtitle_opts_set ()\n"); + g_debug("subtitle_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) { count = hb_list_count( title->list_subtitle ); } } - if (count > 10) count = 10; - // Add options for "none" and "autoselect" - gtk_list_store_append(store, &iter); - gtk_list_store_set(store, &iter, - 0, "None", - 1, TRUE, - 2, "none", - 3, -2, - 4, "none", - -1); + if (count > 100) count = 100; + if (subtitle_opts.map) g_free(subtitle_opts.map); + if (count > 0) + { + subtitle_opts.count = count+1; + subtitle_opts.map = g_malloc((count+1)*sizeof(options_map_t)); + } + else + { + subtitle_opts.count = LANG_TABLE_SIZE+1; + subtitle_opts.map = g_malloc((LANG_TABLE_SIZE+1)*sizeof(options_map_t)); + } gtk_list_store_append(store, &iter); gtk_list_store_set(store, &iter, - 0, "Same As Audio", + 0, "Foreign Audio Search", 1, TRUE, - 2, "auto", - 3, -1, + 2, "-1", + 3, -1.0, 4, "auto", -1); - for (ii = 0; ii < count; ii++) + subtitle_opts.map[0].option = "Foreign Audio Search"; + subtitle_opts.map[0].shortOpt = "-1"; + 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); + if (options != NULL) + g_strfreev(options); + options = g_malloc((count+1)*sizeof(gchar*)); + index_str_init(count-1); + for (ii = 0; ii < count; ii++) + { + subtitle = (hb_subtitle_t *)hb_list_item(title->list_subtitle, ii); + // Skip subtitles that must be burned if there is already + // a burned subtitle in the list + options[ii] = g_strdup_printf("%d - %s", ii+1, subtitle->lang); + subtitle_opts.map[ii+1].option = options[ii]; + subtitle_opts.map[ii+1].shortOpt = index_str[ii]; + subtitle_opts.map[ii+1].ivalue = ii; + subtitle_opts.map[ii+1].svalue = subtitle->iso639_2; + gtk_list_store_append(store, &iter); + gtk_list_store_set(store, &iter, + 0, options[ii], + 1, TRUE, + 2, index_str[ii], + 3, (gdouble)ii, + 4, subtitle->iso639_2, + -1); + } + options[count] = NULL; } - if (titleindex == -1) + else { + index_str_init(LANG_TABLE_SIZE-1); for (ii = 0; ii < LANG_TABLE_SIZE; ii++) { + const gchar *lang; + + if (ghb_language_table[ii].native_name[0] != 0) + lang = ghb_language_table[ii].native_name; + else + lang = ghb_language_table[ii].eng_name; + + subtitle_opts.map[ii+1].option = lang; + subtitle_opts.map[ii+1].shortOpt = index_str[ii]; + subtitle_opts.map[ii+1].ivalue = ii; + subtitle_opts.map[ii+1].svalue = ghb_language_table[ii].iso639_2; gtk_list_store_append(store, &iter); gtk_list_store_set(store, &iter, - 0, language_table[ii].eng_name, - 1, TRUE, - 2, language_table[ii].iso639_2, - 3, ii, - 4, language_table[ii].iso639_2, - -1); + 0, lang, + 1, TRUE, + 2, index_str[ii], + 3, (gdouble)ii, + 4, ghb_language_table[ii].iso639_2, + -1); } } } @@ -1260,8 +1965,8 @@ ghb_longest_title() 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++) @@ -1276,82 +1981,478 @@ ghb_longest_title() return titleindex; } +gchar* +ghb_get_source_audio_lang(gint titleindex, gint track) +{ + hb_list_t * list; + hb_title_t * title; + hb_audio_config_t * audio; + gchar *lang = NULL; + + g_debug("ghb_lookup_1st_audio_lang ()\n"); + 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; + if (hb_list_count( title->list_audio ) <= track) + return NULL; + + audio = hb_list_audio_config_item(title->list_audio, track); + if (audio == NULL) + return NULL; + + lang = g_strdup(audio->lang.iso639_2); + return lang; +} + gint -ghb_find_audio_track(gint titleindex, const gchar *lang, gint acodec) +ghb_find_audio_track( + gint titleindex, + const gchar *lang, + gint acodec, + GHashTable *track_indices) { 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 max_chan = 0; + gboolean *used; g_debug("find_audio_track ()\n"); - if (h != NULL) + if (h_scan == NULL) return -1; + list = hb_get_titles( h_scan ); + title = (hb_title_t*)hb_list_item( list, titleindex ); + if (title != NULL) { - list = hb_get_titles( h ); - title = (hb_title_t*)hb_list_item( list, titleindex ); - if (title != NULL) + count = hb_list_count( title->list_audio ); + } + if (count > 10) count = 10; + used = g_hash_table_lookup(track_indices, &acodec); + if (used == NULL) + { + used = g_malloc0(count * sizeof(gboolean)); + g_hash_table_insert(track_indices, &acodec, used); + } + // Try to find an item that matches the preferred language and + // the passthru codec type + if (acodec & (HB_ACODEC_AC3 | HB_ACODEC_DCA)) + { + for (ii = 0; ii < count; ii++) { - count = hb_list_count( title->list_audio ); + gint channels; + + if (used[ii]) + continue; + + audio = (hb_audio_config_t*)hb_list_audio_config_item( + title->list_audio, ii ); + channels = HB_INPUT_CH_LAYOUT_GET_DISCRETE_COUNT( + audio->in.channel_layout); + // Find a track that is not visually impaired or dirctor's + // commentary, and has the highest channel count. + if ((audio->in.codec & acodec) && + (audio->lang.type < 2) && + ((strcmp(lang, audio->lang.iso639_2) == 0) || + (strcmp(lang, "und") == 0))) + { + if (channels > max_chan) + { + track = ii; + max_chan = channels; + } + } } } - if (count > 10) count = 10; + if (track > -1) + { + used[track] = TRUE; + return track; + } + // Try to find an item that matches the preferred language + for (ii = 0; ii < count; ii++) + { + if (used[ii]) + continue; + audio = (hb_audio_config_t*)hb_list_audio_config_item( + title->list_audio, ii ); + // Find a track that is not visually impaired or dirctor's commentary + if ((audio->lang.type < 2) && + ((strcmp(lang, audio->lang.iso639_2) == 0) || + (strcmp(lang, "und") == 0))) + { + track = ii; + break; + } + } + if (track > -1) + { + used[track] = TRUE; + return track; + } + // Try to fine an item that does not match the preferred language and + // matches the passthru codec type + if (acodec & (HB_ACODEC_AC3 | HB_ACODEC_DCA)) + { + for (ii = 0; ii < count; ii++) + { + gint channels; + + if (used[ii]) + continue; + + audio = (hb_audio_config_t*)hb_list_audio_config_item( + title->list_audio, ii ); + channels = HB_INPUT_CH_LAYOUT_GET_DISCRETE_COUNT( + audio->in.channel_layout); + // Find a track that is not visually impaired or dirctor's + // commentary, and has the highest channel count. + if ((audio->in.codec & acodec) && + (audio->lang.type < 2)) + { + if (channels > max_chan) + { + track = ii; + max_chan = channels; + } + } + } + } + if (track > -1) + { + used[track] = TRUE; + return track; + } + // Try to fine an item that does not match the preferred language + for (ii = 0; ii < count; ii++) + { + if (used[ii]) + continue; + audio = (hb_audio_config_t*)hb_list_audio_config_item( + title->list_audio, ii ); + // Find a track that is not visually impaired or dirctor's commentary + if (audio->lang.type < 2) + { + track = ii; + break; + } + } + if (track > -1) + { + used[track] = TRUE; + return track; + } + // Last ditch, anything goes for (ii = 0; ii < count; ii++) { - audio = (hb_audio_config_t*)hb_list_audio_config_item( title->list_audio, ii ); - if ((strcmp(lang, audio->lang.iso639_2) == 0) || - (strcmp(lang, "und") == 0)) + audio = (hb_audio_config_t*)hb_list_audio_config_item( + title->list_audio, ii ); + if (!used[ii]) { - // Candidate track. Will use if no better match found track = ii; - if (audio->in.codec == acodec) + break; + } + } + if (track > -1) + { + used[track] = TRUE; + } + return track; +} + +gint +ghb_find_pref_subtitle_track(const gchar *lang) +{ + gint ii, count; + count = subtitle_opts.count; + for (ii = 0; ii < count; ii++) + { + if (strcmp(lang, subtitle_opts.map[ii].svalue) == 0) + { + return subtitle_opts.map[ii].ivalue; + } + } + return -2; +} + +gint +ghb_find_cc_track(gint titleindex) +{ + hb_list_t * list; + hb_title_t * title; + hb_subtitle_t * subtitle; + gint count, ii; + + g_debug("ghb_find_cc_track ()\n"); + if (h_scan == NULL) return -2; + list = hb_get_titles( h_scan ); + title = (hb_title_t*)hb_list_item( list, titleindex ); + if (title != NULL) + { + count = hb_list_count( title->list_subtitle ); + // Try to find an item that matches the preferred language + for (ii = 0; ii < count; ii++) + { + subtitle = (hb_subtitle_t*)hb_list_item( title->list_subtitle, ii ); + if (subtitle->source == CC608SUB || subtitle->source == CC708SUB) + return ii; + } + } + return -2; +} + +gint +ghb_find_subtitle_track( + gint titleindex, + const gchar * lang, + gboolean burn, + gboolean force, + gint source, + GHashTable * track_indices) +{ + hb_list_t * list; + hb_title_t * title; + hb_subtitle_t * subtitle; + gint count, ii; + gboolean *used; + + g_debug("find_subtitle_track ()\n"); + if (strcmp(lang, "auto") == 0) + return -1; + if (h_scan == NULL) return -1; + list = hb_get_titles( h_scan ); + title = (hb_title_t*)hb_list_item( list, titleindex ); + if (title != NULL) + { + count = hb_list_count( title->list_subtitle ); + used = g_hash_table_lookup(track_indices, lang); + if (used == NULL) + { + used = g_malloc0(count * sizeof(gboolean)); + g_hash_table_insert(track_indices, g_strdup(lang), used); + } + // Try to find an item that matches the preferred language and source + for (ii = 0; ii < count; ii++) + { + if (used[ii]) + continue; + + subtitle = (hb_subtitle_t*)hb_list_item( title->list_subtitle, ii ); + if (source == subtitle->source && + ((strcmp(lang, subtitle->iso639_2) == 0) || + (strcmp(lang, "und") == 0))) + { + used[ii] = TRUE; + return ii; + } + } + // Try to find an item that matches the preferred language + for (ii = 0; ii < count; ii++) + { + if (used[ii]) + continue; + + subtitle = (hb_subtitle_t*)hb_list_item( title->list_subtitle, ii ); + if (((burn || force) && (subtitle->source == VOBSUB)) && + ((strcmp(lang, subtitle->iso639_2) == 0) || + (strcmp(lang, "und") == 0))) { - // Perfect match - return track; + used[ii] = TRUE; + return ii; } } } - return track; + return -2; +} + +static void +generic_opts_set(GtkBuilder *builder, const gchar *name, combo_opts_t *opts) +{ + GtkTreeIter iter; + GtkListStore *store; + 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++) + { + gtk_list_store_append(store, &iter); + gtk_list_store_set(store, &iter, + 0, opts->map[ii].option, + 1, TRUE, + 2, opts->map[ii].shortOpt, + 3, opts->map[ii].ivalue, + 4, opts->map[ii].svalue, + -1); + } +} + +static void +small_opts_set(GtkBuilder *builder, const gchar *name, combo_opts_t *opts) +{ + GtkTreeIter iter; + GtkListStore *store; + gint ii; + gchar *str; + + 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++) + { + gtk_list_store_append(store, &iter); + str = g_strdup_printf("%s", opts->map[ii].option); + gtk_list_store_set(store, &iter, + 0, str, + 1, TRUE, + 2, opts->map[ii].shortOpt, + 3, opts->map[ii].ivalue, + 4, opts->map[ii].svalue, + -1); + g_free(str); + } +} + +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 (gval == NULL) + return 0; + 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, "SrtLanguage") == 0) + return lookup_audio_lang_int(gval); + else if (strcmp(name, "PreferredLanguage") == 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; +} + +gdouble +ghb_lookup_combo_double(const gchar *name, const GValue *gval) +{ + if (gval == NULL) + return 0; + 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, "SrtLanguage") == 0) + return lookup_audio_lang_int(gval); + else if (strcmp(name, "PreferredLanguage") == 0) + return lookup_audio_lang_int(gval); + else + { + return lookup_generic_double(find_combo_table(name), gval); + } + g_warning("ghb_lookup_combo_double() couldn't find %s", name); + return 0; +} + +const gchar* +ghb_lookup_combo_option(const gchar *name, const GValue *gval) +{ + if (gval == NULL) + return NULL; + 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, "SrtLanguage") == 0) + return lookup_audio_lang_option(gval); + else if (strcmp(name, "PreferredLanguage") == 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 NULL; } -static void -generic_opts_set(GtkBuilder *builder, const gchar *name, combo_opts_t *opts) +const gchar* +ghb_lookup_combo_string(const gchar *name, const GValue *gval) { - GtkTreeIter iter; - GtkListStore *store; - gint ii; - - g_debug("generic_opts_set ()\n"); - store = get_combo_box_store(builder, name); - gtk_list_store_clear(store); - for (ii = 0; ii < opts->count; ii++) + if (gval == NULL) + return NULL; + 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, "SrtLanguage") == 0) + return lookup_audio_lang_option(gval); + else if (strcmp(name, "PreferredLanguage") == 0) + return lookup_audio_lang_option(gval); + else { - gtk_list_store_append(store, &iter); - gtk_list_store_set(store, &iter, - 0, opts->map[ii].option, - 1, TRUE, - 2, opts->map[ii].shortOpt, - 3, opts->map[ii].ivalue, - 4, opts->map[ii].svalue, - -1); + return lookup_generic_string(find_combo_table(name), gval); } + g_warning("ghb_lookup_combo_int() couldn't find %s", name); + return NULL; } void -ghb_update_ui_combo_box(GtkBuilder *builder, const gchar *name, gint user_data, gboolean all) +ghb_update_ui_combo_box( + signal_user_data_t *ud, + const gchar *name, + gint user_data, + gboolean all) { GtkComboBox *combo = NULL; gint signal_id; gint handler_id = 0; - g_debug("ghb_update_ui_combo_box() %s\n", name); if (name != NULL) { + g_debug("ghb_update_ui_combo_box() %s\n", name); // Clearing a combo box causes a rash of "changed" events, even when // the active item is -1 (inactive). To control things, I'm disabling // the event till things are settled down. - combo = GTK_COMBO_BOX(GHB_WIDGET(builder, name)); + combo = GTK_COMBO_BOX(GHB_WIDGET(ud->builder, name)); signal_id = g_signal_lookup("changed", GTK_TYPE_COMBO_BOX); if (signal_id > 0) { @@ -1365,60 +2466,64 @@ 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, "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) - 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) - 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, "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, "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); + if (all) + { + audio_bitrate_opts_set(ud->builder, "AudioBitrate"); + audio_samplerate_opts_set(ud->builder, "AudioSamplerate", hb_audio_rates, hb_audio_rates_count); + video_rate_opts_set(ud->builder, "VideoFramerate", hb_video_rates, hb_video_rates_count); + mix_opts_set(ud->builder, "AudioMixdown"); + language_opts_set(ud->builder, "SrtLanguage"); + language_opts_set(ud->builder, "PreferredLanguage"); + srt_codeset_opts_set(ud->builder, "SrtCodeset"); + title_opts_set(ud->builder, "title"); + audio_track_opts_set(ud->builder, "AudioTrack", user_data); + subtitle_track_opts_set(ud->builder, "SubtitleTrack", user_data); + generic_opts_set(ud->builder, "VideoQualityGranularity", &vqual_granularity_opts); + generic_opts_set(ud->builder, "WhenComplete", &when_complete_opts); + generic_opts_set(ud->builder, "PicturePAR", &par_opts); + generic_opts_set(ud->builder, "PictureModulus", &alignment_opts); + generic_opts_set(ud->builder, "LoggingLevel", &logging_opts); + generic_opts_set(ud->builder, "LogLongevity", &log_longevity_opts); + generic_opts_set(ud->builder, "check_updates", &appcast_update_opts); + generic_opts_set(ud->builder, "FileFormat", &container_opts); + generic_opts_set(ud->builder, "PictureDeinterlace", &deint_opts); + generic_opts_set(ud->builder, "PictureDetelecine", &detel_opts); + generic_opts_set(ud->builder, "PictureDecomb", &decomb_opts); + generic_opts_set(ud->builder, "PictureDenoise", &denoise_opts); + generic_opts_set(ud->builder, "VideoEncoder", &vcodec_opts); + small_opts_set(ud->builder, "AudioEncoder", &acodec_opts); + generic_opts_set(ud->builder, "x264_direct", &direct_opts); + generic_opts_set(ud->builder, "x264_b_adapt", &badapt_opts); + generic_opts_set(ud->builder, "x264_me", &me_opts); + generic_opts_set(ud->builder, "x264_subme", &subme_opts); + generic_opts_set(ud->builder, "x264_analyse", &analyse_opts); + generic_opts_set(ud->builder, "x264_trellis", &trellis_opts); + } + else + { + if (strcmp(name, "AudioBitrate") == 0) + audio_bitrate_opts_set(ud->builder, "AudioBitrate"); + else if (strcmp(name, "AudioSamplerate") == 0) + audio_samplerate_opts_set(ud->builder, "AudioSamplerate", hb_audio_rates, hb_audio_rates_count); + else if (strcmp(name, "VideoFramerate") == 0) + video_rate_opts_set(ud->builder, "VideoFramerate", hb_video_rates, hb_video_rates_count); + else if (strcmp(name, "AudioMixdown") == 0) + mix_opts_set(ud->builder, "AudioMixdown"); + else if (strcmp(name, "SrtLanguage") == 0) + language_opts_set(ud->builder, "SrtLanguage"); + else if (strcmp(name, "PreferredLanguage") == 0) + language_opts_set(ud->builder, "PreferredLanguage"); + else if (strcmp(name, "SrtCodeset") == 0) + srt_codeset_opts_set(ud->builder, "SrtCodeset"); + else if (strcmp(name, "title") == 0) + title_opts_set(ud->builder, "title"); + else if (strcmp(name, "SubtitleTrack") == 0) + subtitle_track_opts_set(ud->builder, "SubtitleTrack", user_data); + else if (strcmp(name, "AudioTrack") == 0) + audio_track_opts_set(ud->builder, "AudioTrack", user_data); + else + generic_opts_set(ud->builder, name, find_combo_table(name)); + } if (handler_id > 0) { g_signal_handler_unblock ((gpointer)combo, handler_id); @@ -1428,320 +2533,476 @@ 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, "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, "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, "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, "SrtLanguage"); + init_combo_box(builder, "PreferredLanguage"); + init_combo_box(builder, "SrtCodeset"); 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"); + 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 = "ref=1:subme=1:me=dia:analyse=none:trellis=0:" - "no-fast-pskip=0:8x8dct=0:weightb=0"; + "no-fast-pskip=0:8x8dct=0"; // 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 - { - g_string_append_printf(x264opts, "subme=%d:", subme); - } - gint bframes = ghb_settings_get_int(settings, "x264_bframes"); - if (bframes > 0) - { - 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:"); - } - } - if (bframes > 1) - { - if (ghb_settings_get_bool(settings, "x264_bpyramid")) - { - g_string_append(x264opts, "b-pyramid=1:"); - } - } - 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")) + gchar *result; + gchar *opts = ghb_settings_get_string(settings, "x264Option"); + if (opts != NULL) { - g_string_append(x264opts, "cabac=0:"); + result = opts; } else { - gint trellis = ghb_settings_get_int(settings, "x264_trellis"); - if (trellis != 0); // != None - { - g_string_append_printf(x264opts, "trellis=%d:", trellis); - } - } - 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 - { - g_string_append_printf(x264opts, "analyse=%s:", - ghb_settings_get_string(settings, "x264_analyse")); - } - if (analyse != 1) // != none - { - 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")); - } - } - 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) - { - g_string_append_printf(x264opts, "%s:", opts); + result = g_strdup(""); } - // 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 ** +void +ghb_get_chapter_duration(gint ti, gint ii, gint *hh, gint *mm, gint *ss) +{ + hb_list_t * list; + hb_title_t * title; + hb_chapter_t * chapter; + gint count; + + g_debug("ghb_get_chapter_duration (title = %d)\n", ti); + *hh = *mm = *ss = 0; + if (h_scan == NULL) return; + list = hb_get_titles( h_scan ); + title = (hb_title_t*)hb_list_item( list, ti ); + if (title == NULL) return; + count = hb_list_count( title->list_chapter ); + if (ii >= count) return; + chapter = hb_list_item(title->list_chapter, ii); + if (chapter == NULL) return; + *hh = chapter->hours; + *mm = chapter->minutes; + *ss = chapter->seconds; +} + +GValue* ghb_get_chapters(gint titleindex) { hb_list_t * list; hb_title_t * title; hb_chapter_t * chapter; gint count, ii; - gchar **result = NULL; + GValue *chapters = NULL; g_debug("ghb_get_chapters (title = %d)\n", titleindex); - if (h == NULL) return NULL; - list = hb_get_titles( h ); + 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 ); - result = g_malloc((count+1) * sizeof(gchar*)); + chapters = ghb_array_value_new(count); for (ii = 0; ii < 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); + { + gchar *str; + str = g_strdup_printf ("Chapter %2d", ii+1); + ghb_array_append(chapters, ghb_string_value_new(str)); + g_free(str); + } else - result[ii] = g_strdup(chapter->title); + { + ghb_array_append(chapters, ghb_string_value_new(chapter->title)); + } } - result[ii] = NULL; - return result; + return chapters; } gboolean -ghb_set_passthru_rate_opts(GtkBuilder *builder, gint bitrate) +ghb_ac3_in_audio_list(const GValue *audio_list) +{ + gint count, ii; + + count = ghb_array_len(audio_list); + for (ii = 0; ii < count; ii++) + { + GValue *asettings; + gint acodec; + + asettings = ghb_array_get_nth(audio_list, ii); + acodec = ghb_settings_combo_int(asettings, "AudioEncoder"); + if (acodec & HB_ACODEC_AC3) + return TRUE; + } + return FALSE; +} + +static void +audio_bitrate_opts_add(GtkBuilder *builder, const gchar *name, gint rate) { - gboolean changed = FALSE; - changed = audio_rate_opts_add(builder, "audio_bitrate", bitrate); - return changed; + GtkTreeIter iter; + GtkListStore *store; + gchar *str; + + g_debug("audio_bitrate_opts_add ()\n"); + + if (rate < 8) return; + + 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, (gdouble)rate, + 4, str, + -1); + g_free(str); + } } -gboolean -ghb_set_default_rate_opts(GtkBuilder *builder) +static void +audio_bitrate_opts_clean( + GtkBuilder *builder, + const gchar *name, + gint first_rate, + gint last_rate) +{ + GtkTreeIter iter; + GtkListStore *store; + gdouble ivalue; + gboolean done = FALSE; + gint ii = 0; + guint last = (guint)last_rate; + guint first = (guint)first_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 < first || 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); + } +} + +static void +audio_bitrate_opts_set(GtkBuilder *builder, const gchar *name) +{ + GtkTreeIter iter; + GtkListStore *store; + gint ii; + gchar *str; + + 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); + str = g_strdup_printf ("%s", + hb_audio_bitrates[ii].string); + gtk_list_store_set(store, &iter, + 0, str, + 1, TRUE, + 2, hb_audio_bitrates[ii].string, + 3, (gdouble)hb_audio_bitrates[ii].rate, + 4, hb_audio_bitrates[ii].string, + -1); + g_free(str); + } +} + +void +ghb_set_passthru_bitrate_opts(GtkBuilder *builder, gint bitrate) { - gboolean changed = FALSE; - changed = audio_bitrate_opts_clean(builder, "audio_bitrate", hb_audio_bitrates, hb_audio_bitrates_count); - return changed; + audio_bitrate_opts_add(builder, "AudioBitrate", bitrate); } void -ghb_backend_init(GtkBuilder *builder, gint debug, gint update) +ghb_set_default_bitrate_opts( + GtkBuilder *builder, + gint first_rate, + gint last_rate) +{ + audio_bitrate_opts_clean(builder, "AudioBitrate", first_rate, last_rate); +} + +static ghb_status_t hb_status; + +void +ghb_combo_init(signal_user_data_t *ud) { - /* Init libhb */ - h = hb_init( debug, update ); // Set up the list model for the combos - init_ui_combo_boxes(builder); + init_ui_combo_boxes(ud->builder); // Populate all the combos - ghb_update_ui_combo_box(builder, NULL, 0, TRUE); + ghb_update_ui_combo_box(ud, NULL, 0, TRUE); +} + +void +ghb_backend_init(gint debug) +{ + /* Init libhb */ + h_scan = hb_init( debug, 0 ); + h_queue = hb_init( debug, 0 ); } void -ghb_backend_scan(const gchar *path, gint titleindex) +ghb_backend_close() { - hb_scan( h, path, titleindex ); + hb_close(&h_queue); + hb_close(&h_scan); } -gint -ghb_backend_events(signal_user_data_t *ud, gint *unique_id) +void +ghb_backend_scan(const gchar *path, gint titleindex, gint preview_count) { - 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")); - switch( s.state ) - { - case HB_STATE_IDLE: - /* Nothing to do */ - //fprintf( stderr, "HB Idle\n"); - break; + 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.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, 10, 0 ); + hb_status.queue.state |= GHB_STATE_SCANNING; +} + +gint +ghb_get_scan_state() +{ + return hb_status.scan.state; +} + +gint +ghb_get_queue_state() +{ + return hb_status.queue.state; +} + +void +ghb_clear_scan_state(gint state) +{ + hb_status.scan.state &= ~state; +} + +void +ghb_clear_queue_state(gint state) +{ + hb_status.queue.state &= ~state; +} + +void +ghb_set_scan_state(gint state) +{ + hb_status.scan.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_scan; + hb_state_t s_queue; -#define p s.param.scanning + if (h_scan == NULL) return; + hb_get_state( h_scan, &s_scan ); + switch( s_scan.state ) + { +#define p s_scan.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.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: { - 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.scan.state &= ~GHB_STATE_SCANNING; + hb_status.scan.state |= GHB_STATE_SCANDONE; + } break; -#define p s.param.working +#define p s_scan.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 + 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) { - status= g_strdup_printf("Encoding: task %d of %d, %.2f %%", - p.job_cur, p.job_count, 100.0 * p.progress ); + 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; } - gtk_progress_bar_set_text (progress, status); - gtk_progress_bar_set_fraction (progress, p.progress); - g_free(status); - return GHB_EVENT_WORKING; + // 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.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; + } 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.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: - 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.queue.error = GHB_ERROR_NONE; + break; + case HB_ERROR_CANCELED: + hb_status.queue.error = GHB_ERROR_CANCELED; + break; + default: + hb_status.queue.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, 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."); - } - 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 @@ -1750,8 +3011,8 @@ ghb_get_title_info(ghb_title_info_t *tinfo, gint titleindex) 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 */ @@ -1777,6 +3038,9 @@ ghb_get_title_info(ghb_title_info_t *tinfo, gint titleindex) tinfo->hours = title->hours; tinfo->minutes = title->minutes; tinfo->seconds = title->seconds; + tinfo->duration = title->duration; + + tinfo->angle_count = title->angle_count; return TRUE; } @@ -1797,8 +3061,7 @@ gboolean ghb_audio_is_passthru(gint acodec) { g_debug("ghb_audio_is_passthru () \n"); - g_debug("acodec %d\n", acodec); - return (acodec == HB_ACODEC_AC3); + return (acodec & (HB_ACODEC_AC3 | HB_ACODEC_DCA)); } gint @@ -1807,109 +3070,193 @@ ghb_get_default_acodec() return HB_ACODEC_FAAC; } +static void +picture_settings_deps(signal_user_data_t *ud) +{ + gboolean autoscale, keep_aspect, enable_keep_aspect; + gboolean enable_scale_width, enable_scale_height; + gboolean enable_disp_width, enable_disp_height, enable_par; + gint pic_par; + GtkWidget *widget; + + pic_par = ghb_settings_combo_int(ud->settings, "PicturePAR"); + if (pic_par == 1) + { + ghb_ui_update(ud, "autoscale", ghb_boolean_value(TRUE)); + ghb_ui_update(ud, "PictureModulus", ghb_int_value(2)); + ghb_ui_update(ud, "PictureLooseCrop", ghb_boolean_value(TRUE)); + } + enable_keep_aspect = (pic_par != 1 && pic_par != 2); + if (!enable_keep_aspect) + { + ghb_ui_update(ud, "PictureKeepRatio", ghb_boolean_value(TRUE)); + } + keep_aspect = ghb_settings_get_boolean(ud->settings, "PictureKeepRatio"); + autoscale = ghb_settings_get_boolean(ud->settings, "autoscale"); + + enable_scale_width = !autoscale && (pic_par != 1); + enable_scale_height = !autoscale && (pic_par != 1); + enable_disp_width = (pic_par == 3) && !keep_aspect; + enable_par = (pic_par == 3) && !keep_aspect; + enable_disp_height = FALSE; + + widget = GHB_WIDGET(ud->builder, "PictureModulus"); + gtk_widget_set_sensitive(widget, pic_par != 1); + widget = GHB_WIDGET(ud->builder, "PictureLooseCrop"); + gtk_widget_set_sensitive(widget, pic_par != 1); + widget = GHB_WIDGET(ud->builder, "scale_width"); + gtk_widget_set_sensitive(widget, enable_scale_width); + widget = GHB_WIDGET(ud->builder, "scale_height"); + gtk_widget_set_sensitive(widget, enable_scale_height); + widget = GHB_WIDGET(ud->builder, "PictureDisplayWidth"); + gtk_widget_set_sensitive(widget, enable_disp_width); + widget = GHB_WIDGET(ud->builder, "PictureDisplayHeight"); + gtk_widget_set_sensitive(widget, enable_disp_height); + widget = GHB_WIDGET(ud->builder, "PicturePARWidth"); + gtk_widget_set_sensitive(widget, enable_par); + widget = GHB_WIDGET(ud->builder, "PicturePARHeight"); + gtk_widget_set_sensitive(widget, enable_par); + widget = GHB_WIDGET(ud->builder, "PictureKeepRatio"); + gtk_widget_set_sensitive(widget, enable_keep_aspect); + widget = GHB_WIDGET(ud->builder, "autoscale"); + gtk_widget_set_sensitive(widget, pic_par != 1); +} + void ghb_set_scale(signal_user_data_t *ud, gint mode) { hb_list_t * list; hb_title_t * title; hb_job_t * job; - GHashTable *settings = ud->settings; - gboolean keep_aspect, round_dims, anamorphic; + gboolean keep_aspect; + gint pic_par; gboolean autocrop, autoscale, noscale; gint crop[4], width, height, par_width, par_height; gint crop_width, crop_height; gint aspect_n, aspect_d; - gboolean keep_width = (mode == GHB_SCALE_KEEP_WIDTH); - gboolean keep_height = (mode == GHB_SCALE_KEEP_HEIGHT); + gboolean keep_width = (mode & GHB_PIC_KEEP_WIDTH); + gboolean keep_height = (mode & GHB_PIC_KEEP_HEIGHT); gint step; GtkWidget *widget; - gint modshift; - gint modround; + gint mod; gint max_width = 0; gint max_height = 0; + static gboolean busy = FALSE; 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; - + + picture_settings_deps(ud); + if (busy) return; + busy = TRUE; + + if (!ud->dont_clear_presets && (keep_width || keep_height)) + { + ghb_settings_set_int(ud->settings, "PictureWidth", 0); + ghb_settings_set_int(ud->settings, "PictureHeight", 0); + } + // 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"); + mod = ghb_settings_combo_int(ud->settings, "PictureModulus"); + pic_par = ghb_settings_combo_int(ud->settings, "PicturePAR"); + 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. - noscale = ghb_settings_get_bool(ud->settings, "noscale"); + noscale = ghb_settings_get_boolean(ud->settings, "PictureLooseCrop"); // 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 - modshift = round_dims ? 4 : 1; - modround = round_dims ? 8 : 1; if (autoscale) { keep_width = FALSE; keep_height = FALSE; } - if (anamorphic || keep_aspect) - { - keep_height = FALSE; - } // Step needs to be at least 2 because odd widths cause scaler crash - step = round_dims ? 16 : 2; + step = mod; widget = GHB_WIDGET (ud->builder, "scale_width"); gtk_spin_button_set_increments (GTK_SPIN_BUTTON(widget), step, 16); widget = GHB_WIDGET (ud->builder, "scale_height"); gtk_spin_button_set_increments (GTK_SPIN_BUTTON(widget), step, 16); + if (noscale) + { + widget = GHB_WIDGET (ud->builder, "PictureTopCrop"); + gtk_spin_button_set_increments (GTK_SPIN_BUTTON(widget), step, 16); + widget = GHB_WIDGET (ud->builder, "PictureBottomCrop"); + gtk_spin_button_set_increments (GTK_SPIN_BUTTON(widget), step, 16); + widget = GHB_WIDGET (ud->builder, "PictureLeftCrop"); + gtk_spin_button_set_increments (GTK_SPIN_BUTTON(widget), step, 16); + widget = GHB_WIDGET (ud->builder, "PictureRightCrop"); + gtk_spin_button_set_increments (GTK_SPIN_BUTTON(widget), step, 16); + } + else + { + widget = GHB_WIDGET (ud->builder, "PictureTopCrop"); + gtk_spin_button_set_increments (GTK_SPIN_BUTTON(widget), 1, 16); + widget = GHB_WIDGET (ud->builder, "PictureBottomCrop"); + gtk_spin_button_set_increments (GTK_SPIN_BUTTON(widget), 1, 16); + widget = GHB_WIDGET (ud->builder, "PictureLeftCrop"); + gtk_spin_button_set_increments (GTK_SPIN_BUTTON(widget), 1, 16); + widget = GHB_WIDGET (ud->builder, "PictureRightCrop"); + gtk_spin_button_set_increments (GTK_SPIN_BUTTON(widget), 1, 16); + } + ghb_title_info_t tinfo; + ghb_get_title_info (&tinfo, titleindex); if (autocrop) { - ghb_title_info_t tinfo; - - if (ghb_get_title_info (&tinfo, titleindex)) - { - crop[0] = tinfo.crop[0]; - crop[1] = tinfo.crop[1]; - crop[2] = tinfo.crop[2]; - crop[3] = tinfo.crop[3]; - if (noscale) - { - gint need1, need2; - - // Adjust the cropping to accomplish the desired width and height - crop_width = tinfo.width - crop[2] - crop[3]; - crop_height = tinfo.height - crop[0] - crop[1]; - width = (crop_width >> modshift) << modshift; - height = (crop_height >> modshift) << modshift; - need1 = (crop_height - height) / 2; - need2 = crop_height - height - need1; - crop[0] += need1; - crop[1] += need2; - need1 = (crop_width - width) / 2; - need2 = crop_width - width - need1; - 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]); - } + crop[0] = tinfo.crop[0]; + crop[1] = tinfo.crop[1]; + crop[2] = tinfo.crop[2]; + crop[3] = tinfo.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])); + } + else + { + 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"); + } + if (noscale) + { + gint need1, need2; + + // Adjust the cropping to accomplish the desired width and height + crop_width = tinfo.width - crop[2] - crop[3]; + crop_height = tinfo.height - crop[0] - crop[1]; + width = MOD_DOWN(crop_width, mod); + height = MOD_DOWN(crop_height, mod); + + need1 = (crop_height - height) / 2; + need2 = crop_height - height - need1; + crop[0] += need1; + crop[1] += need2; + need1 = (crop_width - width) / 2; + need2 = crop_width - width - need1; + crop[2] += need1; + crop[3] += need2; + 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"); hb_reduce(&aspect_n, &aspect_d, title->width * title->pixel_aspect_width, title->height * title->pixel_aspect_height); @@ -1919,79 +3266,107 @@ ghb_set_scale(signal_user_data_t *ud, gint mode) { width = crop_width; height = crop_height; - max_width = crop_width; - max_height = crop_height; } 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"); - // Align max dims - max_width = (max_width >> modshift) << modshift; - max_height = (max_height >> modshift) << modshift; - // Adjust dims according to max values - if (!max_height) - { - max_height = crop_height; - } - if (!max_width) - { - max_width = crop_width; - } - height = MIN(height, max_height); - width = MIN(width, max_width); - g_debug("max_width %d, max_height %d\n", max_width, max_height); + max_width = MOD_DOWN( + ghb_settings_get_int(ud->settings, "PictureWidth"), mod); + max_height = MOD_DOWN( + ghb_settings_get_int(ud->settings, "PictureHeight"), mod); } + g_debug("max_width %d, max_height %d\n", max_width, max_height); + if (width < 16) width = title->width - crop[2] - crop[3]; if (height < 16) height = title->height - crop[0] - crop[1]; - if (anamorphic) + width = MOD_ROUND(width, mod); + height = MOD_ROUND(height, mod); + + // Adjust dims according to max values + if (max_height) + height = MIN(height, max_height); + if (max_width) + width = MIN(width, max_width); + + if (pic_par) { - if (round_dims) + job->anamorphic.mode = pic_par; + // The scaler crashes if the dimensions are not divisible by 2 + // Align mod 2. And so does something in x264_encoder_headers() + job->anamorphic.modulus = mod; + job->anamorphic.par_width = title->pixel_aspect_width; + job->anamorphic.par_height = title->pixel_aspect_height; + job->anamorphic.dar_width = 0; + job->anamorphic.dar_height = 0; + + if (keep_height && pic_par == 2) + width = ((double)height * crop_width / crop_height) + mod / 2; + job->width = width; + job->height = height; + job->maxWidth = max_width; + job->maxHeight = max_height; + job->crop[0] = crop[0]; job->crop[1] = crop[1]; + job->crop[2] = crop[2]; job->crop[3] = crop[3]; + if (job->anamorphic.mode == 3 && !keep_aspect) { - job->modulus = 0; + job->anamorphic.keep_display_aspect = 0; + if (mode & GHB_PIC_KEEP_PAR) + { + job->anamorphic.par_width = + ghb_settings_get_int(ud->settings, "PicturePARWidth"); + job->anamorphic.par_height = + ghb_settings_get_int(ud->settings, "PicturePARHeight"); + } + else + { + job->anamorphic.dar_width = + ghb_settings_get_int(ud->settings, + "PictureDisplayWidth"); + job->anamorphic.dar_height = height; + } } else { - // The scaler crashes if the dimensions are not divisible by 2 - // Align mod 2. And so does something in x264_encoder_headers() - job->modulus = 2; + job->anamorphic.keep_display_aspect = 1; + } + hb_set_anamorphic_size( job, &width, &height, + &par_width, &par_height ); + if (job->anamorphic.mode == 3 && !keep_aspect && + mode & GHB_PIC_KEEP_PAR) + { + // hb_set_anamorphic_size reduces the par, which we + // don't want in this case because the user is + // explicitely specifying it. + par_width = ghb_settings_get_int(ud->settings, + "PicturePARWidth"); + par_height = ghb_settings_get_int(ud->settings, + "PicturePARHeight"); } - job->width = width; - if (max_height) - 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 ); } else { + job->anamorphic.mode = pic_par; if (keep_aspect) { gdouble par; gint new_width, new_height; - g_debug("kw %s kh %s\n", keep_width ? "y":"n", keep_height ? "y":"n"); - g_debug("w %d h %d\n", width, height); // Compute pixel aspect ration. par = (gdouble)(title->height * aspect_n) / (title->width * aspect_d); // Must scale so that par becomes 1:1 // Try to keep largest dimension new_height = (crop_height * ((gdouble)width/crop_width) / par); new_width = (crop_width * ((gdouble)height/crop_height) * par); - // 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) { height = new_height; } - else if (max_height && (new_height > max_height)) + else if (max_height && new_height > max_height) { width = new_width; } @@ -2013,140 +3388,429 @@ ghb_set_scale(signal_user_data_t *ud, gint mode) } g_debug("new w %d h %d\n", width, height); } - width = ((width + modround) >> modshift) << modshift; - height = ((height + modround) >> modshift) << modshift; + width = MOD_ROUND(width, mod); + height = MOD_ROUND(height, mod); + if (max_height) + height = MIN(height, max_height); + if (max_width) + width = MIN(width, max_width); + par_width = par_height = 1; } - 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) -{ - 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"); + gint disp_width, dar_width, dar_height; + gchar *str; - gboolean anamorphic = ghb_settings_get_bool(settings, "anamorphic"); - gboolean round_dimensions = ghb_settings_get_bool(settings, "round_dimensions"); - if (round_dimensions && anamorphic) + disp_width = (gdouble)(width * par_width / par_height) + 0.5; + hb_reduce(&dar_width, &dar_height, disp_width, height); + + gint iaspect = dar_width * 9 / dar_height; + if (dar_width > 2 * dar_height) + { + str = g_strdup_printf("%.2f : 1", (gdouble)dar_width / dar_height); + } + else if (iaspect <= 16 && iaspect >= 15) { - job->modulus = 16; - job->pixel_ratio = 2; + str = g_strdup_printf("%.2f : 9", (gdouble)dar_width * 9 / dar_height); } - else if (anamorphic) + else if (iaspect <= 12 && iaspect >= 11) { - job->modulus = 2; - job->pixel_ratio = 2; + str = g_strdup_printf("%.2f : 3", (gdouble)dar_width * 3 / dar_height); } else { - job->modulus = 2; - job->pixel_ratio = 0; + str = g_strdup_printf("%d : %d", dar_width, dar_height); } + ghb_ui_update(ud, "display_aspect", ghb_string_value(str)); + g_free(str); + ghb_ui_update(ud, "PicturePARWidth", ghb_int64_value(par_width)); + ghb_ui_update(ud, "PicturePARHeight", ghb_int64_value(par_height)); + ghb_ui_update(ud, "PictureDisplayWidth", ghb_int64_value(disp_width)); + ghb_ui_update(ud, "PictureDisplayHeight", ghb_int64_value(height)); + busy = FALSE; +} + +static void +set_preview_job_settings(hb_job_t *job, GValue *settings) +{ + 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"); + + job->anamorphic.mode = ghb_settings_combo_int(settings, "PicturePAR"); + job->anamorphic.modulus = + ghb_settings_combo_int(settings, "PictureModulus"); 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; + if (ghb_settings_get_boolean(settings, "show_crop")) + { + gdouble xscale = (gdouble)job->width / + (gdouble)(job->title->width - job->crop[2] - job->crop[3]); + gdouble yscale = (gdouble)job->height / + (gdouble)(job->title->height - job->crop[0] - job->crop[1]); + + job->width += xscale * (job->crop[2] + job->crop[3]); + job->height += yscale * (job->crop[0] + job->crop[1]); + job->crop[0] = 0; + job->crop[1] = 0; + job->crop[2] = 0; + job->crop[3] = 0; + job->anamorphic.modulus = 2; + } + + gboolean decomb_deint = ghb_settings_get_boolean(settings, "PictureDecombDeinterlace"); + if (decomb_deint) + { + gint decomb = ghb_settings_combo_int(settings, "PictureDecomb"); + job->deinterlace = (decomb == 0) ? 0 : 1; + } + else + { + gint deint = ghb_settings_combo_int(settings, "PictureDeinterlace"); + job->deinterlace = (deint == 0) ? 0 : 1; + } + + gboolean keep_aspect; + keep_aspect = ghb_settings_get_boolean(settings, "PictureKeepRatio"); + if (job->anamorphic.mode) + { + job->anamorphic.par_width = job->title->pixel_aspect_width; + job->anamorphic.par_height = job->title->pixel_aspect_height; + job->anamorphic.dar_width = 0; + job->anamorphic.dar_height = 0; + + if (job->anamorphic.mode == 3 && !keep_aspect) + { + job->anamorphic.keep_display_aspect = 0; + job->anamorphic.par_width = + ghb_settings_get_int(settings, "PicturePARWidth"); + job->anamorphic.par_height = + ghb_settings_get_int(settings, "PicturePARHeight"); + } + else + { + job->anamorphic.keep_display_aspect = 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 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(GHashTable *settings) -{ - gint bitrate; - if (ghb_settings_get_bool(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; - if (vcodec == HB_VCODEC_X264 && - !ghb_settings_get_bool(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; +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; } - else + return FALSE; +} + +gboolean +ghb_validate_filters(signal_user_data_t *ud) +{ + gchar *str; + gint index; + gchar *message; + + gboolean decomb_deint = ghb_settings_get_boolean(ud->settings, "PictureDecombDeinterlace"); + // deinte + index = ghb_settings_combo_int(ud->settings, "PictureDeinterlace"); + if (!decomb_deint && index == 1) + { + str = ghb_settings_get_string(ud->settings, "PictureDeinterlaceCustom"); + if (!ghb_validate_filter_string(str, -1)) + { + 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); + } + // detel + index = ghb_settings_combo_int(ud->settings, "PictureDetelecine"); + if (index == 1) + { + str = ghb_settings_get_string(ud->settings, "PictureDetelecineCustom"); + if (!ghb_validate_filter_string(str, -1)) + { + message = g_strdup_printf( + "Invalid Detelecine 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); + } + // decomb + index = ghb_settings_combo_int(ud->settings, "PictureDecomb"); + if (decomb_deint && index == 1) + { + str = ghb_settings_get_string(ud->settings, "PictureDecombCustom"); + if (!ghb_validate_filter_string(str, -1)) + { + message = g_strdup_printf( + "Invalid Decomb 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); + } + // denois + index = ghb_settings_combo_int(ud->settings, "PictureDenoise"); + if (index == 1) { - // 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; + str = ghb_settings_get_string(ud->settings, "PictureDenoiseCustom"); + if (!ghb_validate_filter_string(str, -1)) + { + 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 bitrate; + 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"); - if ((mux == HB_MUX_MP4 || mux == HB_MUX_AVI) && - (vcodec == HB_VCODEC_THEORA)) + mux = ghb_settings_combo_int(ud->settings, "FileFormat"); + vcodec = ghb_settings_combo_int(ud->settings, "VideoEncoder"); + if ((mux == HB_MUX_MP4) && (vcodec == HB_VCODEC_THEORA)) { - // mp4|avi/theora combination is not supported. + // mp4/theora combination is not supported. message = g_strdup_printf( - "Theora is not supported in the MP4 and AVI containers.\n\n" + "Theora is not supported in the MP4 container.\n\n" "You should choose a different video codec or container.\n" - "If you continue, XviD will be chosen for you."); + "If you continue, FFMPEG will be chosen for you."); if (!ghb_message_dialog(GTK_MESSAGE_WARNING, message, "Cancel", "Continue")) { g_free(message); return FALSE; } g_free(message); - vcodec = HB_VCODEC_XVID; - ghb_ui_update_int(ud, "video_codec", vcodec); + vcodec = HB_VCODEC_FFMPEG; + ghb_ui_update(ud, "VideoEncoder", ghb_int64_value(vcodec)); + } + return TRUE; +} + +gboolean +ghb_validate_subtitles(signal_user_data_t *ud) +{ + hb_list_t * list; + hb_title_t * title; + gchar *message; + + if (h_scan == NULL) return FALSE; + list = hb_get_titles( h_scan ); + if( !hb_list_count( list ) ) + { + /* No valid title, stop right there */ + g_message("No title found.\n"); + return FALSE; + } + + 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_combo_int(ud->settings, "FileFormat"); + + const GValue *slist, *settings; + gint count, ii, source; + gboolean burned, one_burned = FALSE; + + slist = ghb_settings_get_value(ud->settings, "subtitle_list"); + count = ghb_array_len(slist); + for (ii = 0; ii < count; ii++) + { + settings = ghb_array_get_nth(slist, ii); + source = ghb_settings_get_int(settings, "SubtitleSource"); + burned = ghb_settings_get_boolean(settings, "SubtitleBurned"); + if (burned && one_burned) + { + // MP4 can only handle burned vobsubs. make sure there isn't + // already something burned in the list + message = g_strdup_printf( + "Only one subtitle may be burned into the video.\n\n" + "You should change your subtitle selections.\n" + "If you continue, some subtitles will be lost."); + if (!ghb_message_dialog(GTK_MESSAGE_WARNING, message, "Cancel", "Continue")) + { + g_free(message); + return FALSE; + } + g_free(message); + break; + } + else if (burned) + { + one_burned = TRUE; + } + if (!burned && mux == HB_MUX_MP4 && source == VOBSUB) + { + // MP4 can only handle burned vobsubs. make sure there isn't + // already something burned in the list + message = g_strdup_printf( + "Your chosen container does not support soft bitmap subtitles.\n\n" + "You should change your subtitle selections.\n" + "If you continue, some subtitles will be lost."); + if (!ghb_message_dialog(GTK_MESSAGE_WARNING, message, + "Cancel", "Continue")) + { + g_free(message); + return FALSE; + } + g_free(message); + break; + } + if (source == SRTSUB) + { + gchar *filename; + + filename = ghb_settings_get_string(settings, "SrtFile"); + if (!g_file_test(filename, G_FILE_TEST_IS_REGULAR)) + { + message = g_strdup_printf( + "Srt file does not exist or not a regular file.\n\n" + "You should choose a valid file.\n" + "If you continue, this subtitle will be ignored."); + if (!ghb_message_dialog(GTK_MESSAGE_WARNING, message, + "Cancel", "Continue")) + { + g_free(message); + return FALSE; + } + g_free(message); + break; + } + } } return TRUE; } +gint +ghb_select_audio_codec(signal_user_data_t *ud, gint track) +{ + hb_list_t * list; + hb_title_t * title; + hb_audio_config_t *audio; + + if (h_scan == NULL) return -1; + list = hb_get_titles( h_scan ); + if( !hb_list_count( list ) ) + { + return -1; + } + + gint titleindex; + + titleindex = ghb_settings_combo_int(ud->settings, "title"); + title = hb_list_item( list, titleindex ); + if (title == NULL) return -1; + + gint mux = ghb_settings_combo_int(ud->settings, "FileFormat"); + + if (track < 0 || track >= hb_list_count(title->list_audio)) + return -1; + + audio = (hb_audio_config_t *) hb_list_audio_config_item( + title->list_audio, track ); + if (mux == HB_MUX_MP4) + { + if (audio->in.codec == HB_ACODEC_AC3) + return audio->in.codec; + else + return HB_ACODEC_FAAC; + } + else + { + if (audio->in.codec == HB_ACODEC_AC3 || audio->in.codec == HB_ACODEC_DCA) + return audio->in.codec; + else + return HB_ACODEC_LAME; + } +} + +const gchar* +ghb_select_audio_codec_str(signal_user_data_t *ud, gint track) +{ + gint acodec, ii; + + acodec = ghb_select_audio_codec(ud, track); + for (ii = 0; ii < acodec_opts.count; ii++) + { + if (acodec_opts.map[ii].ivalue == acodec) + return acodec_opts.map[ii].option; + } + return "Unknown"; +} + gboolean ghb_validate_audio(signal_user_data_t *ud) { 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 */ @@ -2154,25 +3818,37 @@ ghb_validate_audio(signal_user_data_t *ud) 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, "FileFormat"); + + 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 ); - if ((taudio->in.codec != HB_ACODEC_AC3) && (codec == HB_ACODEC_AC3)) + asettings = ghb_array_get_nth(audio_list, ii); + gint track = ghb_settings_combo_int(asettings, "AudioTrack"); + gint codec = ghb_settings_combo_int(asettings, "AudioEncoder"); + if (codec == HB_ACODEC_MASK) + continue; + + taudio = (hb_audio_config_t *) hb_list_audio_config_item( + title->list_audio, track ); + if (!(taudio->in.codec & codec) && + (codec & (HB_ACODEC_AC3 | HB_ACODEC_DCA))) { // Not supported. AC3 is passthrough only, so input must be AC3 message = g_strdup_printf( - "The source does not support AC3 Pass-Thru.\n\n" + "The source does not support Pass-Thru.\n\n" "You should choose a different audio codec.\n" "If you continue, one will be chosen for you."); if (!ghb_message_dialog(GTK_MESSAGE_WARNING, message, "Cancel", "Continue")) @@ -2181,7 +3857,7 @@ ghb_validate_audio(signal_user_data_t *ud) return FALSE; } g_free(message); - if (mux == HB_MUX_AVI) + if (mux == HB_MUX_MKV) { codec = HB_ACODEC_LAME; } @@ -2190,7 +3866,7 @@ ghb_validate_audio(signal_user_data_t *ud) codec = HB_ACODEC_FAAC; } value = get_acodec_value(codec); - ghb_settings_set(asettings, "audio_codec", value); + ghb_settings_take_value(asettings, "AudioEncoder", value); } gchar *a_unsup = NULL; gchar *mux_s = NULL; @@ -2198,45 +3874,20 @@ ghb_validate_audio(signal_user_data_t *ud) { mux_s = "MP4"; // mp4/mp3|vorbis combination is not supported. - if (codec == HB_ACODEC_LAME) - { - a_unsup = "MP3"; - codec = HB_ACODEC_FAAC; - } - if (codec == HB_ACODEC_VORBIS) - { - a_unsup = "Vorbis"; - codec = HB_ACODEC_FAAC; - } - } - else if (mux == HB_MUX_AVI) - { - mux_s = "AVI"; - // avi/faac|vorbis combination is not supported. - if (codec == HB_ACODEC_FAAC) + if (codec == HB_ACODEC_LAME) { - a_unsup = "FAAC"; - codec = HB_ACODEC_LAME; + a_unsup = "MP3"; + codec = HB_ACODEC_FAAC; } if (codec == HB_ACODEC_VORBIS) { a_unsup = "Vorbis"; - codec = HB_ACODEC_LAME; - } - } - else if (mux == HB_MUX_OGM) - { - mux_s = "OGM"; - // avi/faac|vorbis combination is not supported. - if (codec == HB_ACODEC_FAAC) - { - a_unsup = "FAAC"; - codec = HB_ACODEC_VORBIS; + codec = HB_ACODEC_FAAC; } - if (codec == HB_ACODEC_AC3) + if (codec == HB_ACODEC_DCA) { - a_unsup = "AC-3"; - codec = HB_ACODEC_VORBIS; + a_unsup = "DTS"; + codec = HB_ACODEC_FAAC; } } if (a_unsup) @@ -2252,9 +3903,9 @@ ghb_validate_audio(signal_user_data_t *ud) } g_free(message); value = get_acodec_value(codec); - ghb_settings_set(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; @@ -2262,7 +3913,7 @@ ghb_validate_audio(signal_user_data_t *ud) gboolean allow_6ch = TRUE; allow_mono = (taudio->in.codec & (HB_ACODEC_AC3|HB_ACODEC_DCA)) && - (codec != HB_ACODEC_LAME); + (codec & ~HB_ACODEC_LAME); gint layout = taudio->in.channel_layout & HB_INPUT_CH_LAYOUT_DISCRETE_NO_LFE_MASK; allow_stereo = ((layout == HB_INPUT_CH_LAYOUT_MONO && !allow_mono) || layout >= HB_INPUT_CH_LAYOUT_STEREO); @@ -2273,7 +3924,7 @@ ghb_validate_audio(signal_user_data_t *ud) allow_dpl2 = (layout == HB_INPUT_CH_LAYOUT_3F2R); allow_6ch = (taudio->in.codec & (HB_ACODEC_AC3|HB_ACODEC_DCA)) && - (codec != HB_ACODEC_LAME) && + (codec & ~HB_ACODEC_LAME) && (layout == HB_INPUT_CH_LAYOUT_3F2R) && (taudio->in.channel_layout & HB_INPUT_CH_LAYOUT_HAS_LFE); @@ -2312,64 +3963,58 @@ 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_set(asettings, "audio_mix", value); + ghb_settings_take_value(asettings, "AudioMixdown", 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, "VideoEncoder"); + gdouble vquality; + vquality = ghb_settings_get_double(settings, "VideoQualitySlider"); + if (ghb_settings_get_boolean(settings, "vquality_type_constant")) { - if (!ghb_settings_get_bool(settings, "directqp")) - { - if (vcodec != HB_VCODEC_X264 || - ghb_settings_get_bool(settings, "linear_vquality")) - { - min = 68; - max = 97; - } - else if (vcodec == HB_VCODEC_X264) - { - min = 40; - max = 70; - } - } - else + switch (vcodec) { - if (vcodec == HB_VCODEC_X264) + case HB_VCODEC_X264: { min = 16; max = 30; - } - else if (vcodec == HB_VCODEC_FFMPEG) + } break; + + case HB_VCODEC_FFMPEG: { min = 1; max = 8; - } - else + } break; + + case HB_VCODEC_THEORA: { - min = 68; - max = 97; - } + min = 0; + max = 63; + } break; + + default: + { + min = 48; + max = 62; + } break; } - gint vquality = ghb_settings_get_dbl(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")) { @@ -2382,27 +4027,31 @@ ghb_validate_vquality(GHashTable *settings) return TRUE; } -void -ghb_add_job(job_settings_t *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; hb_job_t * job; - GHashTable *settings = js->settings; static gchar *x264opts; gint sub_id = 0; - - g_debug("ghb_add_job()\n"); + 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("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; } - gint titleindex = ghb_settings_get_index(settings, "title"); title = hb_list_item( list, titleindex ); if (title == NULL) return; @@ -2410,170 +4059,196 @@ ghb_add_job(job_settings_t *js, gint unique_id) job = title->job; if (job == NULL) return; - job->mux = ghb_settings_get_int(settings, "container"); + job->angle = ghb_settings_get_int(js, "angle"); + job->start_at_preview = ghb_settings_get_int(js, "start_frame") + 1; + if (job->start_at_preview) + { + 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_bool(settings, "large_mp4"); - job->mp4_optimize = ghb_settings_get_bool(settings, "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(settings, "start_chapter"); - chapter_end = ghb_settings_get_int(settings, "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"); - if ( job->chapter_markers ) + if (!job->start_at_preview) { - gint chapter; - - for(chapter = chapter_start; chapter <= chapter_end; chapter++) + 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_start == job->chapter_end) + job->chapter_markers = 0; + if ( job->chapter_markers ) { - hb_chapter_t * chapter_s; - gchar *name; - - if (js->chapter_list == NULL || js->chapter_list[chapter-1] == 0) - { - name = g_strdup_printf ("Chapter %2d", chapter); - } - else + 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(js->chapter_list[chapter-1]); + 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, chapter - 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, "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_bool(settings, "decomb"); - gint deint = ghb_settings_get_int(settings, "deinterlace"); - job->deinterlace = (deint == 0) ? 0 : 1; - job->grayscale = ghb_settings_get_bool(settings, "grayscale"); - - gboolean anamorphic = ghb_settings_get_bool(settings, "anamorphic"); - gboolean round_dimensions = ghb_settings_get_bool(settings, "round_dimensions"); - if (round_dimensions && anamorphic) - { - job->pixel_ratio = 2; - job->modulus = 16; - } - else if (anamorphic) - { - // Huh! I thought I wanted to use pixel_ratio 1 for this case, but - // when its 1, libhb discards the width and height and uses original - // title dims - crop. Thats not what I want. - // Also, x264 requires things to divisible by 2. - job->pixel_ratio = 2; - job->modulus = 2; - } + gboolean decomb_deint = ghb_settings_get_boolean(js, "PictureDecombDeinterlace"); + gint decomb = ghb_settings_combo_int(js, "PictureDecomb"); + gint deint = ghb_settings_combo_int(js, "PictureDeinterlace"); + if (!decomb_deint) + job->deinterlace = (deint != 0) ? 1 : 0; else + job->deinterlace = 0; + job->grayscale = ghb_settings_get_boolean(js, "VideoGrayScale"); + + gboolean keep_aspect; + keep_aspect = ghb_settings_get_boolean(js, "PictureKeepRatio"); + job->anamorphic.mode = ghb_settings_combo_int(js, "PicturePAR"); + job->anamorphic.modulus = ghb_settings_combo_int(js, "PictureModulus"); + if (job->anamorphic.mode) { - job->pixel_ratio = 0; - job->modulus = 2; + job->anamorphic.par_width = title->pixel_aspect_width; + job->anamorphic.par_height = title->pixel_aspect_height; + job->anamorphic.dar_width = 0; + job->anamorphic.dar_height = 0; + + if (job->anamorphic.mode == 3 && !keep_aspect) + { + job->anamorphic.keep_display_aspect = 0; + job->anamorphic.par_width = + ghb_settings_get_int(js, "PicturePARWidth"); + job->anamorphic.par_height = + ghb_settings_get_int(js, "PicturePARHeight"); + } + else + { + job->anamorphic.keep_display_aspect = 1; + } } - 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 detel = ghb_settings_combo_int(js, "PictureDetelecine"); + if ( detel ) { - hb_filter_detelecine.settings = NULL; + if (detel != 1) + { + if (detel_opts.map[detel].svalue != NULL) + detel_str = g_strdup(detel_opts.map[detel].svalue); + } + else + detel_str = ghb_settings_get_string(js, "PictureDetelecineCustom"); + hb_filter_detelecine.settings = detel_str; hb_list_add( job->filters, &hb_filter_detelecine ); } - if( decomb ) + if ( decomb_deint && decomb ) { - // Use default settings - hb_filter_decomb.settings = NULL; - hb_filter_decomb.settings = "1:2:6:9:40:16:16"; + if (decomb != 1) + { + if (decomb_opts.map[decomb].svalue != NULL) + decomb_str = g_strdup(decomb_opts.map[decomb].svalue); + } + else + decomb_str = ghb_settings_get_string(js, "PictureDecombCustom"); + hb_filter_decomb.settings = decomb_str; hb_list_add( job->filters, &hb_filter_decomb ); } - if( !decomb && job->deinterlace ) + if( job->deinterlace ) { - hb_filter_deinterlace.settings = (gchar*)ghb_settings_get_string(settings, "deinterlace"); + if (deint != 1) + { + if (deint_opts.map[deint].svalue != NULL) + deint_str = g_strdup(deint_opts.map[deint].svalue); + } + else + deint_str = ghb_settings_get_string(js, "PictureDeinterlaceCustom"); + 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, "PictureDeblock"); + 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"); - if( denoise != 0 ) + gint denoise = ghb_settings_combo_int(js, "PictureDenoise"); + if( denoise ) { - hb_filter_denoise.settings = (gchar*)ghb_settings_get_string(settings, "denoise"); + if (denoise != 1) + { + if (denoise_opts.map[denoise].svalue != NULL) + denoise_str = g_strdup(denoise_opts.map[denoise].svalue); + } + else + denoise_str = ghb_settings_get_string(js, "PictureDenoiseCustom"); + 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"); - if ((job->mux == HB_MUX_MP4 || job->mux == HB_MUX_AVI) && - (job->vcodec == HB_VCODEC_THEORA)) + job->vcodec = ghb_settings_combo_int(js, "VideoEncoder"); + if ((job->mux == HB_MUX_MP4 ) && (job->vcodec == HB_VCODEC_THEORA)) { - // mp4|avi/theora combination is not supported. - job->vcodec = HB_VCODEC_XVID; + // mp4/theora combination is not supported. + job->vcodec = HB_VCODEC_FFMPEG; } 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, "Mp4iPodCompatible"); } - 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")) - { - vquality /= 100.0; - if (ghb_settings_get_bool(settings, "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; - } - } + gdouble vquality; + vquality = ghb_settings_get_double(js, "VideoQualitySlider"); 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"); - } - // AVI container does not support variable frame rate. - if (job->mux == HB_MUX_AVI) - { - job->vfr = FALSE; + job->vbitrate = ghb_settings_get_int(js, "VideoAvgBitrate"); } - gint vrate = ghb_settings_get_int(settings, "framerate"); - if( vrate == 0 || job->vfr ) + gint vrate = ghb_settings_combo_int(js, "VideoFramerate"); + if( vrate == 0 ) { job->vrate = title->rate; job->vrate_base = title->rate_base; @@ -2585,127 +4260,231 @@ ghb_add_job(job_settings_t *js, gint unique_id) job->vrate_base = vrate; job->cfr = 1; } - // First remove any audios that are already in the list - // This happens if you are encoding the same title a second time. - gint num_audio_tracks = hb_list_count(job->list_audio); - gint ii; - for(ii = 0; ii < num_audio_tracks; ii++) - { - 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, ii; + 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 ); - if ((taudio->in.codec != HB_ACODEC_AC3) && (audio.out.codec == HB_ACODEC_AC3)) + asettings = ghb_array_get_nth(audio_list, ii); + audio.in.track = ghb_settings_get_int(asettings, "AudioTrack"); + audio.out.track = tcount; + 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 (audio.out.codec & (HB_ACODEC_AC3 | HB_ACODEC_DCA)) { - // Not supported. AC3 is passthrough only, so input must be AC3 - if (job->mux == HB_MUX_AVI) + if (!(taudio->in.codec & (HB_ACODEC_AC3 | HB_ACODEC_DCA))) { - audio.out.codec = HB_ACODEC_LAME; + // Not supported. + // AC3/DTS is passthrough only, so input must be AC3/DTS + if (job->mux == HB_MUX_MKV) + { + audio.out.codec = HB_ACODEC_LAME; + } + else + { + audio.out.codec = HB_ACODEC_FAAC; + } } else { - audio.out.codec = HB_ACODEC_FAAC; + audio.out.codec &= taudio->in.codec; } } if ((job->mux == HB_MUX_MP4) && - ((audio.out.codec == HB_ACODEC_LAME) || - (audio.out.codec == HB_ACODEC_VORBIS))) + ((audio.out.codec & HB_ACODEC_LAME) || + (audio.out.codec & HB_ACODEC_DCA) || + (audio.out.codec & HB_ACODEC_VORBIS))) { - // mp4/mp3|vorbis combination is not supported. + // mp4/mp3|dts|vorbis combination is not supported. audio.out.codec = HB_ACODEC_FAAC; } - if ((job->mux == HB_MUX_AVI) && - ((audio.out.codec == HB_ACODEC_FAAC) || - (audio.out.codec == HB_ACODEC_VORBIS))) - { - // avi/faac|vorbis combination is not supported. - audio.out.codec = HB_ACODEC_LAME; - } - if ((job->mux == HB_MUX_OGM) && - ((audio.out.codec == HB_ACODEC_FAAC) || - (audio.out.codec == HB_ACODEC_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, "AudioTrackDRCSlider"); + if (audio.out.dynamic_range_compression < 1.0) + audio.out.dynamic_range_compression = 0.0; + // 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) + if (audio.out.codec & (HB_ACODEC_AC3 | HB_ACODEC_DCA)) { audio.out.mixdown = 0; } else { - audio.out.mixdown = ghb_settings_get_int (asettings, "audio_mix"); + int channels; + + audio.out.mixdown = ghb_settings_combo_int(asettings, "AudioMixdown"); + if (audio.out.mixdown == HB_AMIXDOWN_MONO) + channels = 1; + else if (audio.out.mixdown == HB_AMIXDOWN_6CH) + channels = 6; + else + channels = 2; + // 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, "AudioBitrate"); + gint srate = ghb_settings_combo_int(asettings, "AudioSamplerate"); if (srate == 0) // 0 is same as source audio.out.samplerate = taudio->in.samplerate; else audio.out.samplerate = srate; + + audio.out.bitrate = ghb_get_best_audio_bitrate( + audio.out.codec, audio.out.bitrate, channels); } // 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, "VideoTargetSize"); 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; + + const GValue *subtitle_list; + gint subtitle; + gboolean force, burned, def, one_burned = FALSE; + + ghb_settings_set_boolean(js, "subtitle_scan", FALSE); + subtitle_list = ghb_settings_get_value(js, "subtitle_list"); + count = ghb_array_len(subtitle_list); + for (ii = 0; ii < count; ii++) + { + GValue *ssettings; + gint source; + + ssettings = ghb_array_get_nth(subtitle_list, ii); + + force = ghb_settings_get_boolean(ssettings, "SubtitleForced"); + burned = ghb_settings_get_boolean(ssettings, "SubtitleBurned"); + def = ghb_settings_get_boolean(ssettings, "SubtitleDefaultTrack"); + source = ghb_settings_get_int(ssettings, "SubtitleSource"); + + if (source == SRTSUB) + { + hb_subtitle_config_t sub_config; + gchar *filename, *lang, *code; + + filename = ghb_settings_get_string(ssettings, "SrtFile"); + if (!g_file_test(filename, G_FILE_TEST_IS_REGULAR)) + { + continue; + } + sub_config.offset = ghb_settings_get_int(ssettings, "SrtOffset"); + lang = ghb_settings_get_string(ssettings, "SrtLanguage"); + code = ghb_settings_get_string(ssettings, "SrtCodeset"); + strncpy(sub_config.src_filename, filename, 128); + strncpy(sub_config.src_codeset, code, 40); + sub_config.force = 0; + sub_config.dest = PASSTHRUSUB; + sub_config.default_track = def; + + hb_srt_add( job, &sub_config, lang); + + g_free(filename); + g_free(lang); + g_free(code); + continue; + } + + subtitle = ghb_settings_get_int(ssettings, "SubtitleTrack"); + if (subtitle == -1) + { + if (!burned && job->mux == HB_MUX_MKV) + { + job->select_subtitle_config.dest = PASSTHRUSUB; + } + else if (!burned && job->mux == HB_MUX_MP4) + { + // Skip any non-burned vobsubs when output is mp4 + continue; + } + else if (burned) + { + // Only allow one subtitle to be burned into the video + if (one_burned) + continue; + job->select_subtitle_config.dest = RENDERSUB; + one_burned = TRUE; + } + job->select_subtitle_config.force = force; + job->select_subtitle_config.default_track = def; + job->indepth_scan = 1; + ghb_settings_set_boolean(js, "subtitle_scan", TRUE); + } + else if (subtitle >= 0) + { + hb_subtitle_t * subt; + hb_subtitle_config_t sub_config; + + subt = (hb_subtitle_t *)hb_list_item(title->list_subtitle, subtitle); + sub_config = subt->config; + if (subt != NULL) + { + if (!burned && job->mux == HB_MUX_MKV && + subt->format == PICTURESUB) + { + sub_config.dest = PASSTHRUSUB; + } + else if (!burned && job->mux == HB_MUX_MP4 && + subt->format == PICTURESUB) + { + // Skip any non-burned vobsubs when output is mp4 + continue; + } + else if ( burned && subt->format == PICTURESUB ) + { + // Only allow one subtitle to be burned into the video + if (one_burned) + continue; + one_burned = TRUE; + } + sub_config.force = force; + sub_config.default_track = def; + hb_subtitle_add( job, &sub_config, subtitle ); + } + } + } + // 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' ) + if( *x264opts == '\0' ) { - job->x264opts = x264opts; - } - else /*avoids a bus error crash when options aren't specified*/ - { - job->x264opts = NULL; + g_free(x264opts); + x264opts = NULL; } - gint subtitle = ghb_settings_get_int(settings, "subtitle_lang"); - gboolean forced_subtitles = ghb_settings_get_bool (settings, "forced_subtitles"); - job->subtitle_force = forced_subtitles; - if (subtitle >= 0) - job->subtitle = subtitle; - else - job->subtitle = -1; - if (subtitle == -1) + + if (job->indepth_scan == 1) { // Subtitle scan. Look for subtitle matching audio language - char *x264opts_tmp; /* * When subtitle scan is enabled do a fast pre-scan job @@ -2713,55 +4492,49 @@ ghb_add_job(job_settings_t *js, gint unique_id) */ job->pass = -1; job->indepth_scan = 1; - - x264opts_tmp = job->x264opts; job->x264opts = NULL; - job->select_subtitle = malloc(sizeof(hb_subtitle_t*)); - *(job->select_subtitle) = NULL; - /* * Add the pre-scan job */ job->sequence_id = (unique_id & 0xFFFFFF) | (sub_id++ << 24); hb_add( h, job ); - //if (job->x264opts != NULL) - // g_free(job->x264opts); - - job->x264opts = x264opts_tmp; - } - else - { - job->select_subtitle = NULL; } - if( ghb_settings_get_bool(settings, "two_pass") ) + + if( ghb_settings_get_boolean(js, "VideoTwoPass") && + !ghb_settings_get_boolean(js, "vquality_type_constant")) { /* * If subtitle_scan is enabled then only turn it on * for the second pass and then off again for the * second. */ - hb_subtitle_t **subtitle_tmp = job->select_subtitle; - job->select_subtitle = NULL; job->pass = 1; job->indepth_scan = 0; - gchar *x264opts2 = NULL; - if (x264opts) - { - x264opts2 = g_strdup(x264opts); - } + /* * 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, "VideoTurboTwoPass") ) { - char *tmp_x264opts; + gchar *tmp_x264opts; + gchar *extra_opts; + gint badapt; + badapt = ghb_lookup_badapt(x264opts); + if (badapt == 2) + { + extra_opts = g_strdup_printf("%s", turbo_opts); + } + else + { + extra_opts = g_strdup_printf("%s:weightb=0", turbo_opts); + } + if ( x264opts ) { - tmp_x264opts = g_strdup_printf("%s:%s", x264opts, turbo_opts); - g_free(x264opts); + tmp_x264opts = g_strdup_printf("%s:%s", x264opts, extra_opts); } else { @@ -2769,10 +4542,14 @@ ghb_add_job(job_settings_t *js, gint unique_id) * No x264opts to modify, but apply the turbo options * anyway as they may be modifying defaults */ - tmp_x264opts = g_strdup_printf("%s", turbo_opts); + tmp_x264opts = g_strdup_printf("%s", extra_opts); } - x264opts = tmp_x264opts; + g_free(extra_opts); + job->x264opts = tmp_x264opts; + } + else + { job->x264opts = x264opts; } job->sequence_id = (unique_id & 0xFFFFFF) | (sub_id++ << 24); @@ -2780,7 +4557,6 @@ ghb_add_job(job_settings_t *js, gint unique_id) //if (job->x264opts != NULL) // g_free(job->x264opts); - job->select_subtitle = subtitle_tmp; job->pass = 2; /* * On the second pass we turn off subtitle scan so that we @@ -2789,7 +4565,7 @@ ghb_add_job(job_settings_t *js, gint unique_id) * attribute of the job). */ job->indepth_scan = 0; - job->x264opts = x264opts2; + job->x264opts = x264opts; job->sequence_id = (unique_id & 0xFFFFFF) | (sub_id++ << 24); hb_add( h, job ); //if (job->x264opts != NULL) @@ -2797,6 +4573,7 @@ ghb_add_job(job_settings_t *js, gint unique_id) } else { + job->x264opts = x264opts; job->indepth_scan = 0; job->pass = 0; job->sequence_id = (unique_id & 0xFFFFFF) | (sub_id++ << 24); @@ -2804,6 +4581,48 @@ ghb_add_job(job_settings_t *js, gint unique_id) //if (job->x264opts != NULL) // g_free(job->x264opts); } + + // clean up audio list + gint num_audio_tracks = hb_list_count(job->list_audio); + for(ii = 0; ii < num_audio_tracks; ii++) + { + hb_audio_t *audio = (hb_audio_t*)hb_list_item(job->list_audio, 0); + hb_list_rem(job->list_audio, audio); + free(audio); + } + + // clean up subtitle list + gint num_subtitle_tracks = hb_list_count(job->list_subtitle); + for(ii = 0; ii < num_subtitle_tracks; ii++) + { + hb_subtitle_t *subtitle = hb_list_item(job->list_subtitle, 0); + hb_list_rem(job->list_subtitle, subtitle); + free(subtitle); + } + + 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 +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 @@ -2815,49 +4634,168 @@ ghb_remove_job(gint unique_id) // 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_start_live_encode() +{ + hb_start( h_scan ); +} + +void +ghb_stop_live_encode() +{ + hb_stop( h_scan ); } 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_status.queue.state &= ~GHB_STATE_PAUSED; + hb_resume( h_queue ); } else { - hb_pause( h ); + hb_status.queue.state |= GHB_STATE_PAUSED; + hb_pause( h_queue ); } } +static void +vert_line( + GdkPixbuf * pb, + guint8 r, + guint8 g, + guint8 b, + gint x, + gint y, + gint len, + gint width) +{ + guint8 *pixels = gdk_pixbuf_get_pixels (pb); + guint8 *dst; + gint ii, jj; + gint channels = gdk_pixbuf_get_n_channels (pb); + gint stride = gdk_pixbuf_get_rowstride (pb); + + for (jj = 0; jj < width; jj++) + { + dst = pixels + y * stride + (x+jj) * channels; + for (ii = 0; ii < len; ii++) + { + dst[0] = r; + dst[1] = g; + dst[2] = b; + dst += stride; + } + } +} + +static void +horz_line( + GdkPixbuf * pb, + guint8 r, + guint8 g, + guint8 b, + gint x, + gint y, + gint len, + gint width) +{ + guint8 *pixels = gdk_pixbuf_get_pixels (pb); + guint8 *dst; + gint ii, jj; + gint channels = gdk_pixbuf_get_n_channels (pb); + gint stride = gdk_pixbuf_get_rowstride (pb); + + for (jj = 0; jj < width; jj++) + { + dst = pixels + (y+jj) * stride + x * channels; + for (ii = 0; ii < len; ii++) + { + dst[0] = r; + dst[1] = g; + dst[2] = b; + dst += channels; + } + } +} + +static void +hash_pixbuf( + GdkPixbuf * pb, + gint x, + gint y, + gint w, + gint h, + gint step, + gint orientation) +{ + gint ii, jj; + gint line_width = 8; + struct + { + guint8 r; + guint8 g; + guint8 b; + } c[4] = + {{0x80, 0x80, 0x80},{0xC0, 0x80, 0x70},{0x80, 0xA0, 0x80},{0x70, 0x80, 0xA0}}; + + if (!orientation) + { + // vertical lines + for (ii = x, jj = 0; ii+line_width < x+w; ii += step, jj++) + { + vert_line(pb, c[jj&3].r, c[jj&3].g, c[jj&3].b, ii, y, h, line_width); + } + } + else + { + // horizontal lines + for (ii = y, jj = 0; ii+line_width < y+h; ii += step, jj++) + { + horz_line(pb, c[jj&3].r, c[jj&3].g, c[jj&3].b, x, ii, w, line_width); + } + } +} + GdkPixbuf* -ghb_get_preview_image(gint titleindex, gint index, GHashTable *settings, gboolean borders) +ghb_get_preview_image( + gint titleindex, + gint index, + signal_user_data_t *ud, + gint *out_width, + gint *out_height) { + GValue *settings; hb_title_t *title; hb_list_t *list; - list = hb_get_titles( h ); + settings = ud->settings; + list = hb_get_titles( h_scan ); if( !hb_list_count( list ) ) { /* No valid title, stop right there */ @@ -2866,97 +4804,51 @@ ghb_get_preview_image(gint titleindex, gint index, GHashTable *settings, gboolea 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 doesn't compensate for anamorphic, so lets + // calculate scale factors + gint width, height, par_width = 1, par_height = 1; + gint pic_par = ghb_settings_combo_int(settings, "PicturePAR"); + if (pic_par) + { + hb_set_anamorphic_size( title->job, &width, &height, + &par_width, &par_height ); + } + + // Make sure we have a big enough buffer to receive the image from libhb + gint dstWidth = title->job->width; + gint dstHeight= title->job->height; - // hb_get_preview can't handle sizes that are larger than the original title - // dimensions - if (title->job->width > title->width) - title->job->width = title->width; - - if (title->job->height > title->height) - title->job->height = title->height; - // And also creates artifacts if the width is not a multiple of 8 - //title->job->width = ((title->job->width + 4) >> 3) << 3; - // And the height must be a multiple of 2 - //title->job->height = ((title->job->height + 1) >> 1) << 1; - - // Make sure we have a big enough buffer to receive the image from libhb. libhb - // creates images with a one-pixel border around the original content. Hence we - // add 2 pixels horizontally and vertically to the buffer size. - gint srcWidth = title->width + 2; - gint srcHeight= title->height + 2; - gint dstWidth = title->width; - gint dstHeight= title->height; - gint borderTop = 1; - gint borderLeft = 1; - if (borders) - { - // |<---------- title->width ----------->| - // | |<---- title->job->width ---->| | - // | | | | - // ....................................... - // ....+-----------------------------+.... - // ....| |....<-- gray border - // ....| |.... - // ....| |.... - // ....| |<------- image - // ....| |.... - // ....| |.... - // ....| |.... - // ....| |.... - // ....| |.... - // ....+-----------------------------+.... - // ....................................... - dstWidth = title->job->width; - dstHeight = title->job->height; - borderTop = (srcHeight - dstHeight) / 2; - borderLeft = (srcWidth - dstWidth) / 2; - g_debug("boarders removed\n"); - } - - g_debug("src %d x %d\n", srcWidth, srcHeight); - g_debug("dst %d x %d\n", dstWidth, dstHeight); - g_debug("job dim %d x %d\n", title->job->width, title->job->height); - g_debug("title crop %d:%d:%d:%d\n", - title->crop[0], - title->crop[1], - title->crop[2], - title->crop[3]); - g_debug("job crop %d:%d:%d:%d\n", - title->job->crop[0], - title->job->crop[1], - title->job->crop[2], - title->job->crop[3]); static guint8 *buffer = NULL; static gint bufferSize = 0; - gint newSize; - newSize = srcWidth * srcHeight * 4; + + newSize = dstWidth * dstHeight * 4; if( bufferSize < newSize ) { 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 - // border around libhb's image. + // libhb's format something suitable. - // The image data returned by hb_get_preview is 4 bytes per pixel, BGRA format. - // Alpha is ignored. + // The image data returned by hb_get_preview is 4 bytes per pixel, + // BGRA format. Alpha is ignored. GdkPixbuf *preview = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8, dstWidth, dstHeight); guint8 *pixels = gdk_pixbuf_get_pixels (preview); guint32 *src = (guint32*)buffer; guint8 *dst = pixels; - src += borderTop * srcWidth; // skip top rows in src to get to first row of dst - src += borderLeft; // skip left pixels in src to get to first pixel of dst + gint ii, jj; gint channels = gdk_pixbuf_get_n_channels (preview); gint stride = gdk_pixbuf_get_rowstride (preview); guint8 *tmp; + for (ii = 0; ii < dstHeight; ii++) { tmp = dst; @@ -2969,24 +4861,72 @@ ghb_get_preview_image(gint titleindex, gint index, GHashTable *settings, gboolea src++; } dst += stride; - src += (srcWidth - dstWidth); // skip to next row in src } - // 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"); - if (anamorphic) + gint w = ghb_settings_get_int(settings, "scale_width"); + gint h = ghb_settings_get_int(settings, "scale_height"); + ghb_par_scale(ud, &w, &h, par_width, par_height); + + gint c0, c1, c2, c3; + c0 = ghb_settings_get_int(settings, "PictureTopCrop"); + c1 = ghb_settings_get_int(settings, "PictureBottomCrop"); + c2 = ghb_settings_get_int(settings, "PictureLeftCrop"); + c3 = ghb_settings_get_int(settings, "PictureRightCrop"); + + gdouble xscale = (gdouble)w / (gdouble)(title->width - c2 - c3); + gdouble yscale = (gdouble)h / (gdouble)(title->height - c0 - c1); + + ghb_par_scale(ud, &dstWidth, &dstHeight, par_width, par_height); + *out_width = w; + *out_height = h; + if (ghb_settings_get_boolean(settings, "reduce_hd_preview")) { - 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; + GdkScreen *ss; + gint s_w, s_h; + gint orig_w, orig_h; + gint factor = 80; + + if (ghb_settings_get_boolean(settings, "preview_fullscreen")) + { + factor = 100; + } + ss = gdk_screen_get_default(); + s_w = gdk_screen_get_width(ss); + s_h = gdk_screen_get_height(ss); + orig_w = dstWidth; + orig_h = dstHeight; + + if (dstWidth > s_w * factor / 100) + { + dstWidth = s_w * factor / 100; + dstHeight = dstHeight * dstWidth / orig_w; + } + if (dstHeight > s_h * factor / 100) + { + dstHeight = s_h * factor / 100; + dstWidth = dstWidth * dstHeight / orig_h; + } + xscale *= (gdouble)dstWidth / orig_w; + yscale *= (gdouble)dstHeight / orig_h; + w *= (gdouble)dstWidth / orig_w; + h *= (gdouble)dstHeight / orig_h; } - - g_debug("scaled %d x %d\n", dstWidth, dstHeight); GdkPixbuf *scaled_preview; scaled_preview = gdk_pixbuf_scale_simple(preview, dstWidth, dstHeight, GDK_INTERP_HYPER); + if (ghb_settings_get_boolean(settings, "show_crop")) + { + c0 *= yscale; + c1 *= yscale; + c2 *= xscale; + c3 *= xscale; + // Top + hash_pixbuf(scaled_preview, c2, 0, w, c0, 32, 0); + // Bottom + hash_pixbuf(scaled_preview, c2, dstHeight-c1, w, c1, 32, 0); + // Left + hash_pixbuf(scaled_preview, 0, c0, c2, h, 32, 1); + // Right + hash_pixbuf(scaled_preview, dstWidth-c3, c0, c3, h, 32, 1); + } g_object_unref (preview); return scaled_preview; } @@ -3021,10 +4961,11 @@ ghb_dvd_volname(const gchar *device) { gchar *name; name = hb_dvd_name((gchar*)device); - if (name != NULL) + if (name != NULL && name[0] != 0) { + name = g_strdup(name); sanitize_volname(name); - return g_strdup(name); + return name; } - return name; + return NULL; }