#include "hb-backend.h"
#include "settings.h"
#include "callbacks.h"
+#include "preview.h"
#include "values.h"
+#include "lang.h"
typedef struct
{
"10",
};
+static options_map_t d_logging_opts[] =
+{
+ {"0", "0", 0, "0"},
+ {"1", "1", 1, "1"},
+ {"2", "2", 2, "2"},
+};
+combo_opts_t logging_opts =
+{
+ sizeof(d_logging_opts)/sizeof(options_map_t),
+ d_logging_opts
+};
+
static options_map_t d_container_opts[] =
{
{"MKV", "mkv", HB_MUX_MKV, "mkv"},
d_container_opts
};
+static options_map_t d_detel_opts[] =
+{
+ {"None", "none", 0, ""},
+ {"Custom", "custom", 1, ""},
+ {"Default","default",2, NULL},
+};
+combo_opts_t detel_opts =
+{
+ sizeof(d_detel_opts)/sizeof(options_map_t),
+ d_detel_opts
+};
+
+static options_map_t d_decomb_opts[] =
+{
+ {"None", "none", 0, ""},
+ {"Custom", "custom", 1, ""},
+ {"Default","default",2, NULL},
+};
+combo_opts_t decomb_opts =
+{
+ sizeof(d_decomb_opts)/sizeof(options_map_t),
+ d_decomb_opts
+};
+
static options_map_t d_deint_opts[] =
{
{"None", "none", 0, ""},
- {"Fast", "fast", 1, "-1:-1:-1:0:1"},
- {"Slow", "slow", 2, "2:-1:-1:0:1"},
- {"Slower", "slower", 3, "0:-1:-1:0:1"},
+ {"Custom", "custom", 1, ""},
+ {"Fast", "fast", 2, "-1:-1:-1:0:1"},
+ {"Slow", "slow", 3, "2:-1:-1:0:1"},
+ {"Slower", "slower", 4, "0:-1:-1:0:1"},
};
combo_opts_t deint_opts =
{
static options_map_t d_denoise_opts[] =
{
{"None", "none", 0, ""},
- {"Weak", "weak", 1, "2:1:2:3"},
- {"Medium", "medium", 2, "3:2:2:3"},
- {"Strong", "strong", 3, "7:7:5:5"},
+ {"Custom", "custom", 1, ""},
+ {"Weak", "weak", 2, "2:1:2:3"},
+ {"Medium", "medium", 3, "3:2:2:3"},
+ {"Strong", "strong", 4, "7:7:5:5"},
};
combo_opts_t denoise_opts =
{
{"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"},
};
combo_opts_t acodec_opts =
{
static options_map_t d_me_opts[] =
{
- {"Diamond", "dia", 0, "dia"},
- {"Hexagon", "hex", 1, "hex"},
- {"Uneven Multi-Hexagon", "umh", 2, "umh"},
- {"Exhaustive", "esa", 3, "esa"},
+ {"Diamond", "dia", 0, "dia"},
+ {"Hexagon", "hex", 1, "hex"},
+ {"Uneven Multi-Hexagon", "umh", 2, "umh"},
+ {"Exhaustive", "esa", 3, "esa"},
+ {"Hadamard Exhaustive", "tesa", 4, "tesa"},
};
combo_opts_t me_opts =
{
{"5", "5", 5, "5"},
{"6", "6", 6, "6"},
{"7", "7", 7, "7"},
+ {"8", "8", 8, "8"},
+ {"9", "9", 9, "9"},
};
combo_opts_t subme_opts =
{
combo_name_map_t combo_name_map[] =
{
- {"container", &container_opts},
- {"deinterlace", &deint_opts},
- {"tweak_deinterlace", &deint_opts},
- {"denoise", &denoise_opts},
- {"tweak_denoise", &denoise_opts},
- {"video_codec", &vcodec_opts},
- {"audio_codec", &acodec_opts},
+ {"LoggingLevel", &logging_opts},
+ {"FileFormat", &container_opts},
+ {"PictureDeinterlace", &deint_opts},
+ {"PictureDecomb", &decomb_opts},
+ {"PictureDetelecine", &detel_opts},
+ {"PictureDenoise", &denoise_opts},
+ {"VideoEncoder", &vcodec_opts},
+ {"AudioEncoder", &acodec_opts},
{"x264_direct", &direct_opts},
{"x264_me", &me_opts},
{"x264_subme", &subme_opts},
{"x264_analyse", &analyse_opts},
{"x264_trellis", &trellis_opts},
- {"subtitle_lang", &subtitle_opts},
+ {"Subtitles", &subtitle_opts},
{"title", &title_opts},
- {"audio_track", &audio_track_opts},
+ {"AudioTrack", &audio_track_opts},
{NULL, NULL}
};
+#if 0
typedef struct iso639_lang_t
{
char * eng_name; /* Description in English */
char * iso639_2; /* ISO-639-2/t (3 character) code */
char * iso639_2b; /* ISO-639-2/b code (if different from above) */
} iso639_lang_t;
+#endif
-static const iso639_lang_t language_table[] =
+const iso639_lang_t ghb_language_table[] =
{
{ "Any", "", "zz", "und" },
{ "Afar", "", "aa", "aar" },
{ "Yoruba", "", "yo", "yor" },
{ "Zhuang", "", "za", "zha" },
{ "Zulu", "", "zu", "zul" },
+ {NULL, NULL, NULL, NULL}
};
-#define LANG_TABLE_SIZE (sizeof(language_table)/ sizeof(iso639_lang_t))
+#define LANG_TABLE_SIZE (sizeof(ghb_language_table)/ sizeof(iso639_lang_t)-1)
static void audio_bitrate_opts_set(GtkBuilder *builder, const gchar *name);
}
void
-ghb_vquality_range(signal_user_data_t *ud, gint *min, gint *max)
+ghb_vquality_range(
+ signal_user_data_t *ud,
+ gdouble *min,
+ gdouble *max,
+ gdouble *step,
+ gdouble *page,
+ gint *digits)
{
if (ghb_settings_get_boolean(ud->settings, "directqp"))
{
- gint vcodec = ghb_settings_combo_int(ud->settings, "video_codec");
+ gint vcodec = ghb_settings_combo_int(ud->settings, "VideoEncoder");
// Only x264 and ffmpeg currently support direct qp/crf entry
+ *step = 1;
+ *page = 10;
+ *digits = 0;
if (vcodec == HB_VCODEC_X264)
{
*min = 0;
else
{
*min = 0;
- *max = 100;
+ *max = 1.0;
+ *step = 0.001;
+ *page = 0.1;
+ *digits = 3;
}
}
else
{
*min = 0;
- *max = 100;
+ *max = 1.0;
+ *step = 0.001;
+ *page = 0.1;
+ *digits = 3;
}
}
{
gint ii;
gchar *str;
- gint result = HB_AMIXDOWN_DOLBYPLII;
+ gint result = 0;
str = ghb_value_string(mix);
str = ghb_value_string(rate);
for (ii = 0; ii < LANG_TABLE_SIZE; ii++)
{
- if (strcmp(language_table[ii].iso639_2, str) == 0)
+ if (strcmp(ghb_language_table[ii].iso639_2, str) == 0)
{
result = ii;
break;
str = ghb_value_string(rate);
for (ii = 0; ii < LANG_TABLE_SIZE; ii++)
{
- if (strcmp(language_table[ii].iso639_2, str) == 0)
+ if (strcmp(ghb_language_table[ii].iso639_2, str) == 0)
{
- result = language_table[ii].eng_name;
+ result = ghb_language_table[ii].eng_name;
break;
}
}
return value;
}
+#if 0
static GValue*
get_abitrate_value(gint val)
{
}
return value;
}
+#endif
static GValue*
get_amix_value(gint val)
extern void hb_get_tempory_directory(hb_handle_t *h, char path[512]);
+gchar*
+ghb_get_tmp_dir()
+{
+ char dir[512];
+
+ hb_get_tempory_directory(h_scan, dir);
+ return g_strdup(dir);
+}
+
void
ghb_hb_cleanup(gboolean partial)
{
{
GtkWidget *widget;
gint container, track, titleindex, acodec;
- gboolean httpopt;
hb_audio_config_t *audio = NULL;
+ GValue *gval;
widget = GHB_WIDGET (builder, "title");
- titleindex = ghb_lookup_combo_int("title", ghb_widget_value(widget));
- widget = GHB_WIDGET (builder, "audio_track");
- track = ghb_lookup_combo_int("audio_track", ghb_widget_value(widget));
+ gval = ghb_widget_value(widget);
+ titleindex = ghb_lookup_combo_int("title", gval);
+ ghb_value_free(gval);
+ widget = GHB_WIDGET (builder, "AudioTrack");
+ gval = ghb_widget_value(widget);
+ track = ghb_lookup_combo_int("AudioTrack", gval);
+ ghb_value_free(gval);
audio = get_hb_audio(titleindex, track);
- widget = GHB_WIDGET (builder, "container");
- container = ghb_lookup_combo_int("container", ghb_widget_value(widget));
- widget = GHB_WIDGET (builder, "http_optimize_mp4");
- httpopt = ghb_widget_boolean(widget);
+ widget = GHB_WIDGET (builder, "FileFormat");
+ gval = ghb_widget_value(widget);
+ container = ghb_lookup_combo_int("FileFormat", gval);
+ ghb_value_free(gval);
- grey_combo_box_item(builder, "audio_codec", HB_ACODEC_FAAC, FALSE);
- grey_combo_box_item(builder, "audio_codec", HB_ACODEC_LAME, FALSE);
- grey_combo_box_item(builder, "audio_codec", HB_ACODEC_VORBIS, FALSE);
+ grey_combo_box_item(builder, "x264_analyse", 3, TRUE);
+ grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_FAAC, FALSE);
+ grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_LAME, FALSE);
+ grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_VORBIS, FALSE);
gboolean allow_ac3 = TRUE;
- allow_ac3 =
- !(container == HB_MUX_MP4 && httpopt) &&
- (container != HB_MUX_OGM);
+ allow_ac3 = (container != HB_MUX_OGM);
if (allow_ac3)
{
- grey_combo_box_item(builder, "audio_codec", HB_ACODEC_AC3, FALSE);
+ grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_AC3, FALSE);
+ grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_DCA, FALSE);
}
else
{
- grey_combo_box_item(builder, "audio_codec", HB_ACODEC_AC3, TRUE);
+ grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_AC3, TRUE);
+ grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_DCA, TRUE);
}
if (audio && audio->in.codec != HB_ACODEC_AC3)
{
- grey_combo_box_item(builder, "audio_codec", HB_ACODEC_AC3, TRUE);
+ grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_AC3, TRUE);
+ }
+ if (audio && audio->in.codec != HB_ACODEC_DCA)
+ {
+ grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_DCA, TRUE);
}
- grey_combo_box_item(builder, "video_codec", HB_VCODEC_THEORA, FALSE);
+ grey_combo_box_item(builder, "VideoEncoder", HB_VCODEC_THEORA, FALSE);
- widget = GHB_WIDGET (builder, "audio_codec");
- acodec = ghb_lookup_combo_int("audio_codec", ghb_widget_value(widget));
+ widget = GHB_WIDGET (builder, "AudioEncoder");
+ gval = ghb_widget_value(widget);
+ acodec = ghb_lookup_combo_int("AudioEncoder", gval);
+ ghb_value_free(gval);
if (acodec != HB_ACODEC_AC3)
{
- grey_combo_box_item(builder, "audio_mix", 0, TRUE);
+ grey_combo_box_item(builder, "AudioMixdown", 0, TRUE);
}
if (container == HB_MUX_MP4)
{
- grey_combo_box_item(builder, "audio_codec", HB_ACODEC_LAME, TRUE);
- grey_combo_box_item(builder, "audio_codec", HB_ACODEC_VORBIS, TRUE);
- grey_combo_box_item(builder, "video_codec", HB_VCODEC_THEORA, TRUE);
+ grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_LAME, TRUE);
+ grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_VORBIS, TRUE);
+ grey_combo_box_item(builder, "VideoEncoder", HB_VCODEC_THEORA, TRUE);
}
else if (container == HB_MUX_AVI)
{
- grey_combo_box_item(builder, "audio_codec", HB_ACODEC_FAAC, TRUE);
- grey_combo_box_item(builder, "audio_codec", HB_ACODEC_VORBIS, TRUE);
- grey_combo_box_item(builder, "video_codec", HB_VCODEC_THEORA, TRUE);
+ grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_FAAC, TRUE);
+ grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_VORBIS, TRUE);
+ grey_combo_box_item(builder, "VideoEncoder", HB_VCODEC_THEORA, TRUE);
}
else if (container == HB_MUX_OGM)
{
- grey_combo_box_item(builder, "audio_codec", HB_ACODEC_FAAC, TRUE);
+ grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_FAAC, TRUE);
}
gboolean allow_mono = TRUE;
(layout == HB_INPUT_CH_LAYOUT_3F2R) &&
(audio->in.channel_layout & HB_INPUT_CH_LAYOUT_HAS_LFE);
}
- grey_combo_box_item(builder, "audio_mix", HB_AMIXDOWN_MONO, !allow_mono);
- grey_combo_box_item(builder, "audio_mix", HB_AMIXDOWN_STEREO, !allow_stereo);
- grey_combo_box_item(builder, "audio_mix", HB_AMIXDOWN_DOLBY, !allow_dolby);
- grey_combo_box_item(builder, "audio_mix", HB_AMIXDOWN_DOLBYPLII, !allow_dpl2);
- grey_combo_box_item(builder, "audio_mix", HB_AMIXDOWN_6CH, !allow_6ch);
+ grey_combo_box_item(builder, "AudioMixdown", HB_AMIXDOWN_MONO, !allow_mono);
+ grey_combo_box_item(builder, "AudioMixdown", HB_AMIXDOWN_STEREO, !allow_stereo);
+ grey_combo_box_item(builder, "AudioMixdown", HB_AMIXDOWN_DOLBY, !allow_dolby);
+ grey_combo_box_item(builder, "AudioMixdown", HB_AMIXDOWN_DOLBYPLII, !allow_dpl2);
+ grey_combo_box_item(builder, "AudioMixdown", HB_AMIXDOWN_6CH, !allow_6ch);
}
gint
{
gtk_list_store_append(store, &iter);
gtk_list_store_set(store, &iter,
- 0, language_table[ii].eng_name,
+ 0, ghb_language_table[ii].eng_name,
1, TRUE,
- 2, language_table[ii].iso639_2,
+ 2, ghb_language_table[ii].iso639_2,
3, ii,
- 4, language_table[ii].iso639_1,
+ 4, ghb_language_table[ii].iso639_1,
-1);
}
}
subtitle_opts.map[0].svalue = "none";
gtk_list_store_append(store, &iter);
gtk_list_store_set(store, &iter,
- 0, "Same as audio",
+ 0, "Autoselect",
1, TRUE,
2, "auto",
3, -1,
{
gtk_list_store_append(store, &iter);
gtk_list_store_set(store, &iter,
- 0, language_table[ii].eng_name,
+ 0, ghb_language_table[ii].eng_name,
1, TRUE,
- 2, language_table[ii].iso639_2,
+ 2, ghb_language_table[ii].iso639_2,
3, ii,
- 4, language_table[ii].iso639_2,
+ 4, ghb_language_table[ii].iso639_2,
-1);
- subtitle_opts.map[ii+2].option = language_table[ii].eng_name;
- subtitle_opts.map[ii+2].shortOpt = language_table[ii].iso639_2;
+ 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 = language_table[ii].iso639_2;
+ subtitle_opts.map[ii+2].svalue = ghb_language_table[ii].iso639_2;
}
}
}
}
gint
-ghb_find_audio_track(gint titleindex, const gchar *lang, gint index)
+ghb_find_audio_track(
+ gint titleindex,
+ const gchar *lang,
+ gint acodec,
+ GHashTable *track_indices)
{
hb_list_t * list;
hb_title_t * title;
gint ii;
gint count = 0;
gint track = -1;
- gint match = 0;
+ gint max_chan = 0;
+ gboolean *used;
g_debug("find_audio_track ()\n");
- if (h_scan != NULL)
+ if (h_scan == NULL) return -1;
+ list = hb_get_titles( h_scan );
+ title = (hb_title_t*)hb_list_item( list, titleindex );
+ if (title != NULL)
{
- list = hb_get_titles( h_scan );
- title = (hb_title_t*)hb_list_item( list, titleindex );
- if (title != NULL)
+ count = hb_list_count( title->list_audio );
+ }
+ if (count > 10) count = 10;
+ used = g_hash_table_lookup(track_indices, &acodec);
+ if (used == NULL)
+ {
+ used = g_malloc0(count * sizeof(gboolean));
+ g_hash_table_insert(track_indices, &acodec, used);
+ }
+ // Try to fine an item that matches the preferred language and
+ // the passthru codec type
+ if (acodec == HB_ACODEC_AC3 || acodec == HB_ACODEC_DCA)
+ {
+ for (ii = 0; ii < count; ii++)
{
- count = hb_list_count( title->list_audio );
+ gint channels;
+
+ if (used[ii])
+ continue;
+
+ audio = (hb_audio_config_t*)hb_list_audio_config_item(
+ title->list_audio, ii );
+ channels = HB_INPUT_CH_LAYOUT_GET_DISCRETE_COUNT(
+ audio->in.channel_layout);
+ // Find a track that is not visually impaired or dirctor's
+ // commentary, and has the highest channel count.
+ if ((audio->in.codec == acodec) &&
+ (audio->lang.type < 2) &&
+ ((strcmp(lang, audio->lang.iso639_2) == 0) ||
+ (strcmp(lang, "und") == 0)))
+ {
+ if (channels > max_chan)
+ {
+ track = ii;
+ max_chan = channels;
+ }
+ }
}
}
- if (count > 10) count = 10;
+ if (track > -1)
+ {
+ used[track] = TRUE;
+ return track;
+ }
+ // Try to fine an item that matches the preferred language
for (ii = 0; ii < count; ii++)
{
- audio = (hb_audio_config_t*)hb_list_audio_config_item( title->list_audio, ii );
- if ((strcmp(lang, audio->lang.iso639_2) == 0) ||
- (strcmp(lang, "und") == 0))
+ if (used[ii])
+ continue;
+ audio = (hb_audio_config_t*)hb_list_audio_config_item(
+ title->list_audio, ii );
+ // Find a track that is not visually impaired or dirctor's commentary
+ if ((audio->lang.type < 2) &&
+ ((strcmp(lang, audio->lang.iso639_2) == 0) ||
+ (strcmp(lang, "und") == 0)))
+ {
+ track = ii;
+ break;
+ }
+ }
+ if (track > -1)
+ {
+ used[track] = TRUE;
+ return track;
+ }
+ // Try to fine an item that does not match the preferred language and
+ // matches the passthru codec type
+ if (acodec == HB_ACODEC_AC3 || acodec == HB_ACODEC_DCA)
+ {
+ for (ii = 0; ii < count; ii++)
{
- if (index == match)
+ gint channels;
+
+ if (used[ii])
+ continue;
+
+ audio = (hb_audio_config_t*)hb_list_audio_config_item(
+ title->list_audio, ii );
+ channels = HB_INPUT_CH_LAYOUT_GET_DISCRETE_COUNT(
+ audio->in.channel_layout);
+ // Find a track that is not visually impaired or dirctor's
+ // commentary, and has the highest channel count.
+ if ((audio->in.codec == acodec) &&
+ (audio->lang.type < 2))
{
- track = ii;
- break;
+ if (channels > max_chan)
+ {
+ track = ii;
+ max_chan = channels;
+ }
}
- match++;
}
}
+ if (track > -1)
+ {
+ used[track] = TRUE;
+ return track;
+ }
+ // Try to fine an item that does not match the preferred language
+ for (ii = 0; ii < count; ii++)
+ {
+ if (used[ii])
+ continue;
+ audio = (hb_audio_config_t*)hb_list_audio_config_item(
+ title->list_audio, ii );
+ // Find a track that is not visually impaired or dirctor's commentary
+ if (audio->lang.type < 2)
+ {
+ track = ii;
+ break;
+ }
+ }
+ if (track > -1)
+ {
+ used[track] = TRUE;
+ return track;
+ }
+ // Last ditch, anything goes
+ for (ii = 0; ii < count; ii++)
+ {
+ audio = (hb_audio_config_t*)hb_list_audio_config_item(
+ title->list_audio, ii );
+ if (!used[ii])
+ {
+ track = ii;
+ break;
+ }
+ }
+ if (track > -1)
+ {
+ used[track] = TRUE;
+ }
return track;
}
gint
ghb_lookup_combo_int(const gchar *name, const GValue *gval)
{
- if (strcmp(name, "audio_bitrate") == 0)
+ if (strcmp(name, "AudioBitrate") == 0)
return lookup_audio_bitrate_int(gval);
- else if (strcmp(name, "audio_rate") == 0)
+ else if (strcmp(name, "AudioSamplerate") == 0)
return lookup_audio_rate_int(gval);
- else if (strcmp(name, "framerate") == 0)
+ else if (strcmp(name, "VideoFramerate") == 0)
return lookup_video_rate_int(gval);
- else if (strcmp(name, "audio_mix") == 0)
+ else if (strcmp(name, "AudioMixdown") == 0)
return lookup_mix_int(gval);
- else if (strcmp(name, "source_audio_lang") == 0)
+ else if (strcmp(name, "SourceAudioLang") == 0)
return lookup_audio_lang_int(gval);
else
{
const gchar*
ghb_lookup_combo_option(const gchar *name, const GValue *gval)
{
- if (strcmp(name, "audio_bitrate") == 0)
+ if (strcmp(name, "AudioBitrate") == 0)
return lookup_audio_bitrate_option(gval);
- else if (strcmp(name, "audio_rate") == 0)
+ else if (strcmp(name, "AudioSamplerate") == 0)
return lookup_audio_rate_option(gval);
- else if (strcmp(name, "framerate") == 0)
+ else if (strcmp(name, "VideoFramerate") == 0)
return lookup_video_rate_option(gval);
- else if (strcmp(name, "audio_mix") == 0)
+ else if (strcmp(name, "AudioMixdown") == 0)
return lookup_mix_option(gval);
- else if (strcmp(name, "source_audio_lang") == 0)
+ else if (strcmp(name, "SourceAudioLang") == 0)
return lookup_audio_lang_option(gval);
else
{
}
if (all)
{
- audio_bitrate_opts_set(builder, "audio_bitrate");
- audio_samplerate_opts_set(builder, "audio_rate", hb_audio_rates, hb_audio_rates_count);
- video_rate_opts_set(builder, "framerate", hb_video_rates, hb_video_rates_count);
- mix_opts_set(builder, "audio_mix");
- language_opts_set(builder, "source_audio_lang");
- subtitle_opts_set(builder, "subtitle_lang", user_data);
+ 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, "audio_track", user_data);
- generic_opts_set(builder, "container", &container_opts);
- generic_opts_set(builder, "deinterlace", &deint_opts);
- generic_opts_set(builder, "tweak_deinterlace", &deint_opts);
- generic_opts_set(builder, "denoise", &denoise_opts);
- generic_opts_set(builder, "tweak_denoise", &denoise_opts);
- generic_opts_set(builder, "video_codec", &vcodec_opts);
- generic_opts_set(builder, "audio_codec", &acodec_opts);
+ audio_track_opts_set(builder, "AudioTrack", user_data);
+ generic_opts_set(builder, "LoggingLevel", &logging_opts);
+ generic_opts_set(builder, "FileFormat", &container_opts);
+ generic_opts_set(builder, "PictureDeinterlace", &deint_opts);
+ generic_opts_set(builder, "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_me", &me_opts);
generic_opts_set(builder, "x264_subme", &subme_opts);
}
else
{
- if (strcmp(name, "audio_bitrate") == 0)
- audio_bitrate_opts_set(builder, "audio_bitrate");
- else if (strcmp(name, "audio_rate") == 0)
- audio_samplerate_opts_set(builder, "audio_rate", hb_audio_rates, hb_audio_rates_count);
- else if (strcmp(name, "framerate") == 0)
- video_rate_opts_set(builder, "framerate", hb_video_rates, hb_video_rates_count);
- else if (strcmp(name, "audio_mix") == 0)
- mix_opts_set(builder, "audio_mix");
- else if (strcmp(name, "source_audio_lang") == 0)
- language_opts_set(builder, "source_audio_lang");
- else if (strcmp(name, "subtitle_lang") == 0)
- subtitle_opts_set(builder, "subtitle_lang", user_data);
+ if (strcmp(name, "AudioBitrate") == 0)
+ audio_bitrate_opts_set(builder, "AudioBitrate");
+ else if (strcmp(name, "AudioSamplerate") == 0)
+ audio_samplerate_opts_set(builder, "AudioSamplerate", hb_audio_rates, hb_audio_rates_count);
+ else if (strcmp(name, "VideoFramerate") == 0)
+ video_rate_opts_set(builder, "VideoFramerate", hb_video_rates, hb_video_rates_count);
+ else if (strcmp(name, "AudioMixdown") == 0)
+ mix_opts_set(builder, "AudioMixdown");
+ else if (strcmp(name, "SourceAudioLang") == 0)
+ language_opts_set(builder, "SourceAudioLang");
+ else if (strcmp(name, "Subtitles") == 0)
+ subtitle_opts_set(builder, "Subtitles", user_data);
else if (strcmp(name, "title") == 0)
title_opts_set(builder, "title");
- else if (strcmp(name, "audio_track") == 0)
- audio_track_opts_set(builder, "audio_track", user_data);
+ else if (strcmp(name, "AudioTrack") == 0)
+ audio_track_opts_set(builder, "AudioTrack", user_data);
else
generic_opts_set(builder, name, find_combo_table(name));
}
{
gint ii;
- init_combo_box(builder, "audio_bitrate");
- init_combo_box(builder, "audio_rate");
- init_combo_box(builder, "framerate");
- init_combo_box(builder, "audio_mix");
- init_combo_box(builder, "source_audio_lang");
- init_combo_box(builder, "subtitle_lang");
+ init_combo_box(builder, "AudioBitrate");
+ init_combo_box(builder, "AudioSamplerate");
+ init_combo_box(builder, "VideoFramerate");
+ init_combo_box(builder, "AudioMixdown");
+ init_combo_box(builder, "SourceAudioLang");
+ init_combo_box(builder, "Subtitles");
init_combo_box(builder, "title");
- init_combo_box(builder, "audio_track");
+ init_combo_box(builder, "AudioTrack");
for (ii = 0; combo_name_map[ii].name != NULL; ii++)
{
init_combo_box(builder, combo_name_map[ii].name);
ghb_build_x264opts_string(GValue *settings)
{
gchar *result;
- gchar *opts = ghb_settings_get_string(settings, "x264_options");
+ gchar *opts = ghb_settings_get_string(settings, "x264Option");
if (opts != NULL)
{
result = opts;
gint acodec;
asettings = ghb_array_get_nth(audio_list, ii);
- acodec = ghb_settings_combo_int(asettings, "audio_codec");
+ acodec = ghb_settings_combo_int(asettings, "AudioEncoder");
if (acodec == HB_ACODEC_AC3)
return TRUE;
}
else if (ivalue > last)
{
ii++;
- done = !gtk_list_store_remove(store, &iter);
+ gtk_list_store_set(store, &iter, 1, FALSE, -1);
+ done = !gtk_tree_model_iter_next (GTK_TREE_MODEL(store), &iter);
}
else
{
ii++;
+ gtk_list_store_set(store, &iter, 1, TRUE, -1);
done = !gtk_tree_model_iter_next (GTK_TREE_MODEL(store), &iter);
}
} while (!done);
}
- for (; ii < hb_audio_bitrates_count; ii++)
- {
- if (hb_audio_bitrates[ii].rate <= last)
- {
- gtk_list_store_append(store, &iter);
- gtk_list_store_set(store, &iter,
- 0, hb_audio_bitrates[ii].string,
- 1, TRUE,
- 2, hb_audio_bitrates[ii].string,
- 3, hb_audio_bitrates[ii].rate,
- 4, hb_audio_bitrates[ii].string,
- -1);
- }
- }
}
static void
void
ghb_set_passthru_bitrate_opts(GtkBuilder *builder, gint bitrate)
{
- audio_bitrate_opts_add(builder, "audio_bitrate", bitrate);
+ audio_bitrate_opts_add(builder, "AudioBitrate", bitrate);
}
void
ghb_set_default_bitrate_opts(GtkBuilder *builder, gint last_rate)
{
- audio_bitrate_opts_clean(builder, "audio_bitrate", last_rate);
+ audio_bitrate_opts_clean(builder, "AudioBitrate", last_rate);
}
static ghb_status_t hb_status;
void
-ghb_backend_init(GtkBuilder *builder, gint debug, gint update)
+ghb_combo_init(GtkBuilder *builder)
{
- /* Init libhb */
- h_scan = hb_init( debug, update );
- h_queue = hb_init( debug, 0 );
// Set up the list model for the combos
init_ui_combo_boxes(builder);
// Populate all the combos
}
void
+ghb_backend_init(gint debug)
+{
+ /* Init libhb */
+ h_scan = hb_init( debug, 0 );
+ h_queue = hb_init( debug, 0 );
+}
+
+void
ghb_backend_close()
{
hb_close(&h_queue);
}
void
-ghb_backend_scan(const gchar *path, gint titleindex)
+ghb_backend_scan(const gchar *path, gint titleindex, gint preview_count)
{
- hb_scan( h_scan, path, titleindex );
- hb_status.state |= GHB_STATE_SCANNING;
+ hb_scan( h_scan, path, titleindex, preview_count, 1 );
+ hb_status.scan.state |= GHB_STATE_SCANNING;
// initialize count and cur to something that won't cause FPE
// when computing progress
- hb_status.title_count = 1;
- hb_status.title_cur = 0;
+ hb_status.scan.title_count = 1;
+ hb_status.scan.title_cur = 0;
}
void
ghb_backend_queue_scan(const gchar *path, gint titlenum)
{
g_debug("ghb_backend_queue_scan()");
- hb_scan( h_queue, path, titlenum );
- hb_status.queue_state |= GHB_STATE_SCANNING;
+ hb_scan( h_queue, path, titlenum, 10, 0 );
+ hb_status.queue.state |= GHB_STATE_SCANNING;
}
gint
-ghb_get_state()
+ghb_get_scan_state()
{
- return hb_status.state;
+ return hb_status.scan.state;
}
gint
ghb_get_queue_state()
{
- return hb_status.queue_state;
+ return hb_status.queue.state;
}
void
-ghb_clear_state(gint state)
+ghb_clear_scan_state(gint state)
{
- hb_status.state &= ~state;
+ hb_status.scan.state &= ~state;
}
void
ghb_clear_queue_state(gint state)
{
- hb_status.queue_state &= ~state;
+ hb_status.queue.state &= ~state;
}
void
-ghb_set_state(gint state)
+ghb_set_scan_state(gint state)
{
- hb_status.state |= state;
+ hb_status.scan.state |= state;
}
void
ghb_set_queue_state(gint state)
{
- hb_status.queue_state |= state;
+ hb_status.queue.state |= state;
}
void
void
ghb_track_status()
{
- hb_state_t s;
+ hb_state_t s_scan;
hb_state_t s_queue;
if (h_scan == NULL) return;
- hb_get_state( h_scan, &s );
- switch( s.state )
+ hb_get_state( h_scan, &s_scan );
+ switch( s_scan.state )
{
-#define p s.param.scanning
+#define p s_scan.param.scanning
case HB_STATE_SCANNING:
{
- hb_status.state |= GHB_STATE_SCANNING;
- hb_status.title_count = p.title_count;
- hb_status.title_cur = p.title_cur;
+ hb_status.scan.state |= GHB_STATE_SCANNING;
+ hb_status.scan.title_count = p.title_count;
+ hb_status.scan.title_cur = p.title_cur;
} break;
#undef p
case HB_STATE_SCANDONE:
{
- hb_status.state &= ~GHB_STATE_SCANNING;
- hb_status.state |= GHB_STATE_SCANDONE;
+ hb_status.scan.state &= ~GHB_STATE_SCANNING;
+ hb_status.scan.state |= GHB_STATE_SCANDONE;
} break;
+#define p s_scan.param.working
+ case HB_STATE_WORKING:
+ hb_status.scan.state |= GHB_STATE_WORKING;
+ hb_status.scan.state &= ~GHB_STATE_PAUSED;
+ hb_status.scan.job_cur = p.job_cur;
+ hb_status.scan.job_count = p.job_count;
+ hb_status.scan.progress = p.progress;
+ hb_status.scan.rate_cur = p.rate_cur;
+ hb_status.scan.rate_avg = p.rate_avg;
+ hb_status.scan.hours = p.hours;
+ hb_status.scan.minutes = p.minutes;
+ hb_status.scan.seconds = p.seconds;
+ hb_status.scan.unique_id = p.sequence_id & 0xFFFFFF;
+ break;
+#undef p
+
+ case HB_STATE_PAUSED:
+ hb_status.scan.state |= GHB_STATE_PAUSED;
+ break;
+
+ case HB_STATE_MUXING:
+ {
+ hb_status.scan.state |= GHB_STATE_MUXING;
+ } break;
+
+#define p s_scan.param.workdone
+ case HB_STATE_WORKDONE:
+ {
+ hb_job_t *job;
+
+ hb_status.scan.state |= GHB_STATE_WORKDONE;
+ hb_status.scan.state &= ~GHB_STATE_MUXING;
+ hb_status.scan.state &= ~GHB_STATE_PAUSED;
+ hb_status.scan.state &= ~GHB_STATE_WORKING;
+ switch (p.error)
+ {
+ case HB_ERROR_NONE:
+ hb_status.scan.error = GHB_ERROR_NONE;
+ break;
+ case HB_ERROR_CANCELED:
+ hb_status.scan.error = GHB_ERROR_CANCELED;
+ break;
+ default:
+ hb_status.scan.error = GHB_ERROR_FAIL;
+ break;
+ }
+ // Delete all remaining jobs of this encode.
+ // An encode can be composed of multiple associated jobs.
+ // When a job is stopped, libhb removes it from the job list,
+ // but does not remove other jobs that may be associated with it.
+ // Associated jobs are taged in the sequence id.
+ while ((job = hb_job(h_scan, 0)) != NULL)
+ hb_rem( h_scan, job );
+ } break;
+#undef p
}
hb_get_state( h_queue, &s_queue );
switch( s_queue.state )
{
+#define p s_queue.param.scanning
case HB_STATE_SCANNING:
{
- hb_status.queue_state |= GHB_STATE_SCANNING;
+ hb_status.queue.state |= GHB_STATE_SCANNING;
+ hb_status.queue.title_count = p.title_count;
+ hb_status.queue.title_cur = p.title_cur;
} break;
+#undef p
case HB_STATE_SCANDONE:
{
- hb_status.queue_state &= ~GHB_STATE_SCANNING;
- hb_status.queue_state |= GHB_STATE_SCANDONE;
+ hb_status.queue.state &= ~GHB_STATE_SCANNING;
+ hb_status.queue.state |= GHB_STATE_SCANDONE;
} break;
#define p s_queue.param.working
case HB_STATE_WORKING:
- hb_status.queue_state |= GHB_STATE_WORKING;
- hb_status.queue_state &= ~GHB_STATE_PAUSED;
- hb_status.job_cur = p.job_cur;
- hb_status.job_count = p.job_count;
- hb_status.progress = p.progress;
- hb_status.rate_cur = p.rate_cur;
- hb_status.rate_avg = p.rate_avg;
- hb_status.hours = p.hours;
- hb_status.minutes = p.minutes;
- hb_status.seconds = p.seconds;
- hb_status.unique_id = p.sequence_id & 0xFFFFFF;
+ hb_status.queue.state |= GHB_STATE_WORKING;
+ hb_status.queue.state &= ~GHB_STATE_PAUSED;
+ hb_status.queue.job_cur = p.job_cur;
+ hb_status.queue.job_count = p.job_count;
+ hb_status.queue.progress = p.progress;
+ hb_status.queue.rate_cur = p.rate_cur;
+ hb_status.queue.rate_avg = p.rate_avg;
+ hb_status.queue.hours = p.hours;
+ hb_status.queue.minutes = p.minutes;
+ hb_status.queue.seconds = p.seconds;
+ hb_status.queue.unique_id = p.sequence_id & 0xFFFFFF;
break;
#undef p
case HB_STATE_PAUSED:
- hb_status.queue_state |= GHB_STATE_PAUSED;
+ hb_status.queue.state |= GHB_STATE_PAUSED;
break;
case HB_STATE_MUXING:
{
- hb_status.queue_state |= GHB_STATE_MUXING;
+ hb_status.queue.state |= GHB_STATE_MUXING;
} break;
#define p s_queue.param.workdone
{
hb_job_t *job;
- hb_status.queue_state |= GHB_STATE_WORKDONE;
- hb_status.queue_state &= ~GHB_STATE_MUXING;
- hb_status.queue_state &= ~GHB_STATE_PAUSED;
- hb_status.queue_state &= ~GHB_STATE_WORKING;
+ hb_status.queue.state |= GHB_STATE_WORKDONE;
+ hb_status.queue.state &= ~GHB_STATE_MUXING;
+ hb_status.queue.state &= ~GHB_STATE_PAUSED;
+ hb_status.queue.state &= ~GHB_STATE_WORKING;
switch (p.error)
{
case HB_ERROR_NONE:
- hb_status.error = GHB_ERROR_NONE;
+ hb_status.queue.error = GHB_ERROR_NONE;
+ break;
case HB_ERROR_CANCELED:
- hb_status.error = GHB_ERROR_CANCELED;
+ hb_status.queue.error = GHB_ERROR_CANCELED;
+ break;
default:
- hb_status.error = GHB_ERROR_FAIL;
+ hb_status.queue.error = GHB_ERROR_FAIL;
+ break;
}
- hb_status.error = p.error;
// Delete all remaining jobs of this encode.
// An encode can be composed of multiple associated jobs.
// When a job is stopped, libhb removes it from the job list,
ghb_audio_is_passthru(gint acodec)
{
g_debug("ghb_audio_is_passthru () \n");
- g_debug("acodec %d\n", acodec);
- return (acodec == HB_ACODEC_AC3);
+ return (acodec == HB_ACODEC_AC3) || (acodec == HB_ACODEC_DCA);
}
gint
if (job == NULL) return;
// First configure widgets
- round_dims = ghb_settings_get_boolean(ud->settings, "round_dimensions");
+ round_dims = ghb_settings_get_boolean(ud->settings, "ModDimensions");
anamorphic = ghb_settings_get_boolean(ud->settings, "anamorphic");
- keep_aspect = ghb_settings_get_boolean(ud->settings, "keep_aspect");
- autocrop = ghb_settings_get_boolean(ud->settings, "autocrop");
+ keep_aspect = ghb_settings_get_boolean(ud->settings, "PictureKeepRatio");
+ autocrop = ghb_settings_get_boolean(ud->settings, "PictureAutoCrop");
autoscale = ghb_settings_get_boolean(ud->settings, "autoscale");
// "Noscale" is a flag that says we prefer to crop extra to satisfy
// alignment constraints rather than scaling to satisfy them.
keep_width = FALSE;
keep_height = FALSE;
}
- if (anamorphic || keep_aspect)
+ if (keep_aspect)
{
keep_height = FALSE;
}
crop[2] += need1;
crop[3] += need2;
}
- ghb_ui_update(ud, "crop_top", ghb_int64_value(crop[0]));
- ghb_ui_update(ud, "crop_bottom", ghb_int64_value(crop[1]));
- ghb_ui_update(ud, "crop_left", ghb_int64_value(crop[2]));
- ghb_ui_update(ud, "crop_right", ghb_int64_value(crop[3]));
+ ghb_ui_update(ud, "PictureTopCrop", ghb_int64_value(crop[0]));
+ ghb_ui_update(ud, "PictureBottomCrop", ghb_int64_value(crop[1]));
+ ghb_ui_update(ud, "PictureLeftCrop", ghb_int64_value(crop[2]));
+ ghb_ui_update(ud, "PictureRightCrop", ghb_int64_value(crop[3]));
}
}
- crop[0] = ghb_settings_get_int(ud->settings, "crop_top");
- crop[1] = ghb_settings_get_int(ud->settings, "crop_bottom");
- crop[2] = ghb_settings_get_int(ud->settings, "crop_left");
- crop[3] = ghb_settings_get_int(ud->settings, "crop_right");
+ crop[0] = ghb_settings_get_int(ud->settings, "PictureTopCrop");
+ crop[1] = ghb_settings_get_int(ud->settings, "PictureBottomCrop");
+ crop[2] = ghb_settings_get_int(ud->settings, "PictureLeftCrop");
+ crop[3] = ghb_settings_get_int(ud->settings, "PictureRightCrop");
hb_reduce(&aspect_n, &aspect_d,
title->width * title->pixel_aspect_width,
title->height * title->pixel_aspect_height);
{
width = crop_width;
height = crop_height;
- max_width = crop_width;
- max_height = crop_height;
+ max_width = 0;
+ max_height = 0;
}
else
{
width = ghb_settings_get_int(ud->settings, "scale_width");
height = ghb_settings_get_int(ud->settings, "scale_height");
- max_width = ghb_settings_get_int(ud->settings, "max_width");
- max_height = ghb_settings_get_int(ud->settings, "max_width");
+ max_width = ghb_settings_get_int(ud->settings, "PictureWidth");
+ max_height = ghb_settings_get_int(ud->settings, "PictureHeight");
// Align max dims
max_width = (max_width >> modshift) << modshift;
max_height = (max_height >> modshift) << modshift;
if (anamorphic)
{
- if (round_dims)
- {
- job->modulus = 0;
- }
- else
- {
- // The scaler crashes if the dimensions are not divisible by 2
- // Align mod 2. And so does something in x264_encoder_headers()
- job->modulus = 2;
- }
+ job->anamorphic.mode = autoscale ? 2 : 3;
+ // 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 = round_dims ? 16 : 2;
job->width = width;
+ job->height = height;
if (max_height)
job->maxHeight = max_height;
job->crop[0] = crop[0]; job->crop[1] = crop[1];
}
else
{
+ job->anamorphic.mode = 0;
if (keep_aspect)
{
gdouble par;
// Height and width are always multiples of 2, so do the rounding
new_height = ((new_height + 1) >> 1) << 1;
new_width = ((new_width + 1) >> 1) << 1;
- g_debug("max w %d, new w %d\n", max_width, new_width);
- if (max_width && (new_width > max_width))
+ if ((max_width && new_width > max_width) ||
+ new_width > title->width)
{
height = new_height;
}
- else if (max_height && (new_height > max_height))
+ else if ((max_height && new_height > max_height) ||
+ new_height > title->height)
{
width = new_width;
}
static void
set_preview_job_settings(hb_job_t *job, GValue *settings)
{
- job->crop[0] = ghb_settings_get_int(settings, "crop_top");
- job->crop[1] = ghb_settings_get_int(settings, "crop_bottom");
- job->crop[2] = ghb_settings_get_int(settings, "crop_left");
- job->crop[3] = ghb_settings_get_int(settings, "crop_right");
+ job->crop[0] = ghb_settings_get_int(settings, "PictureTopCrop");
+ job->crop[1] = ghb_settings_get_int(settings, "PictureBottomCrop");
+ job->crop[2] = ghb_settings_get_int(settings, "PictureLeftCrop");
+ job->crop[3] = ghb_settings_get_int(settings, "PictureRightCrop");
- gboolean anamorphic, round_dimensions;
+ gboolean anamorphic, round_dimensions, autoscale;
+ autoscale = ghb_settings_get_boolean(settings, "autoscale");
anamorphic = ghb_settings_get_boolean(settings, "anamorphic");
- round_dimensions = ghb_settings_get_boolean(settings, "round_dimensions");
- if (round_dimensions && anamorphic)
- {
- job->modulus = 16;
- job->pixel_ratio = 2;
- }
- else if (anamorphic)
+ round_dimensions = ghb_settings_get_boolean(settings, "ModDimensions");
+ if (anamorphic)
{
- job->modulus = 2;
- job->pixel_ratio = 2;
+ job->anamorphic.modulus = round_dimensions ? 16 : 2;
+ job->anamorphic.mode = autoscale ? 2 : 3;
}
else
{
- job->modulus = 2;
- job->pixel_ratio = 0;
+ job->anamorphic.modulus = 2;
+ job->anamorphic.mode = 0;
}
job->width = ghb_settings_get_int(settings, "scale_width");
job->height = ghb_settings_get_int(settings, "scale_height");
- gint deint = ghb_settings_combo_int(settings, "deinterlace");
- gboolean decomb = ghb_settings_get_boolean(settings, "decomb");
+ gint deint = ghb_settings_combo_int(settings, "PictureDeinterlace");
+ gint decomb = ghb_settings_combo_int(settings, "PictureDecomb");
job->deinterlace = (!decomb && deint == 0) ? 0 : 1;
}
hb_job_t * job;
gint size;
- if (h_scan == NULL) return 2000;
+ if (h_scan == NULL) return 1500;
list = hb_get_titles( h_scan );
title = hb_list_item( list, titleindex );
- if (title == NULL) return 2000;
+ if (title == NULL) return 1500;
job = title->job;
- if (job == NULL) return 2000;
- size = ghb_settings_get_int(settings, "video_target_size");
+ if (job == NULL) return 1500;
+ size = ghb_settings_get_int(settings, "VideoTargetSize");
return hb_calc_bitrate( job, size );
}
-gint
-ghb_guess_bitrate(GValue *settings)
-{
- gint bitrate;
- if (ghb_settings_get_boolean(settings, "vquality_type_constant"))
- {
- // This is really rough. I'm trying to err on the high
- // side since this is used to estimate if there is
- // sufficient disk space left
- gint vcodec;
- gdouble vquality;
-
- vcodec = ghb_settings_combo_int(settings, "video_codec");
- vquality = ghb_settings_get_double(settings, "video_quality")/100;
- if (vcodec == HB_VCODEC_X264 &&
- !ghb_settings_get_boolean(settings, "linear_vquality"))
- {
- vquality = 51.0 - vquality * 51.0;
- // Convert log curve to linear
- vquality = exp2((vquality-12)/6);
- // Don't let it go to 0
- if (vquality >= 31) vquality = 30;
- vquality = (31 - vquality) / 31;
- }
- // bitrate seems to be a log relasionship to quality
- // with typical source material
- // This is a real wag
- bitrate = 20*1024*1024*exp10(vquality*14)/exp10(14);
- // Add some bits for audio
- bitrate += 500*1024;
- }
- else
- {
- // Add some fudge to the bitrate to leave breathing room
- bitrate = ghb_settings_get_int(settings, "video_bitrate")*1024;
- // Add some bits for audio
- bitrate += 500*1024;
- }
- return bitrate;
-}
-
gboolean
ghb_validate_filter_string(const gchar *str, gint max_fields)
{
gboolean
ghb_validate_filters(signal_user_data_t *ud)
{
- gboolean tweaks;
gchar *str;
gint index;
gchar *message;
- gboolean enabled;
- tweaks = ghb_settings_get_boolean(ud->settings, "allow_tweaks");
- if (tweaks)
+ // deinte 4
+ index = ghb_settings_combo_int(ud->settings, "PictureDeinterlace");
+ if (index == 1)
{
- // detele 6
- str = ghb_settings_get_string(ud->settings, "tweak_detelecine");
- enabled = ghb_settings_get_boolean(ud->settings, "detelecine");
- if (enabled && !ghb_validate_filter_string(str, 6))
+ str = ghb_settings_get_string(ud->settings, "PictureDeinterlaceCustom");
+ if (!ghb_validate_filter_string(str, 4))
{
message = g_strdup_printf(
- "Invalid Detelecine Settings:\n\n%s\n",
+ "Invalid Deinterlace Settings:\n\n%s\n",
str);
ghb_message_dialog(GTK_MESSAGE_ERROR, message, "Cancel", NULL);
- g_free(str);
g_free(message);
+ g_free(str);
return FALSE;
}
g_free(str);
- // decomb 7
- str = ghb_settings_get_string(ud->settings, "tweak_decomb");
- enabled = ghb_settings_get_boolean(ud->settings, "decomb");
- if (enabled && !ghb_validate_filter_string(str, 7))
+ }
+ // detel
+ index = ghb_settings_combo_int(ud->settings, "PictureDetelecine");
+ if (index == 1)
+ {
+ str = ghb_settings_get_string(ud->settings, "PictureDetelecineCustom");
+ if (!ghb_validate_filter_string(str, 6))
{
message = g_strdup_printf(
- "Invalid Decomb Settings:\n\n%s\n",
+ "Invalid Detelecine Settings:\n\n%s\n",
str);
ghb_message_dialog(GTK_MESSAGE_ERROR, message, "Cancel", NULL);
- g_free(str);
g_free(message);
+ g_free(str);
return FALSE;
}
g_free(str);
- // deinte 4
- index = ghb_lookup_combo_int("tweak_deinterlace",
- ghb_settings_get_value(ud->settings, "tweak_deinterlace"));
- if (index < 0)
+ }
+ // decomb 4
+ index = ghb_settings_combo_int(ud->settings, "PictureDecomb");
+ if (index == 1)
+ {
+ str = ghb_settings_get_string(ud->settings, "PictureDecombCustom");
+ if (!ghb_validate_filter_string(str, 7))
{
- str = ghb_settings_get_string(ud->settings, "tweak_deinterlace");
- if (!ghb_validate_filter_string(str, 4))
- {
- message = g_strdup_printf(
- "Invalid Deinterlace Settings:\n\n%s\n",
- str);
- ghb_message_dialog(GTK_MESSAGE_ERROR, message, "Cancel", NULL);
- g_free(message);
- g_free(str);
- return FALSE;
- }
+ message = g_strdup_printf(
+ "Invalid Decomb Settings:\n\n%s\n",
+ str);
+ ghb_message_dialog(GTK_MESSAGE_ERROR, message, "Cancel", NULL);
+ g_free(message);
g_free(str);
+ return FALSE;
}
-#if 0
- // Deblock is being reworked
- // debloc 2
- str = ghb_settings_get_string(ud->settings, "tweak_deblock");
- enabled = ghb_settings_get_boolean(ud->settings, "deblock");
- if (enabled && !ghb_validate_filter_string(str, 2))
+ g_free(str);
+ }
+ // denois 4
+ 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))
{
message = g_strdup_printf(
- "Invalid Deblock Settings:\n\n%s\n",
+ "Invalid Denoise Settings:\n\n%s\n",
str);
ghb_message_dialog(GTK_MESSAGE_ERROR, message, "Cancel", NULL);
g_free(str);
return FALSE;
}
g_free(str);
-#endif
- // denois 4
- index = ghb_lookup_combo_int("tweak_denoise",
- ghb_settings_get_value(ud->settings, "tweak_denoise"));
- if (index < 0)
- {
- str = ghb_settings_get_string(ud->settings, "tweak_denoise");
- if (!ghb_validate_filter_string(str, 4))
- {
- message = g_strdup_printf(
- "Invalid Denoise Settings:\n\n%s\n",
- str);
- ghb_message_dialog(GTK_MESSAGE_ERROR, message, "Cancel", NULL);
- g_free(str);
- g_free(message);
- return FALSE;
- }
- g_free(str);
- }
}
return TRUE;
}
gint vcodec, mux;
gchar *message;
- mux = ghb_settings_combo_int(ud->settings, "container");
- vcodec = ghb_settings_combo_int(ud->settings, "video_codec");
+ mux = ghb_settings_combo_int(ud->settings, "FileFormat");
+ vcodec = ghb_settings_combo_int(ud->settings, "VideoEncoder");
if ((mux == HB_MUX_MP4 || mux == HB_MUX_AVI) &&
(vcodec == HB_VCODEC_THEORA))
{
}
g_free(message);
vcodec = HB_VCODEC_XVID;
- ghb_ui_update(ud, "video_codec", ghb_int64_value(vcodec));
- }
- gboolean decomb;
- gboolean vfr;
- decomb = ghb_settings_get_boolean(ud->settings, "decomb");
- vfr = ghb_settings_get_boolean(ud->settings, "variable_frame_rate");
- if (decomb && !vfr)
- {
- message = g_strdup_printf(
- "Decomb is intended to be used in conjunction\n"
- "with variable frame rate.\n\n"
- "Would you like me to enable VFR for you?");
- if (ghb_message_dialog(GTK_MESSAGE_WARNING, message, "No", "Yes"))
- {
- ghb_ui_update(ud, "variable_frame_rate", ghb_boolean_value(TRUE));
- }
- g_free(message);
- }
- return TRUE;
-}
-
-gboolean
-ghb_validate_container(signal_user_data_t *ud)
-{
- gint container;
- gchar *message;
-
- container = ghb_settings_combo_int(ud->settings, "container");
- if (container == HB_MUX_MP4)
- {
- const GValue *audio_list;
- gboolean httpopt;
-
- audio_list = ghb_settings_get_value(ud->settings, "audio_list");
- httpopt = ghb_settings_get_boolean(ud->settings, "http_optimize_mp4");
- if (httpopt && ghb_ac3_in_audio_list(audio_list))
- {
- message = g_strdup_printf(
- "AC3 audio in HTTP optimized MP4 is not supported.\n\n"
- "You should choose a different audio codec.\n"
- "If you continue, FAAC will be chosen for you.");
- if (!ghb_message_dialog(GTK_MESSAGE_WARNING, message, "Cancel", "Continue"))
- {
- g_free(message);
- return FALSE;
- }
- g_free(message);
-
- gint count, ii;
-
- count = ghb_array_len(audio_list);
- for (ii = 0; ii < count; ii++)
- {
- GValue *asettings;
-
- asettings = ghb_array_get_nth(audio_list, ii);
- gint acodec = ghb_settings_combo_int(asettings, "audio_codec");
- if (acodec == HB_ACODEC_AC3)
- {
- GValue *value;
- value = get_acodec_value(HB_ACODEC_FAAC);
- ghb_settings_take_value(asettings, "audio_codec", value);
- value = get_abitrate_value(160);
- ghb_settings_take_value(asettings, "audio_bitrate", value);
- }
- }
- }
+ ghb_ui_update(ud, "VideoEncoder", ghb_int64_value(vcodec));
}
return TRUE;
}
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, "container");
+ gint mux = ghb_settings_combo_int(ud->settings, "FileFormat");
const GValue *audio_list;
gint count, ii;
hb_audio_config_t *taudio;
asettings = ghb_array_get_nth(audio_list, ii);
- gint track = ghb_settings_combo_int(asettings, "audio_track");
- gint codec = ghb_settings_combo_int(asettings, "audio_codec");
+ gint track = ghb_settings_combo_int(asettings, "AudioTrack");
+ gint codec = ghb_settings_combo_int(asettings, "AudioEncoder");
taudio = (hb_audio_config_t *) hb_list_audio_config_item(
title->list_audio, track );
- if ((taudio->in.codec != HB_ACODEC_AC3) && (codec == HB_ACODEC_AC3))
+ if ((taudio->in.codec != HB_ACODEC_AC3 && codec == HB_ACODEC_AC3) ||
+ (taudio->in.codec != HB_ACODEC_DCA && codec == 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 AC3 Pass-Thru.\n\n"
+ "The source does not support %s Pass-Thru.\n\n"
"You should choose a different audio codec.\n"
- "If you continue, one will be chosen for you.");
+ "If you continue, one will be chosen for you.", str);
if (!ghb_message_dialog(GTK_MESSAGE_WARNING, message, "Cancel", "Continue"))
{
g_free(message);
codec = HB_ACODEC_FAAC;
}
value = get_acodec_value(codec);
- ghb_settings_take_value(asettings, "audio_codec", value);
+ ghb_settings_take_value(asettings, "AudioEncoder", value);
}
gchar *a_unsup = NULL;
gchar *mux_s = NULL;
a_unsup = "AC-3";
codec = HB_ACODEC_VORBIS;
}
+ if (codec == HB_ACODEC_DCA)
+ {
+ a_unsup = "DTS";
+ codec = HB_ACODEC_VORBIS;
+ }
}
if (a_unsup)
{
}
g_free(message);
value = get_acodec_value(codec);
- ghb_settings_take_value(asettings, "audio_codec", value);
+ ghb_settings_take_value(asettings, "AudioEncoder", value);
}
- gint mix = ghb_settings_combo_int (asettings, "audio_mix");
+ gint mix = ghb_settings_combo_int (asettings, "AudioMixdown");
gboolean allow_mono = TRUE;
gboolean allow_stereo = TRUE;
gboolean allow_dolby = TRUE;
g_free(message);
mix = ghb_get_best_mix(titleindex, track, codec, mix);
value = get_amix_value(mix);
- ghb_settings_take_value(asettings, "audio_mix", value);
+ ghb_settings_take_value(asettings, "AudioMixdown", value);
}
}
return TRUE;
gint min, max;
if (ghb_settings_get_boolean(settings, "nocheckvquality")) return TRUE;
- vcodec = ghb_settings_combo_int(settings, "video_codec");
+ vcodec = ghb_settings_combo_int(settings, "VideoEncoder");
+ gdouble vquality;
+ vquality = ghb_settings_get_double(settings, "VideoQualitySlider");
if (ghb_settings_get_boolean(settings, "vquality_type_constant"))
{
if (!ghb_settings_get_boolean(settings, "directqp"))
{
- if (vcodec != HB_VCODEC_X264 ||
- ghb_settings_get_boolean(settings, "linear_vquality"))
+ vquality *= 100.0;
+ if (vcodec != HB_VCODEC_X264)
{
min = 68;
max = 97;
}
- else if (vcodec == HB_VCODEC_X264)
+ else
{
min = 40;
max = 70;
{
min = 68;
max = 97;
+ vquality *= 100.0;
}
}
- gint vquality = ghb_settings_get_double(settings, "video_quality");
if (vquality < min || vquality > max)
{
message = g_strdup_printf(
"Interesting video quality choise: %d\n\n"
"Typical values range from %d to %d.\n"
"Are you sure you wish to use this setting?",
- vquality, min, max);
+ (gint)vquality, min, max);
if (!ghb_message_dialog(GTK_MESSAGE_QUESTION, message,
"Cancel", "Continue"))
{
return TRUE;
}
-void
-ghb_add_job(GValue *js, gint unique_id)
+static void
+add_job(hb_handle_t *h, GValue *js, gint unique_id, gint titleindex)
{
hb_list_t * list;
hb_title_t * title;
gchar *denoise_str = NULL;
gchar *dest_str = NULL;
- g_debug("ghb_add_job()\n");
- if (h_queue == NULL) return;
- list = hb_get_titles( h_queue );
+ g_debug("add_job()\n");
+ if (h == NULL) return;
+ list = hb_get_titles( h );
if( !hb_list_count( list ) )
{
/* No valid title, stop right there */
- g_message("No title found.\n");
return;
}
- // Since I'm doing a scan of the single title I want just prior
- // to adding the job, there is only the one title to choose from.
- //gint titleindex = ghb_settings_get_int(js, "title");
- gint titleindex = 0;
title = hb_list_item( list, titleindex );
if (title == NULL) return;
job = title->job;
if (job == NULL) return;
+ job->start_at_preview = ghb_settings_get_int(js, "start_frame") + 1;
+ if (job->start_at_preview)
+ {
+ job->seek_points = ghb_settings_get_int(js, "preview_count");
+ job->pts_to_stop = ghb_settings_get_int(js, "live_duration") * 90000LL;
+ }
+
tweaks = ghb_settings_get_boolean(js, "allow_tweaks");
- job->mux = ghb_settings_combo_int(js, "container");
+ job->mux = ghb_settings_combo_int(js, "FileFormat");
if (job->mux == HB_MUX_MP4)
{
- job->largeFileSize = ghb_settings_get_boolean(js, "large_mp4");
- job->mp4_optimize = ghb_settings_get_boolean(js, "http_optimize_mp4");
+ job->largeFileSize = ghb_settings_get_boolean(js, "Mp4LargeFile");
+ job->mp4_optimize = ghb_settings_get_boolean(js, "Mp4HttpOptimize");
}
else
{
job->largeFileSize = FALSE;
job->mp4_optimize = FALSE;
}
- gint chapter_start, chapter_end;
- chapter_start = ghb_settings_get_int(js, "start_chapter");
- chapter_end = ghb_settings_get_int(js, "end_chapter");
- gint num_chapters = hb_list_count(title->list_chapter);
- job->chapter_start = MIN( num_chapters, chapter_start );
- job->chapter_end = MAX( job->chapter_start, chapter_end );
-
- job->chapter_markers = ghb_settings_get_boolean(js, "chapter_markers");
- if ( job->chapter_markers )
+ if (!job->start_at_preview)
{
- GValue *chapters;
- GValue *chapter;
- gint chap;
- gint count;
-
- chapters = ghb_settings_get_value(js, "chapter_list");
- count = ghb_array_len(chapters);
- for(chap = chapter_start; chap <= chapter_end; chap++)
+ gint chapter_start, chapter_end;
+ chapter_start = ghb_settings_get_int(js, "start_chapter");
+ chapter_end = ghb_settings_get_int(js, "end_chapter");
+ gint num_chapters = hb_list_count(title->list_chapter);
+ job->chapter_start = MIN( num_chapters, chapter_start );
+ job->chapter_end = MAX( job->chapter_start, chapter_end );
+
+ job->chapter_markers = ghb_settings_get_boolean(js, "ChapterMarkers");
+ if ( job->chapter_markers )
{
- hb_chapter_t * chapter_s;
- gchar *name;
-
- name = NULL;
- if (chap-1 < count)
- {
- chapter = ghb_array_get_nth(chapters, chap-1);
- name = ghb_value_string(chapter);
- }
- if (name == NULL)
+ GValue *chapters;
+ GValue *chapter;
+ gint chap;
+ gint count;
+
+ chapters = ghb_settings_get_value(js, "chapter_list");
+ count = ghb_array_len(chapters);
+ for(chap = chapter_start; chap <= chapter_end; chap++)
{
- name = g_strdup_printf ("Chapter %2d", chap);
+ hb_chapter_t * chapter_s;
+ gchar *name;
+
+ name = NULL;
+ if (chap-1 < count)
+ {
+ chapter = ghb_array_get_nth(chapters, chap-1);
+ name = ghb_value_string(chapter);
+ }
+ if (name == NULL)
+ {
+ name = g_strdup_printf ("Chapter %2d", chap);
+ }
+ chapter_s = hb_list_item( job->title->list_chapter, chap - 1);
+ strncpy(chapter_s->title, name, 1023);
+ chapter_s->title[1023] = '\0';
+ g_free(name);
}
- chapter_s = hb_list_item( job->title->list_chapter, chap - 1);
- strncpy(chapter_s->title, name, 1023);
- chapter_s->title[1023] = '\0';
- g_free(name);
}
}
- job->crop[0] = ghb_settings_get_int(js, "crop_top");
- job->crop[1] = ghb_settings_get_int(js, "crop_bottom");
- job->crop[2] = ghb_settings_get_int(js, "crop_left");
- job->crop[3] = ghb_settings_get_int(js, "crop_right");
+ job->crop[0] = ghb_settings_get_int(js, "PictureTopCrop");
+ job->crop[1] = ghb_settings_get_int(js, "PictureBottomCrop");
+ job->crop[2] = ghb_settings_get_int(js, "PictureLeftCrop");
+ job->crop[3] = ghb_settings_get_int(js, "PictureRightCrop");
- gboolean decomb = ghb_settings_get_boolean(js, "decomb");
- gint deint = ghb_settings_combo_int(js,
- tweaks ? "tweak_deinterlace":"deinterlace");
+ gint decomb = ghb_settings_combo_int(js, "PictureDecomb");
+ gint deint = ghb_settings_combo_int(js, "PictureDeinterlace");
if (!decomb)
job->deinterlace = (deint != 0) ? 1 : 0;
else
job->deinterlace = 0;
- job->grayscale = ghb_settings_get_boolean(js, "grayscale");
+ job->grayscale = ghb_settings_get_boolean(js, "VideoGrayScale");
+ gboolean autoscale = ghb_settings_get_boolean(js, "autoscale");
gboolean anamorphic = ghb_settings_get_boolean(js, "anamorphic");
- gboolean round_dimensions = ghb_settings_get_boolean(js, "round_dimensions");
- if (round_dimensions && anamorphic)
- {
- job->pixel_ratio = 2;
- job->modulus = 16;
- }
- else if (anamorphic)
+ gboolean round_dimensions = ghb_settings_get_boolean(js, "ModDimensions");
+ if (anamorphic)
{
- // Huh! I thought I wanted to use pixel_ratio 1 for this case, but
- // when its 1, libhb discards the width and height and uses original
- // title dims - crop. Thats not what I want.
- // Also, x264 requires things to divisible by 2.
- job->pixel_ratio = 2;
- job->modulus = 2;
+ job->anamorphic.mode = autoscale ? 2 : 3;
+ // Also, x264 requires things to be divisible by 2.
+ job->anamorphic.modulus = round_dimensions ? 16 : 2;
}
else
{
- job->pixel_ratio = 0;
- job->modulus = 2;
+ job->anamorphic.mode = 0;
+ job->anamorphic.modulus = 2;
}
- job->vfr = ghb_settings_get_boolean(js, "variable_frame_rate");
/* Add selected filters */
job->filters = hb_list_init();
- if( ghb_settings_get_boolean(js, "detelecine" ) || job->vfr )
+ gint vrate = ghb_settings_combo_int(js, "VideoFramerate");
+ if( vrate == 0 && ghb_settings_combo_int(js, "PictureDetelecine" ) )
+ job->vfr = 1;
+ else
+ job->vfr = 0;
+
+ gint detel = ghb_settings_combo_int(js, "PictureDetelecine");
+ if ( detel )
{
- hb_filter_detelecine.settings = NULL;
- if (tweaks)
+ if (detel != 1)
{
- detel_str = ghb_settings_get_string(js, "tweak_detelecine");
- if (detel_str && detel_str[0])
- {
- hb_filter_detelecine.settings = detel_str;
- }
+ if (detel_opts.map[detel].svalue != NULL)
+ detel_str = g_strdup(detel_opts.map[detel].svalue);
}
+ else
+ detel_str = ghb_settings_get_string(js, "PictureDetelecineCustom");
+ hb_filter_detelecine.settings = detel_str;
hb_list_add( job->filters, &hb_filter_detelecine );
}
- if( decomb )
+ if ( decomb )
{
- // Use default settings
- hb_filter_decomb.settings = NULL;
- if (tweaks)
+ if (decomb != 1)
{
- decomb_str = ghb_settings_get_string(js, "tweak_decomb");
- if (decomb_str && decomb_str[0])
- {
- hb_filter_decomb.settings = (gchar*)decomb_str;
- }
+ if (decomb_opts.map[decomb].svalue != NULL)
+ decomb_str = g_strdup(decomb_opts.map[decomb].svalue);
}
+ else
+ decomb_str = ghb_settings_get_string(js, "PictureDecombCustom");
+ hb_filter_decomb.settings = decomb_str;
hb_list_add( job->filters, &hb_filter_decomb );
}
if( job->deinterlace )
{
- if (deint > 0)
- deint_str = g_strdup(deint_opts.map[deint].svalue);
+ if (deint != 1)
+ {
+ if (deint_opts.map[deint].svalue != NULL)
+ deint_str = g_strdup(deint_opts.map[deint].svalue);
+ }
else
- deint_str = ghb_settings_get_string(js,
- tweaks ? "tweak_deinterlace" : "deinterlace");
+ deint_str = ghb_settings_get_string(js, "PictureDeinterlaceCustom");
hb_filter_deinterlace.settings = deint_str;
hb_list_add( job->filters, &hb_filter_deinterlace );
}
- gint deblock = ghb_settings_get_int(js, "deblock");
+ gint deblock = ghb_settings_get_int(js, "PictureDeblock");
if( deblock >= 5 )
{
deblock_str = g_strdup_printf("%d", deblock);
hb_filter_deblock.settings = deblock_str;
hb_list_add( job->filters, &hb_filter_deblock );
}
- gint denoise = ghb_settings_combo_int(js,
- tweaks ? "tweak_denoise" : "denoise");
- if( denoise != 0 )
+ gint denoise = ghb_settings_combo_int(js, "PictureDenoise");
+ if( denoise )
{
- if (denoise > 0)
- denoise_str = g_strdup(denoise_opts.map[denoise].svalue);
+ if (denoise != 1)
+ {
+ if (denoise_opts.map[denoise].svalue != NULL)
+ denoise_str = g_strdup(denoise_opts.map[denoise].svalue);
+ }
else
- denoise_str = (gchar*)ghb_settings_get_string(
- js, tweaks ? "tweak_denoise" : "denoise");
+ denoise_str = ghb_settings_get_string(js, "PictureDenoiseCustom");
hb_filter_denoise.settings = denoise_str;
hb_list_add( job->filters, &hb_filter_denoise );
}
job->width = ghb_settings_get_int(js, "scale_width");
job->height = ghb_settings_get_int(js, "scale_height");
- job->vcodec = ghb_settings_combo_int(js, "video_codec");
+ job->vcodec = ghb_settings_combo_int(js, "VideoEncoder");
if ((job->mux == HB_MUX_MP4 || job->mux == HB_MUX_AVI) &&
(job->vcodec == HB_VCODEC_THEORA))
{
}
if ((job->vcodec == HB_VCODEC_X264) && (job->mux == HB_MUX_MP4))
{
- job->ipod_atom = ghb_settings_get_boolean(js, "ipod_file");
+ job->ipod_atom = ghb_settings_get_boolean(js, "Mp4iPodCompatible");
}
if (ghb_settings_get_boolean(js, "vquality_type_constant"))
{
gdouble vquality;
- vquality = ghb_settings_get_double(js, "video_quality");
+ vquality = ghb_settings_get_double(js, "VideoQualitySlider");
if (!ghb_settings_get_boolean(js, "directqp"))
{
- vquality /= 100.0;
- if (ghb_settings_get_boolean(js, "linear_vquality"))
- {
- if (job->vcodec == HB_VCODEC_X264)
- {
- // Adjust to same range as xvid and ffmpeg
- vquality = 31.0 - vquality * 31.0;
- if (vquality > 0)
- {
- // Convert linear to log curve
- vquality = 12 + 6 * log2(vquality);
- if (vquality > 51) vquality = 51;
- if (vquality < 1) vquality = 1;
- }
- else
- vquality = 0;
- }
- }
- else
- {
- if (vquality == 0.0) vquality = 0.01;
- if (vquality == 1.0) vquality = 0.0;
- }
+ if (vquality == 0.0) vquality = 0.01;
+ if (vquality == 1.0) vquality = 0.0;
}
job->vquality = vquality;
job->vbitrate = 0;
else if (ghb_settings_get_boolean(js, "vquality_type_bitrate"))
{
job->vquality = -1.0;
- job->vbitrate = ghb_settings_get_int(js, "video_bitrate");
+ job->vbitrate = ghb_settings_get_int(js, "VideoAvgBitrate");
}
// AVI container does not support variable frame rate.
if (job->mux == HB_MUX_AVI)
{
job->vfr = FALSE;
+ job->cfr = 1;
}
- gint vrate = ghb_settings_combo_int(js, "framerate");
- if( vrate == 0 || job->vfr )
+ if( vrate == 0 )
{
job->vrate = title->rate;
job->vrate_base = title->rate_base;
hb_audio_config_init(&audio);
asettings = ghb_array_get_nth(audio_list, ii);
- audio.in.track = ghb_settings_get_int(asettings, "audio_track");
+ audio.in.track = ghb_settings_get_int(asettings, "AudioTrack");
audio.out.track = tcount;
- audio.out.codec = ghb_settings_combo_int(asettings, "audio_codec");
+ 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))
+ 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))
{
// Not supported. AC3 is passthrough only, so input must be AC3
if (job->mux == HB_MUX_AVI)
}
else
{
+printf("switching to faac\n");
audio.out.codec = HB_ACODEC_FAAC;
}
}
}
if ((job->mux == HB_MUX_OGM) &&
((audio.out.codec == HB_ACODEC_FAAC) ||
- (audio.out.codec == HB_ACODEC_AC3)))
+ (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, "audio_drc");
+ ghb_settings_get_double(asettings, "AudioTrackDRCSlider");
// It would be better if this were done in libhb for us, but its not yet.
if (audio.out.codec == HB_ACODEC_AC3 || audio.out.codec == HB_ACODEC_DCA)
{
}
else
{
- audio.out.mixdown = ghb_settings_combo_int(asettings, "audio_mix");
+ audio.out.mixdown = ghb_settings_combo_int(asettings, "AudioMixdown");
// Make sure the mixdown is valid and pick a new one if not.
audio.out.mixdown = ghb_get_best_mix(titleindex,
audio.in.track, audio.out.codec, audio.out.mixdown);
audio.out.bitrate =
- ghb_settings_combo_int(asettings, "audio_bitrate");
- gint srate = ghb_settings_combo_int(asettings, "audio_rate");
+ ghb_settings_combo_int(asettings, "AudioBitrate");
+ gint srate = ghb_settings_combo_int(asettings, "AudioSamplerate");
if (srate == 0) // 0 is same as source
audio.out.samplerate = taudio->in.samplerate;
else
{
gint size;
- size = ghb_settings_get_int(js, "video_target_size");
+ size = ghb_settings_get_int(js, "VideoTargetSize");
job->vbitrate = hb_calc_bitrate( job, size );
job->vquality = -1.0;
}
job->x264opts = NULL;
}
gint subtitle;
- gchar *slang = ghb_settings_get_string(js, "subtitle_lang");
+ gchar *slang = ghb_settings_get_string(js, "Subtitles");
subtitle = -2; // default to none
if (strcmp(slang, "auto") == 0)
{
}
}
}
- gboolean forced_subtitles = ghb_settings_get_boolean(js, "forced_subtitles");
+ gboolean forced_subtitles = ghb_settings_get_boolean(js, "SubtitlesForced");
job->subtitle_force = forced_subtitles;
if (subtitle >= 0)
job->subtitle = subtitle;
* Add the pre-scan job
*/
job->sequence_id = (unique_id & 0xFFFFFF) | (sub_id++ << 24);
- hb_add( h_queue, job );
+ hb_add( h, job );
//if (job->x264opts != NULL)
// g_free(job->x264opts);
{
job->select_subtitle = NULL;
}
- if( ghb_settings_get_boolean(js, "two_pass") &&
+ if( ghb_settings_get_boolean(js, "VideoTwoPass") &&
!ghb_settings_get_boolean(js, "vquality_type_constant"))
{
/*
* If turbo options have been selected then append them
* to the x264opts now (size includes one ':' and the '\0')
*/
- if( ghb_settings_get_boolean(js, "turbo") )
+ if( ghb_settings_get_boolean(js, "VideoTurboTwoPass") )
{
char *tmp_x264opts;
job->x264opts = x264opts;
}
job->sequence_id = (unique_id & 0xFFFFFF) | (sub_id++ << 24);
- hb_add( h_queue, job );
+ hb_add( h, job );
//if (job->x264opts != NULL)
// g_free(job->x264opts);
job->indepth_scan = 0;
job->x264opts = x264opts2;
job->sequence_id = (unique_id & 0xFFFFFF) | (sub_id++ << 24);
- hb_add( h_queue, job );
+ hb_add( h, job );
//if (job->x264opts != NULL)
// g_free(job->x264opts);
}
job->indepth_scan = 0;
job->pass = 0;
job->sequence_id = (unique_id & 0xFFFFFF) | (sub_id++ << 24);
- hb_add( h_queue, job );
+ hb_add( h, job );
//if (job->x264opts != NULL)
// g_free(job->x264opts);
}
}
void
+ghb_add_job(GValue *js, gint unique_id)
+{
+ // Since I'm doing a scan of the single title I want just prior
+ // to adding the job, there is only the one title to choose from.
+ add_job(h_queue, js, unique_id, 0);
+}
+
+void
+ghb_add_live_job(GValue *js, gint unique_id)
+{
+ // Since I'm doing a scan of the single title I want just prior
+ // to adding the job, there is only the one title to choose from.
+ gint titleindex = ghb_settings_combo_int(js, "title");
+ add_job(h_scan, js, unique_id, titleindex);
+}
+
+void
ghb_remove_job(gint unique_id)
{
hb_job_t * job;
}
void
+ghb_start_live_encode()
+{
+ hb_start( h_scan );
+}
+
+void
+ghb_stop_live_encode()
+{
+ hb_stop( h_scan );
+}
+
+void
ghb_pause_queue()
{
hb_state_t s;
}
}
+#define RED_HEIGHT 720.0
+#define RED_WIDTH 1280.0
+
GdkPixbuf*
ghb_get_preview_image(
gint titleindex,
gint index,
- GValue *settings,
- gboolean borders)
+ signal_user_data_t *ud,
+ gboolean borders,
+ gint *out_width,
+ gint *out_height)
{
+ GValue *settings;
hb_title_t *title;
hb_list_t *list;
+ settings = ud->settings;
list = hb_get_titles( h_scan );
if( !hb_list_count( list ) )
{
if (anamorphic)
{
hb_set_anamorphic_size( title->job, &width, &height, &par_width, &par_height );
- if (par_width > par_height)
- dstWidth = dstWidth * par_width / par_height;
- else
- dstHeight = dstHeight * par_height / par_width;
+ ghb_par_scale(ud, &dstWidth, &dstHeight, par_width, par_height);
+ }
+ else
+ {
+ ghb_par_scale(ud, &dstWidth, &dstHeight, 1, 1);
+ }
+ *out_width = dstWidth;
+ *out_height = dstHeight;
+ if (ghb_settings_get_boolean(settings, "reduce_hd_preview"))
+ {
+ GdkScreen *ss;
+ gint s_w, s_h;
+ gint num, den;
+
+ ss = gdk_screen_get_default();
+ s_w = gdk_screen_get_width(ss);
+ s_h = gdk_screen_get_height(ss);
+ num = dstWidth * par_width;
+ den = dstHeight * par_height;
+
+ if (dstWidth > s_w * 80 / 100)
+ {
+ dstWidth = s_w * 80 / 100;
+ dstHeight = dstWidth * den / num;
+ }
+ if (dstHeight > s_h * 80 / 100)
+ {
+ dstHeight = s_h * 80 / 100;
+ dstWidth = dstHeight * num / den;
+ }
}
-
g_debug("scaled %d x %d\n", dstWidth, dstHeight);
GdkPixbuf *scaled_preview;
scaled_preview = gdk_pixbuf_scale_simple(preview, dstWidth, dstHeight, GDK_INTERP_HYPER);
OSDN Git Service
