X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=gtk%2Fsrc%2Fhb-backend.c;h=bb41aa4ccc21d01b3b8dd33e6ed2209311de96d1;hb=4221965a8d37b5a3dd665b9de4754fbc8ebb0ab6;hp=8ff42aac4817ec162bf52cd7762a380d0773d960;hpb=721f6834d51f85ebb5763ad8d34d2e18bb7db498;p=handbrake-jp%2Fhandbrake-jp-git.git
diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c
index 8ff42aac..bb41aa4c 100644
--- a/gtk/src/hb-backend.c
+++ b/gtk/src/hb-backend.c
@@ -30,6 +30,9 @@
#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"
@@ -48,19 +51,36 @@ typedef struct
options_map_t *map;
} combo_opts_t;
-static const gchar *index_str[] =
-{
- "0",
- "1",
- "2",
- "3",
- "4",
- "5",
- "6",
- "7",
- "8",
- "9",
- "10",
+static 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[] =
@@ -101,6 +121,32 @@ combo_opts_t logging_opts =
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"},
@@ -118,7 +164,6 @@ static options_map_t d_container_opts[] =
{
{"MKV", "mkv", HB_MUX_MKV, "mkv"},
{"MP4", "mp4", HB_MUX_MP4, "mp4"},
- {"M4V", "m4v", HB_MUX_MP4, "m4v"},
};
combo_opts_t container_opts =
{
@@ -128,7 +173,7 @@ combo_opts_t container_opts =
static options_map_t d_detel_opts[] =
{
- {"None", "none", 0, ""},
+ {"Off", "off", 0, ""},
{"Custom", "custom", 1, ""},
{"Default","default",2, NULL},
};
@@ -140,7 +185,7 @@ combo_opts_t detel_opts =
static options_map_t d_decomb_opts[] =
{
- {"None", "none", 0, ""},
+ {"Off", "off", 0, ""},
{"Custom", "custom", 1, ""},
{"Default","default",2, NULL},
};
@@ -152,7 +197,7 @@ combo_opts_t decomb_opts =
static options_map_t d_deint_opts[] =
{
- {"None", "none", 0, ""},
+ {"Off", "off", 0, ""},
{"Custom", "custom", 1, ""},
{"Fast", "fast", 2, "-1:-1:-1:0:1"},
{"Slow", "slow", 3, "2:-1:-1:0:1"},
@@ -166,7 +211,7 @@ combo_opts_t deint_opts =
static options_map_t d_denoise_opts[] =
{
- {"None", "none", 0, ""},
+ {"Off", "off", 0, ""},
{"Custom", "custom", 1, ""},
{"Weak", "weak", 2, "2:1:2:3"},
{"Medium", "medium", 3, "3:2:2:3"},
@@ -181,8 +226,8 @@ combo_opts_t denoise_opts =
static options_map_t d_vcodec_opts[] =
{
{"H.264 (x264)", "x264", HB_VCODEC_X264, ""},
- {"MPEG-4 (FFMPEG)", "ffmpeg", HB_VCODEC_FFMPEG, ""},
- {"Theora", "theora", HB_VCODEC_THEORA, ""},
+ {"MPEG-4 (FFmpeg)", "ffmpeg", HB_VCODEC_FFMPEG, ""},
+ {"VP3 (Theora)", "theora", HB_VCODEC_THEORA, ""},
};
combo_opts_t vcodec_opts =
{
@@ -192,11 +237,12 @@ combo_opts_t vcodec_opts =
static options_map_t d_acodec_opts[] =
{
- {"AAC (faac)", "faac", HB_ACODEC_FAAC, "faac"},
- {"MP3 (lame)", "lame", HB_ACODEC_LAME, "lame"},
+ {"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"},
+ {"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 =
{
@@ -254,6 +300,7 @@ static options_map_t d_subme_opts[] =
{"7", "7", 7, "7"},
{"8", "8", 8, "8"},
{"9", "9", 9, "9"},
+ {"10", "10", 10, "10"},
};
combo_opts_t subme_opts =
{
@@ -312,9 +359,12 @@ typedef struct
combo_name_map_t combo_name_map[] =
{
+ {"WhenComplete", &when_complete_opts},
{"PicturePAR", &par_opts},
- {"PictureAlignment", &alignment_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},
@@ -329,12 +379,53 @@ combo_name_map_t combo_name_map[] =
{"x264_subme", &subme_opts},
{"x264_analyse", &analyse_opts},
{"x264_trellis", &trellis_opts},
- {"Subtitles", &subtitle_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
{
@@ -385,21 +476,20 @@ const iso639_lang_t ghb_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" },
@@ -413,10 +503,10 @@ const iso639_lang_t ghb_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" },
@@ -450,6 +540,7 @@ const iso639_lang_t ghb_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" },
@@ -461,13 +552,14 @@ const iso639_lang_t ghb_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" },
@@ -488,7 +580,6 @@ const iso639_lang_t ghb_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" },
@@ -498,10 +589,10 @@ const iso639_lang_t ghb_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" },
@@ -601,7 +692,6 @@ ghb_vquality_range(
*inverted = TRUE;
} break;
- case HB_VCODEC_XVID:
case HB_VCODEC_FFMPEG:
{
*min = 1;
@@ -628,6 +718,26 @@ ghb_vquality_range(
}
}
+static const gchar*
+lookup_generic_string(combo_opts_t *opts, const GValue *gval)
+{
+ gint ii;
+ gchar *str;
+ const gchar *result = "";
+
+ str = ghb_value_string(gval);
+ for (ii = 0; ii < opts->count; ii++)
+ {
+ if (strcmp(opts->map[ii].shortOpt, str) == 0)
+ {
+ result = opts->map[ii].svalue;
+ break;
+ }
+ }
+ g_free(str);
+ return result;
+}
+
static gint
lookup_generic_int(combo_opts_t *opts, const GValue *gval)
{
@@ -896,7 +1006,10 @@ lookup_audio_lang_option(const GValue *rate)
{
if (strcmp(ghb_language_table[ii].iso639_2, str) == 0)
{
- result = ghb_language_table[ii].eng_name;
+ 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;
}
}
@@ -921,25 +1034,6 @@ get_acodec_value(gint val)
return value;
}
-#if 0
-static GValue*
-get_abitrate_value(gint val)
-{
- GValue *value = NULL;
- gint ii;
-
- for (ii = 0; ii < hb_audio_bitrates_count; ii++)
- {
- if (hb_audio_bitrates[ii].rate == val)
- {
- value = ghb_string_value_new(hb_audio_bitrates[ii].string);
- break;
- }
- }
- return value;
-}
-#endif
-
static GValue*
get_amix_value(gint val)
{
@@ -982,6 +1076,135 @@ ghb_hb_cleanup(gboolean 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;
@@ -1092,19 +1315,15 @@ ghb_grey_combo_options(GtkBuilder *builder)
grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_LAME, FALSE);
grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_VORBIS, FALSE);
- gboolean allow_ac3 = TRUE;
- allow_ac3 = (container != HB_MUX_OGM);
+ gboolean allow_dca = TRUE;
+ allow_dca = (container != HB_MUX_MP4);
- if (allow_ac3)
- {
- grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_AC3, FALSE);
+ 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_AC3, TRUE);
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);
@@ -1129,27 +1348,18 @@ ghb_grey_combo_options(GtkBuilder *builder)
grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_VORBIS, TRUE);
grey_combo_box_item(builder, "VideoEncoder", HB_VCODEC_THEORA, TRUE);
}
- else if (container == HB_MUX_AVI)
- {
- grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_FAAC, TRUE);
- grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_VORBIS, TRUE);
- grey_combo_box_item(builder, "VideoEncoder", HB_VCODEC_THEORA, TRUE);
- }
- else if (container == HB_MUX_OGM)
- {
- grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_FAAC, TRUE);
- }
gboolean allow_mono = TRUE;
gboolean allow_stereo = TRUE;
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);
@@ -1158,9 +1368,8 @@ 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);
}
@@ -1172,6 +1381,18 @@ ghb_grey_combo_options(GtkBuilder *builder)
}
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
ghb_get_best_mix(gint titleindex, gint track, gint acodec, gint mix)
{
hb_audio_config_t *audio = NULL;
@@ -1191,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);
@@ -1202,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);
}
@@ -1255,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)
@@ -1271,7 +1494,7 @@ init_combo_box(GtkBuilder *builder, const gchar *name)
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);
+ "markup", 0, "sensitive", 1, NULL);
}
else
{ // Combo box entry
@@ -1285,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);
@@ -1292,7 +1516,7 @@ 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.0,
@@ -1301,13 +1525,15 @@ audio_samplerate_opts_set(GtkBuilder *builder, const gchar *name, hb_rate_t *rat
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, (gdouble)rates[ii].rate,
4, rates[ii].string,
-1);
+ g_free(str);
}
}
@@ -1365,13 +1591,14 @@ mix_opts_set(GtkBuilder *builder, const gchar *name)
GtkTreeIter iter;
GtkListStore *store;
gint ii;
+ gchar *str;
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.0,
@@ -1380,14 +1607,44 @@ mix_opts_set(GtkBuilder *builder, const gchar *name)
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, (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
@@ -1402,9 +1659,16 @@ language_opts_set(GtkBuilder *builder, const gchar *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, ghb_language_table[ii].eng_name,
+ 0, lang,
1, TRUE,
2, ghb_language_table[ii].iso639_2,
3, (gdouble)ii,
@@ -1524,6 +1788,7 @@ audio_track_opts_set(GtkBuilder *builder, const gchar *name, gint titleindex)
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);
@@ -1554,7 +1819,7 @@ audio_track_opts_set(GtkBuilder *builder, const gchar *name, gint titleindex)
// 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.0,
@@ -1566,17 +1831,20 @@ audio_track_opts_set(GtkBuilder *builder, const gchar *name, gint titleindex)
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, 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;
@@ -1584,19 +1852,18 @@ audio_track_opts_set(GtkBuilder *builder, const gchar *name, gint titleindex)
}
}
-
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 = NULL;
hb_title_t * title = NULL;
- hb_subtitle_t * subtitle;
- gint ii;
- gint count = 0;
+ hb_subtitle_t * subtitle;
+ gint ii, count = 0;
+ static char ** options = NULL;
- g_debug("subtitle_opts_set () %s\n", name);
+ g_debug("subtitle_track_opts_set ()\n");
store = get_combo_box_store(builder, name);
gtk_list_store_clear(store);
if (h_scan != NULL)
@@ -1612,74 +1879,77 @@ subtitle_opts_set(GtkBuilder *builder, const gchar *name, gint titleindex)
if (subtitle_opts.map) g_free(subtitle_opts.map);
if (count > 0)
{
- subtitle_opts.count = count+2;
- subtitle_opts.map = g_malloc((count+2)*sizeof(options_map_t));
+ subtitle_opts.count = count+1;
+ subtitle_opts.map = g_malloc((count+1)*sizeof(options_map_t));
}
else
{
- subtitle_opts.count = LANG_TABLE_SIZE+2;
- subtitle_opts.map = g_malloc((LANG_TABLE_SIZE+2)*sizeof(options_map_t));
+ subtitle_opts.count = LANG_TABLE_SIZE+1;
+ subtitle_opts.map = g_malloc((LANG_TABLE_SIZE+1)*sizeof(options_map_t));
}
- // 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.0,
- 4, "none",
- -1);
- subtitle_opts.map[0].option = "None";
- subtitle_opts.map[0].shortOpt = "none";
- subtitle_opts.map[0].ivalue = -2;
- subtitle_opts.map[0].svalue = "none";
gtk_list_store_append(store, &iter);
gtk_list_store_set(store, &iter,
- 0, "Autoselect",
+ 0, "Foreign Audio Search",
1, TRUE,
- 2, "auto",
+ 2, "-1",
3, -1.0,
4, "auto",
-1);
- subtitle_opts.map[0].option = "Same as audio";
- subtitle_opts.map[0].shortOpt = "auto";
+ 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)
{
+ 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, subtitle->lang,
+ 0, options[ii],
1, TRUE,
- 2, subtitle->iso639_2,
+ 2, index_str[ii],
3, (gdouble)ii,
4, subtitle->iso639_2,
-1);
- subtitle_opts.map[ii+2].option = subtitle->lang;
- subtitle_opts.map[ii+2].shortOpt = subtitle->iso639_2;
- subtitle_opts.map[ii+2].ivalue = ii;
- subtitle_opts.map[ii+2].svalue = subtitle->iso639_2;
}
+ options[count] = NULL;
}
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, ghb_language_table[ii].eng_name,
- 1, TRUE,
- 2, ghb_language_table[ii].iso639_2,
- 3, (gdouble)ii,
- 4, ghb_language_table[ii].iso639_2,
- -1);
- subtitle_opts.map[ii+2].option = ghb_language_table[ii].eng_name;
- subtitle_opts.map[ii+2].shortOpt = ghb_language_table[ii].iso639_2;
- subtitle_opts.map[ii+2].ivalue = ii;
- subtitle_opts.map[ii+2].svalue = ghb_language_table[ii].iso639_2;
+ 0, lang,
+ 1, TRUE,
+ 2, index_str[ii],
+ 3, (gdouble)ii,
+ 4, ghb_language_table[ii].iso639_2,
+ -1);
}
}
}
@@ -1711,6 +1981,32 @@ 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,
@@ -1742,9 +2038,9 @@ ghb_find_audio_track(
used = g_malloc0(count * sizeof(gboolean));
g_hash_table_insert(track_indices, &acodec, used);
}
- // Try to fine an item that matches the preferred language and
+ // Try to find an item that matches the preferred language and
// the passthru codec type
- if (acodec == HB_ACODEC_AC3 || acodec == HB_ACODEC_DCA)
+ if (acodec & (HB_ACODEC_AC3 | HB_ACODEC_DCA))
{
for (ii = 0; ii < count; ii++)
{
@@ -1759,7 +2055,7 @@ ghb_find_audio_track(
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) &&
+ if ((audio->in.codec & acodec) &&
(audio->lang.type < 2) &&
((strcmp(lang, audio->lang.iso639_2) == 0) ||
(strcmp(lang, "und") == 0)))
@@ -1777,7 +2073,7 @@ ghb_find_audio_track(
used[track] = TRUE;
return track;
}
- // Try to fine an item that matches the preferred language
+ // Try to find an item that matches the preferred language
for (ii = 0; ii < count; ii++)
{
if (used[ii])
@@ -1800,7 +2096,7 @@ ghb_find_audio_track(
}
// Try to fine an item that does not match the preferred language and
// matches the passthru codec type
- if (acodec == HB_ACODEC_AC3 || acodec == HB_ACODEC_DCA)
+ if (acodec & (HB_ACODEC_AC3 | HB_ACODEC_DCA))
{
for (ii = 0; ii < count; ii++)
{
@@ -1815,7 +2111,7 @@ ghb_find_audio_track(
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) &&
+ if ((audio->in.codec & acodec) &&
(audio->lang.type < 2))
{
if (channels > max_chan)
@@ -1868,40 +2164,172 @@ ghb_find_audio_track(
return track;
}
-static void
-generic_opts_set(GtkBuilder *builder, const gchar *name, combo_opts_t *opts)
+gint
+ghb_find_pref_subtitle_track(const gchar *lang)
{
- 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++)
+ gint ii, count;
+ count = subtitle_opts.count;
+ for (ii = 0; ii < 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);
+ if (strcmp(lang, subtitle_opts.map[ii].svalue) == 0)
+ {
+ return subtitle_opts.map[ii].ivalue;
+ }
}
+ return -2;
}
-combo_opts_t*
-find_combo_table(const gchar *name)
+gint
+ghb_find_cc_track(gint titleindex)
{
- 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;
+ 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)))
+ {
+ used[ii] = TRUE;
+ return ii;
+ }
+ }
+ }
+ 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;
@@ -1910,6 +2338,8 @@ find_combo_table(const gchar *name)
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)
@@ -1918,7 +2348,9 @@ ghb_lookup_combo_int(const gchar *name, const GValue *gval)
return lookup_video_rate_int(gval);
else if (strcmp(name, "AudioMixdown") == 0)
return lookup_mix_int(gval);
- else if (strcmp(name, "SourceAudioLang") == 0)
+ 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
{
@@ -1931,6 +2363,8 @@ ghb_lookup_combo_int(const gchar *name, const GValue *gval)
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)
@@ -1939,7 +2373,9 @@ ghb_lookup_combo_double(const gchar *name, const GValue *gval)
return lookup_video_rate_int(gval);
else if (strcmp(name, "AudioMixdown") == 0)
return lookup_mix_int(gval);
- else if (strcmp(name, "SourceAudioLang") == 0)
+ 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
{
@@ -1952,6 +2388,8 @@ ghb_lookup_combo_double(const gchar *name, const GValue *gval)
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)
@@ -1960,18 +2398,49 @@ ghb_lookup_combo_option(const gchar *name, const GValue *gval)
return lookup_video_rate_option(gval);
else if (strcmp(name, "AudioMixdown") == 0)
return lookup_mix_option(gval);
- else if (strcmp(name, "SourceAudioLang") == 0)
+ 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 0;
+ return NULL;
+}
+
+const gchar*
+ghb_lookup_combo_string(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_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;
@@ -1983,7 +2452,7 @@ ghb_update_ui_combo_box(GtkBuilder *builder, const gchar *name, gint user_data,
// 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)
{
@@ -1999,52 +2468,61 @@ ghb_update_ui_combo_box(GtkBuilder *builder, const gchar *name, gint user_data,
}
if (all)
{
- audio_bitrate_opts_set(builder, "AudioBitrate");
- audio_samplerate_opts_set(builder, "AudioSamplerate", hb_audio_rates, hb_audio_rates_count);
- video_rate_opts_set(builder, "VideoFramerate", hb_video_rates, hb_video_rates_count);
- mix_opts_set(builder, "AudioMixdown");
- language_opts_set(builder, "SourceAudioLang");
- subtitle_opts_set(builder, "Subtitles", user_data);
- title_opts_set(builder, "title");
- audio_track_opts_set(builder, "AudioTrack", user_data);
- generic_opts_set(builder, "VideoQualityGranularity", &vqual_granularity_opts);
- generic_opts_set(builder, "PicturePAR", &par_opts);
- generic_opts_set(builder, "PictureAlignment", &alignment_opts);
- generic_opts_set(builder, "LoggingLevel", &logging_opts);
- generic_opts_set(builder, "FileFormat", &container_opts);
- generic_opts_set(builder, "PictureDeinterlace", &deint_opts);
- generic_opts_set(builder, "PictureDetelecine", &detel_opts);
- generic_opts_set(builder, "PictureDecomb", &decomb_opts);
- generic_opts_set(builder, "PictureDenoise", &denoise_opts);
- generic_opts_set(builder, "VideoEncoder", &vcodec_opts);
- generic_opts_set(builder, "AudioEncoder", &acodec_opts);
- generic_opts_set(builder, "x264_direct", &direct_opts);
- generic_opts_set(builder, "x264_b_adapt", &badapt_opts);
- generic_opts_set(builder, "x264_me", &me_opts);
- generic_opts_set(builder, "x264_subme", &subme_opts);
- generic_opts_set(builder, "x264_analyse", &analyse_opts);
- generic_opts_set(builder, "x264_trellis", &trellis_opts);
+ 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(builder, "AudioBitrate");
+ audio_bitrate_opts_set(ud->builder, "AudioBitrate");
else if (strcmp(name, "AudioSamplerate") == 0)
- audio_samplerate_opts_set(builder, "AudioSamplerate", hb_audio_rates, hb_audio_rates_count);
+ audio_samplerate_opts_set(ud->builder, "AudioSamplerate", hb_audio_rates, hb_audio_rates_count);
else if (strcmp(name, "VideoFramerate") == 0)
- video_rate_opts_set(builder, "VideoFramerate", hb_video_rates, hb_video_rates_count);
+ video_rate_opts_set(ud->builder, "VideoFramerate", hb_video_rates, hb_video_rates_count);
else if (strcmp(name, "AudioMixdown") == 0)
- mix_opts_set(builder, "AudioMixdown");
- else if (strcmp(name, "SourceAudioLang") == 0)
- language_opts_set(builder, "SourceAudioLang");
- else if (strcmp(name, "Subtitles") == 0)
- subtitle_opts_set(builder, "Subtitles", user_data);
+ 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(builder, "title");
+ 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(builder, "AudioTrack", user_data);
+ audio_track_opts_set(ud->builder, "AudioTrack", user_data);
else
- generic_opts_set(builder, name, find_combo_table(name));
+ generic_opts_set(ud->builder, name, find_combo_table(name));
}
if (handler_id > 0)
{
@@ -2061,8 +2539,9 @@ init_ui_combo_boxes(GtkBuilder *builder)
init_combo_box(builder, "AudioSamplerate");
init_combo_box(builder, "VideoFramerate");
init_combo_box(builder, "AudioMixdown");
- init_combo_box(builder, "SourceAudioLang");
- init_combo_box(builder, "Subtitles");
+ init_combo_box(builder, "SrtLanguage");
+ init_combo_box(builder, "PreferredLanguage");
+ init_combo_box(builder, "SrtCodeset");
init_combo_box(builder, "title");
init_combo_box(builder, "AudioTrack");
for (ii = 0; combo_name_map[ii].name != NULL; ii++)
@@ -2072,8 +2551,8 @@ init_ui_combo_boxes(GtkBuilder *builder)
}
static const char * turbo_opts =
- "ref=1:subme=1:me=dia:analyse=none:trellis=0:"
- "no-fast-pskip=0:8x8dct=0:weightb=0";
+ "ref=1:subme=2:me=dia:analyse=none:trellis=0:"
+ "no-fast-pskip=0:8x8dct=0";
// Construct the x264 options string
// The result is allocated, so someone must free it at some point.
@@ -2164,7 +2643,7 @@ ghb_ac3_in_audio_list(const GValue *audio_list)
asettings = ghb_array_get_nth(audio_list, ii);
acodec = ghb_settings_combo_int(asettings, "AudioEncoder");
- if (acodec == HB_ACODEC_AC3)
+ if (acodec & HB_ACODEC_AC3)
return TRUE;
}
return FALSE;
@@ -2177,11 +2656,14 @@ audio_bitrate_opts_add(GtkBuilder *builder, const gchar *name, gint rate)
GtkListStore *store;
gchar *str;
- g_debug("audio_rate_opts_add ()\n");
+ 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);
+ str = g_strdup_printf ("%d", rate);
gtk_list_store_append(store, &iter);
gtk_list_store_set(store, &iter,
0, str,
@@ -2195,7 +2677,11 @@ audio_bitrate_opts_add(GtkBuilder *builder, const gchar *name, gint rate)
}
static void
-audio_bitrate_opts_clean(GtkBuilder *builder, const gchar *name, gint last_rate)
+audio_bitrate_opts_clean(
+ GtkBuilder *builder,
+ const gchar *name,
+ gint first_rate,
+ gint last_rate)
{
GtkTreeIter iter;
GtkListStore *store;
@@ -2203,6 +2689,7 @@ audio_bitrate_opts_clean(GtkBuilder *builder, const gchar *name, gint last_rate)
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);
@@ -2216,7 +2703,7 @@ audio_bitrate_opts_clean(GtkBuilder *builder, const gchar *name, gint last_rate)
{
done = !gtk_list_store_remove(store, &iter);
}
- else if (ivalue > last)
+ else if (ivalue < first || ivalue > last)
{
ii++;
gtk_list_store_set(store, &iter, 1, FALSE, -1);
@@ -2238,6 +2725,7 @@ 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);
@@ -2245,13 +2733,16 @@ audio_bitrate_opts_set(GtkBuilder *builder, const gchar *name)
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, hb_audio_bitrates[ii].string,
+ 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);
}
}
@@ -2262,20 +2753,23 @@ ghb_set_passthru_bitrate_opts(GtkBuilder *builder, gint bitrate)
}
void
-ghb_set_default_bitrate_opts(GtkBuilder *builder, gint last_rate)
+ghb_set_default_bitrate_opts(
+ GtkBuilder *builder,
+ gint first_rate,
+ gint last_rate)
{
- audio_bitrate_opts_clean(builder, "AudioBitrate", last_rate);
+ audio_bitrate_opts_clean(builder, "AudioBitrate", first_rate, last_rate);
}
static ghb_status_t hb_status;
void
-ghb_combo_init(GtkBuilder *builder)
+ghb_combo_init(signal_user_data_t *ud)
{
// 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
@@ -2545,6 +3039,8 @@ ghb_get_title_info(ghb_title_info_t *tinfo, gint titleindex)
tinfo->minutes = title->minutes;
tinfo->seconds = title->seconds;
tinfo->duration = title->duration;
+
+ tinfo->angle_count = title->angle_count;
return TRUE;
}
@@ -2565,7 +3061,7 @@ gboolean
ghb_audio_is_passthru(gint acodec)
{
g_debug("ghb_audio_is_passthru () \n");
- return (acodec == HB_ACODEC_AC3) || (acodec == HB_ACODEC_DCA);
+ return (acodec & (HB_ACODEC_AC3 | HB_ACODEC_DCA));
}
gint
@@ -2579,24 +3075,35 @@ 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;
- gint pic_par, disp_width, disp_height, scale_width, 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");
- disp_width = ghb_settings_get_int(ud->settings, "PictureDisplayWidth");
- disp_height = ghb_settings_get_int(ud->settings, "PictureDisplayHeight");
- scale_width = ghb_settings_get_int(ud->settings, "scale_width");
- scale_height = ghb_settings_get_int(ud->settings, "scale_height");
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;
- enable_keep_aspect = (pic_par != 1 && pic_par != 2);
- GtkWidget *widget;
+ 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");
@@ -2605,18 +3112,14 @@ picture_settings_deps(signal_user_data_t *ud)
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);
- if (!enable_keep_aspect)
- {
- ghb_ui_update(ud, "PictureKeepRatio", ghb_boolean_value(TRUE));
- }
- if (pic_par == 1)
- {
- ghb_ui_update(ud, "autoscale", ghb_boolean_value(TRUE));
- }
}
void
@@ -2638,9 +3141,9 @@ ghb_set_scale(signal_user_data_t *ud, gint mode)
gint mod;
gint max_width = 0;
gint max_height = 0;
+ static gboolean busy = FALSE;
g_debug("ghb_set_scale ()\n");
-
if (h_scan == NULL) return;
list = hb_get_titles( h_scan );
if( !hb_list_count( list ) )
@@ -2655,16 +3158,26 @@ ghb_set_scale(signal_user_data_t *ud, gint mode)
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
- mod = ghb_settings_combo_int(ud->settings, "PictureAlignment");
+ 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_boolean(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
@@ -2679,39 +3192,36 @@ ghb_set_scale(signal_user_data_t *ud, gint mode)
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;
- if (autocrop && ghb_get_title_info (&tinfo, titleindex))
+ ghb_get_title_info (&tinfo, titleindex);
+ if (autocrop)
{
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 = 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;
- }
- if (mod == 1)
- {
- crop[0] = MOD_UP(crop[0], 2);
- crop[1] = MOD_UP(crop[1], 2);
- crop[2] = MOD_UP(crop[2], 2);
- crop[3] = MOD_UP(crop[3], 2);
- }
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]));
@@ -2723,17 +3233,29 @@ ghb_set_scale(signal_user_data_t *ud, gint mode)
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 (mod == 1)
- {
- crop[0] = MOD_UP(crop[0], 2);
- crop[1] = MOD_UP(crop[1], 2);
- crop[2] = MOD_UP(crop[2], 2);
- crop[3] = MOD_UP(crop[3], 2);
- 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]));
- }
+ }
+ 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]));
}
hb_reduce(&aspect_n, &aspect_d,
title->width * title->pixel_aspect_width,
@@ -2754,16 +3276,6 @@ ghb_set_scale(signal_user_data_t *ud, gint mode)
max_height = MOD_DOWN(
ghb_settings_get_int(ud->settings, "PictureHeight"), mod);
}
- // Adjust dims according to max values
- if (!max_height)
- {
- max_height = MOD_DOWN(crop_height, mod);
- }
- if (!max_width)
- {
- max_width = MOD_DOWN(crop_width, mod);
- }
- // Align max dims
g_debug("max_width %d, max_height %d\n", max_width, max_height);
if (width < 16)
@@ -2773,6 +3285,8 @@ ghb_set_scale(signal_user_data_t *ud, gint mode)
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)
@@ -2784,45 +3298,54 @@ ghb_set_scale(signal_user_data_t *ud, gint mode)
// 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) + 0.5;
+ width = ((double)height * crop_width / crop_height) + mod / 2;
job->width = width;
job->height = height;
- if (max_width)
- job->maxWidth = max_width;
- if (max_height)
- job->maxHeight = max_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)
{
- gint dar_width, dar_height;
+ job->anamorphic.keep_display_aspect = 0;
if (mode & GHB_PIC_KEEP_PAR)
{
- par_width = ghb_settings_get_int(ud->settings,
- "PicturePARWidth");
- par_height = ghb_settings_get_int(ud->settings,
- "PicturePARHeight");
- dar_width = ((gdouble)width * par_width / par_height) + 0.5;
- dar_height = height;
+ job->anamorphic.par_width =
+ ghb_settings_get_int(ud->settings, "PicturePARWidth");
+ job->anamorphic.par_height =
+ ghb_settings_get_int(ud->settings, "PicturePARHeight");
}
else
{
- dar_width = ghb_settings_get_int(ud->settings,
- "PictureDisplayWidth");
- dar_height = ghb_settings_get_int(ud->settings,
- "PictureDisplayHeight");
+ job->anamorphic.dar_width =
+ ghb_settings_get_int(ud->settings,
+ "PictureDisplayWidth");
+ job->anamorphic.dar_height = height;
}
- job->anamorphic.dar_width = dar_width;
- job->anamorphic.dar_height = dar_height;
}
else
{
- job->anamorphic.dar_width = 0;
- job->anamorphic.dar_height = 0;
+ 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");
+ }
}
else
{
@@ -2901,11 +3424,11 @@ ghb_set_scale(signal_user_data_t *ud, gint mode)
}
ghb_ui_update(ud, "display_aspect", ghb_string_value(str));
g_free(str);
- ghb_ui_update(ud, "par_width", ghb_int64_value(par_width));
- ghb_ui_update(ud, "par_height", ghb_int64_value(par_height));
+ 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));
- picture_settings_deps(ud);
+ busy = FALSE;
}
static void
@@ -2918,28 +3441,58 @@ set_preview_job_settings(hb_job_t *job, GValue *settings)
job->anamorphic.mode = ghb_settings_combo_int(settings, "PicturePAR");
job->anamorphic.modulus =
- ghb_settings_combo_int(settings, "PictureAlignment");
+ ghb_settings_combo_int(settings, "PictureModulus");
job->width = ghb_settings_get_int(settings, "scale_width");
job->height = ghb_settings_get_int(settings, "scale_height");
+ 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;
+ }
- gint deint = ghb_settings_combo_int(settings, "PictureDeinterlace");
- gint decomb = ghb_settings_combo_int(settings, "PictureDecomb");
- job->deinterlace = (!decomb && deint == 0) ? 0 : 1;
-
- gboolean keep_aspect;
- keep_aspect = ghb_settings_get_boolean(settings, "PictureKeepRatio");
- if (job->anamorphic.mode == 3 && !keep_aspect)
+ gboolean decomb_deint = ghb_settings_get_boolean(settings, "PictureDecombDeinterlace");
+ if (decomb_deint)
{
- gint disp_width, disp_height;
- disp_width = ghb_settings_get_int(settings, "PictureDisplayWidth");
- disp_height = ghb_settings_get_int(settings, "PictureDisplayHeight");
- job->anamorphic.dar_width = disp_width;
- job->anamorphic.dar_height = disp_height;
+ 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;
+ }
}
}
@@ -2996,12 +3549,13 @@ ghb_validate_filters(signal_user_data_t *ud)
gint index;
gchar *message;
- // deinte 4
+ gboolean decomb_deint = ghb_settings_get_boolean(ud->settings, "PictureDecombDeinterlace");
+ // deinte
index = ghb_settings_combo_int(ud->settings, "PictureDeinterlace");
- if (index == 1)
+ if (!decomb_deint && index == 1)
{
str = ghb_settings_get_string(ud->settings, "PictureDeinterlaceCustom");
- if (!ghb_validate_filter_string(str, 4))
+ if (!ghb_validate_filter_string(str, -1))
{
message = g_strdup_printf(
"Invalid Deinterlace Settings:\n\n%s\n",
@@ -3018,7 +3572,7 @@ ghb_validate_filters(signal_user_data_t *ud)
if (index == 1)
{
str = ghb_settings_get_string(ud->settings, "PictureDetelecineCustom");
- if (!ghb_validate_filter_string(str, 6))
+ if (!ghb_validate_filter_string(str, -1))
{
message = g_strdup_printf(
"Invalid Detelecine Settings:\n\n%s\n",
@@ -3030,12 +3584,12 @@ ghb_validate_filters(signal_user_data_t *ud)
}
g_free(str);
}
- // decomb 4
+ // decomb
index = ghb_settings_combo_int(ud->settings, "PictureDecomb");
- if (index == 1)
+ if (decomb_deint && index == 1)
{
str = ghb_settings_get_string(ud->settings, "PictureDecombCustom");
- if (!ghb_validate_filter_string(str, 7))
+ if (!ghb_validate_filter_string(str, -1))
{
message = g_strdup_printf(
"Invalid Decomb Settings:\n\n%s\n",
@@ -3047,12 +3601,12 @@ ghb_validate_filters(signal_user_data_t *ud)
}
g_free(str);
}
- // denois 4
+ // denois
index = ghb_settings_combo_int(ud->settings, "PictureDenoise");
if (index == 1)
{
str = ghb_settings_get_string(ud->settings, "PictureDenoiseCustom");
- if (!ghb_validate_filter_string(str, 4))
+ if (!ghb_validate_filter_string(str, -1))
{
message = g_strdup_printf(
"Invalid Denoise Settings:\n\n%s\n",
@@ -3075,27 +3629,179 @@ ghb_validate_video(signal_user_data_t *ud)
mux = ghb_settings_combo_int(ud->settings, "FileFormat");
vcodec = ghb_settings_combo_int(ud->settings, "VideoEncoder");
- if ((mux == HB_MUX_MP4 || mux == HB_MUX_AVI) &&
- (vcodec == HB_VCODEC_THEORA))
+ 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;
+ 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;
@@ -3132,25 +3838,26 @@ ghb_validate_audio(signal_user_data_t *ud)
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 != HB_ACODEC_AC3 && codec == HB_ACODEC_AC3) ||
- (taudio->in.codec != HB_ACODEC_DCA && codec == HB_ACODEC_DCA))
+ if (!(taudio->in.codec & codec) &&
+ (codec & (HB_ACODEC_AC3 | HB_ACODEC_DCA)))
{
// Not supported. AC3 is passthrough only, so input must be AC3
- char *str;
- str = (codec == HB_ACODEC_AC3) ? "AC-3" : "DTS";
message = g_strdup_printf(
- "The source does not support %s 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.", str);
+ "If you continue, one will be chosen for you.");
if (!ghb_message_dialog(GTK_MESSAGE_WARNING, message, "Cancel", "Continue"))
{
g_free(message);
return FALSE;
}
g_free(message);
- if (mux == HB_MUX_AVI)
+ if (mux == HB_MUX_MKV)
{
codec = HB_ACODEC_LAME;
}
@@ -3177,40 +3884,10 @@ ghb_validate_audio(signal_user_data_t *ud)
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)
- {
- a_unsup = "FAAC";
- codec = HB_ACODEC_LAME;
- }
- 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;
- }
- if (codec == HB_ACODEC_AC3)
- {
- a_unsup = "AC-3";
- codec = HB_ACODEC_VORBIS;
- }
if (codec == HB_ACODEC_DCA)
{
a_unsup = "DTS";
- codec = HB_ACODEC_VORBIS;
+ codec = HB_ACODEC_FAAC;
}
}
if (a_unsup)
@@ -3236,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);
@@ -3247,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);
@@ -3313,7 +3990,6 @@ ghb_validate_vquality(GValue *settings)
max = 30;
} break;
- case HB_VCODEC_XVID:
case HB_VCODEC_FFMPEG:
{
min = 1;
@@ -3383,6 +4059,7 @@ add_job(hb_handle_t *h, GValue *js, gint unique_id, gint titleindex)
job = title->job;
if (job == NULL) return;
+ 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)
{
@@ -3412,6 +4089,8 @@ add_job(hb_handle_t *h, GValue *js, gint unique_id, gint titleindex)
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 )
{
GValue *chapters;
@@ -3449,25 +4128,42 @@ add_job(hb_handle_t *h, GValue *js, gint unique_id, gint titleindex)
job->crop[3] = ghb_settings_get_int(js, "PictureRightCrop");
+ 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)
+ 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, "PictureAlignment");
+ job->anamorphic.modulus = ghb_settings_combo_int(js, "PictureModulus");
+ if (job->anamorphic.mode)
+ {
+ 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;
+ }
+ }
/* Add selected filters */
job->filters = hb_list_init();
- gint vrate = ghb_settings_combo_int(js, "VideoFramerate");
- if( vrate == 0 && ghb_settings_combo_int(js, "PictureDetelecine" ) )
- job->vfr = 1;
- else
- job->vfr = 0;
-
gint detel = ghb_settings_combo_int(js, "PictureDetelecine");
if ( detel )
{
@@ -3481,7 +4177,7 @@ add_job(hb_handle_t *h, GValue *js, gint unique_id, gint titleindex)
hb_filter_detelecine.settings = detel_str;
hb_list_add( job->filters, &hb_filter_detelecine );
}
- if ( decomb )
+ if ( decomb_deint && decomb )
{
if (decomb != 1)
{
@@ -3529,11 +4225,10 @@ add_job(hb_handle_t *h, GValue *js, gint unique_id, gint titleindex)
job->height = ghb_settings_get_int(js, "scale_height");
job->vcodec = ghb_settings_combo_int(js, "VideoEncoder");
- if ((job->mux == HB_MUX_MP4 || job->mux == HB_MUX_AVI) &&
- (job->vcodec == HB_VCODEC_THEORA))
+ 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))
{
@@ -3551,13 +4246,8 @@ add_job(hb_handle_t *h, GValue *js, gint unique_id, gint titleindex)
job->vquality = -1.0;
job->vbitrate = ghb_settings_get_int(js, "VideoAvgBitrate");
}
- // AVI container does not support variable frame rate.
- if (job->mux == HB_MUX_AVI)
- {
- job->vfr = FALSE;
- job->cfr = 1;
- }
+ gint vrate = ghb_settings_combo_int(js, "VideoFramerate");
if( vrate == 0 )
{
job->vrate = title->rate;
@@ -3570,18 +4260,9 @@ add_job(hb_handle_t *h, GValue *js, gint unique_id, gint titleindex)
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);
- }
const GValue *audio_list;
- gint count;
+ gint count, ii;
gint tcount = 0;
audio_list = ghb_settings_get_value(js, "audio_list");
@@ -3599,53 +4280,56 @@ add_job(hb_handle_t *h, GValue *js, gint unique_id, gint titleindex)
audio.out.codec = ghb_settings_combo_int(asettings, "AudioEncoder");
taudio = (hb_audio_config_t *) hb_list_audio_config_item(
title->list_audio, audio.in.track );
- if ((taudio->in.codec != HB_ACODEC_AC3 &&
- audio.out.codec == HB_ACODEC_AC3) ||
- (taudio->in.codec != HB_ACODEC_DCA &&
- audio.out.codec == HB_ACODEC_DCA))
+ 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) ||
- (audio.out.codec == HB_ACODEC_DCA)))
- {
- // ogm/faac|ac3 combination is not supported.
- audio.out.codec = HB_ACODEC_VORBIS;
- }
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
{
+ 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);
@@ -3656,6 +4340,9 @@ add_job(hb_handle_t *h, GValue *js, gint unique_id, gint titleindex)
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
@@ -3676,7 +4363,112 @@ add_job(hb_handle_t *h, GValue *js, gint unique_id, gint titleindex)
dest_str = ghb_settings_get_string(js, "destination");
job->file = dest_str;
- job->crf = ghb_settings_get_boolean(js, "constant_rate_factor");
+
+ 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
@@ -3684,47 +4476,15 @@ add_job(hb_handle_t *h, GValue *js, gint unique_id, gint titleindex)
// The short story is THIS LEAKS.
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;
- }
- gint subtitle;
- gchar *slang = ghb_settings_get_string(js, "Subtitles");
- subtitle = -2; // default to none
- if (strcmp(slang, "auto") == 0)
- {
- subtitle = -1;
+ g_free(x264opts);
+ x264opts = NULL;
}
- else
- {
- gint scount;
- hb_subtitle_t * subt;
- scount = hb_list_count(title->list_subtitle);
- for (ii = 0; ii < scount; ii++)
- {
- subt = (hb_subtitle_t *)hb_list_item(title->list_subtitle, ii);
- if (strcmp(slang, subt->iso639_2) == 0)
- {
- subtitle = ii;
- break;
- }
- }
- }
- gboolean forced_subtitles = ghb_settings_get_boolean(js, "SubtitlesForced");
- 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
@@ -3732,27 +4492,15 @@ add_job(hb_handle_t *h, GValue *js, gint unique_id, gint titleindex)
*/
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_boolean(js, "VideoTwoPass") &&
!ghb_settings_get_boolean(js, "vquality_type_constant"))
{
@@ -3761,27 +4509,32 @@ add_job(hb_handle_t *h, GValue *js, gint unique_id, gint titleindex)
* 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_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
{
@@ -3789,10 +4542,14 @@ add_job(hb_handle_t *h, GValue *js, gint unique_id, gint titleindex)
* 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);
@@ -3800,7 +4557,6 @@ add_job(hb_handle_t *h, GValue *js, gint unique_id, gint titleindex)
//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
@@ -3809,7 +4565,7 @@ add_job(hb_handle_t *h, GValue *js, gint unique_id, gint titleindex)
* 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)
@@ -3817,6 +4573,7 @@ add_job(hb_handle_t *h, GValue *js, gint unique_id, gint titleindex)
}
else
{
+ job->x264opts = x264opts;
job->indepth_scan = 0;
job->pass = 0;
job->sequence_id = (unique_id & 0xFFFFFF) | (sub_id++ << 24);
@@ -3824,6 +4581,25 @@ add_job(hb_handle_t *h, GValue *js, gint unique_id, gint titleindex)
//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);
@@ -3898,23 +4674,119 @@ ghb_pause_queue()
if( s.state == HB_STATE_PAUSED )
{
- hb_resume( h_queue );
+ hb_status.queue.state &= ~GHB_STATE_PAUSED;
+ hb_resume( h_queue );
}
else
{
- hb_pause( h_queue );
+ hb_status.queue.state |= GHB_STATE_PAUSED;
+ hb_pause( h_queue );
}
}
-#define RED_HEIGHT 720.0
-#define RED_WIDTH 1280.0
+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,
signal_user_data_t *ud,
- gboolean borders,
gint *out_width,
gint *out_height)
{
@@ -3934,14 +4806,6 @@ ghb_get_preview_image(
if (title->job == NULL) return NULL;
set_preview_job_settings(title->job, settings);
- // 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;
-
// hb_get_preview doesn't compensate for anamorphic, so lets
// calculate scale factors
gint width, height, par_width = 1, par_height = 1;
@@ -3952,63 +4816,15 @@ ghb_get_preview_image(
&par_width, &par_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]);
+ // Make sure we have a big enough buffer to receive the image from libhb
+ gint dstWidth = title->job->width;
+ gint dstHeight= title->job->height;
+
static guint8 *buffer = NULL;
static gint bufferSize = 0;
-
gint newSize;
- newSize = srcWidth * srcHeight * 4;
+
+ newSize = dstWidth * dstHeight * 4;
if( bufferSize < newSize )
{
bufferSize = newSize;
@@ -4017,23 +4833,22 @@ ghb_get_preview_image(
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;
@@ -4046,11 +4861,23 @@ ghb_get_preview_image(
src++;
}
dst += stride;
- src += (srcWidth - dstWidth); // skip to next row in src
}
+ 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 = dstWidth;
- *out_height = dstHeight;
+ *out_width = w;
+ *out_height = h;
if (ghb_settings_get_boolean(settings, "reduce_hd_preview"))
{
GdkScreen *ss;
@@ -4078,10 +4905,28 @@ ghb_get_preview_image(
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;
}
@@ -4116,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;
}