}
}
+static options_map_t d_point_to_point_opts[] =
+{
+ {"Chapters:", "chapter", 0, "0"},
+ {"Seconds:", "time", 1, "1"},
+ {"Frames:", "frame", 2, "2"},
+};
+combo_opts_t point_to_point_opts =
+{
+ sizeof(d_point_to_point_opts)/sizeof(options_map_t),
+ d_point_to_point_opts
+};
+
static options_map_t d_when_complete_opts[] =
{
{"Do Nothing", "nothing", 0, "0"},
combo_name_map_t combo_name_map[] =
{
+ {"PtoPType", &point_to_point_opts},
{"WhenComplete", &when_complete_opts},
{"PicturePAR", &par_opts},
{"PictureModulus", &alignment_opts},
return result;
}
+gint
+ghb_find_closest_audio_bitrate(gint codec, gint rate)
+{
+ gint ii;
+ gint low = 32;
+ gint high = 768;
+ gint result;
+
+ if (codec == HB_ACODEC_FAAC)
+ high = 160;
+
+ result = high;
+ for (ii = 0; ii < hb_audio_bitrates_count; ii++)
+ {
+ if (hb_audio_bitrates[ii].rate < low)
+ continue;
+ if (hb_audio_bitrates[ii].rate > high)
+ break;
+ if (rate <= hb_audio_bitrates[ii].rate)
+ {
+ result = hb_audio_bitrates[ii].rate;
+ break;
+ }
+ }
+ return result;
+}
+
static gint
lookup_audio_bitrate_int(const GValue *rate)
{
return result;
}
-static GValue*
-get_acodec_value(gint val)
+GValue*
+ghb_lookup_acodec_value(gint val)
{
GValue *value = NULL;
gint ii;
for (ii = 0; ii < count; ii++)
{
title = (hb_title_t*)hb_list_item(list, ii);
- if (title->duration != 0)
+ if (title->type == HB_STREAM_TYPE)
{
- titles[ii] = g_strdup_printf ("%d - %02dh%02dm%02ds",
- title->index, title->hours, title->minutes, title->seconds);
+ if (title->duration != 0)
+ {
+ titles[ii] = g_strdup_printf ("%d - %02dh%02dm%02ds - %s",
+ title->index, title->hours, title->minutes, title->seconds,
+ title->name);
+ }
+ else
+ {
+ titles[ii] = g_strdup_printf ("%d - %s",
+ title->index, title->name);
+ }
}
else
{
- titles[ii] = g_strdup_printf ("%d - Unknown Length", title->index);
+ if (title->duration != 0)
+ {
+ titles[ii] = g_strdup_printf ("%d - %02dh%02dm%02ds",
+ title->index, title->hours, title->minutes, title->seconds);
+ }
+ else
+ {
+ titles[ii] = g_strdup_printf ("%d - Unknown Length",
+ title->index);
+ }
}
gtk_list_store_append(store, &iter);
gtk_list_store_set(store, &iter,
return lang;
}
+static gboolean*
+get_track_used(gint acodec, GHashTable *track_indices, gint count)
+{
+ gboolean *used;
+
+ used = g_hash_table_lookup(track_indices, &acodec);
+ if (used == NULL)
+ {
+ gint *key;
+
+ used = g_malloc0(count * sizeof(gboolean));
+ key = g_malloc(sizeof(gint));
+ *key = acodec;
+ g_hash_table_insert(track_indices, key, used);
+ }
+ return used;
+}
+
gint
ghb_find_audio_track(
gint titleindex,
const gchar *lang,
gint acodec,
+ gint fallback_acodec,
GHashTable *track_indices)
{
hb_list_t * list;
hb_title_t * title;
- hb_audio_config_t * audio;
+ hb_audio_config_t * audio;
gint ii;
gint count = 0;
gint track = -1;
gint max_chan = 0;
gboolean *used;
+ gint try_acodec;
g_debug("find_audio_track ()\n");
if (h_scan == NULL) return -1;
list = hb_get_titles( h_scan );
- title = (hb_title_t*)hb_list_item( list, titleindex );
+ title = (hb_title_t*)hb_list_item( list, titleindex );
if (title != NULL)
{
count = hb_list_count( title->list_audio );
}
if (count > 10) count = 10;
- used = g_hash_table_lookup(track_indices, &acodec);
- if (used == NULL)
- {
- used = g_malloc0(count * sizeof(gboolean));
- g_hash_table_insert(track_indices, &acodec, used);
- }
// Try to find an item that matches the preferred language and
// the passthru codec type
if (acodec & (HB_ACODEC_AC3 | HB_ACODEC_DCA))
{
gint channels;
+ audio = (hb_audio_config_t*)hb_list_audio_config_item(
+ title->list_audio, ii );
+ try_acodec = (HB_ACODEC_AC3 | HB_ACODEC_DCA) & audio->in.codec;
+ // Is the source track use a passthru capable codec?
+ if (try_acodec == 0)
+ continue;
+ used = get_track_used(try_acodec, track_indices, count);
+ // Has the track already been used with this codec?
if (used[ii])
continue;
- audio = (hb_audio_config_t*)hb_list_audio_config_item(
- title->list_audio, ii );
channels = HB_INPUT_CH_LAYOUT_GET_DISCRETE_COUNT(
audio->in.channel_layout);
// Find a track that is not visually impaired or dirctor's
// commentary, and has the highest channel count.
- if ((audio->in.codec & acodec) &&
- (audio->lang.type < 2) &&
+ if ((audio->lang.type < 2) &&
((strcmp(lang, audio->lang.iso639_2) == 0) ||
(strcmp(lang, "und") == 0)))
{
}
}
}
+ try_acodec = fallback_acodec;
+ }
+ else
+ {
+ try_acodec = acodec;
}
if (track > -1)
{
return track;
}
// Try to find an item that matches the preferred language
+ used = get_track_used(try_acodec, track_indices, count);
for (ii = 0; ii < count; ii++)
{
+ // Has the track already been used with this codec?
if (used[ii])
continue;
- audio = (hb_audio_config_t*)hb_list_audio_config_item(
+ 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) &&
{
gint channels;
+ audio = (hb_audio_config_t*)hb_list_audio_config_item(
+ title->list_audio, ii );
+ try_acodec = (HB_ACODEC_AC3 | HB_ACODEC_DCA) & audio->in.codec;
+ // Is the source track use a passthru capable codec?
+ if (try_acodec == 0)
+ continue;
+ used = get_track_used(try_acodec, track_indices, count);
+ // Has the track already been used with this codec?
if (used[ii])
continue;
- audio = (hb_audio_config_t*)hb_list_audio_config_item(
- title->list_audio, ii );
channels = HB_INPUT_CH_LAYOUT_GET_DISCRETE_COUNT(
audio->in.channel_layout);
// Find a track that is not visually impaired or dirctor's
// commentary, and has the highest channel count.
- if ((audio->in.codec & acodec) &&
- (audio->lang.type < 2))
+ if (audio->lang.type < 2)
{
if (channels > max_chan)
{
}
}
}
+ try_acodec = fallback_acodec;
+ }
+ else
+ {
+ try_acodec = acodec;
}
if (track > -1)
{
return track;
}
// Try to fine an item that does not match the preferred language
+ used = get_track_used(try_acodec, track_indices, count);
for (ii = 0; ii < count; ii++)
{
+ // Has the track already been used with this codec?
if (used[ii])
continue;
- audio = (hb_audio_config_t*)hb_list_audio_config_item(
+ 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)
// Last ditch, anything goes
for (ii = 0; ii < count; ii++)
{
- audio = (hb_audio_config_t*)hb_list_audio_config_item(
+ audio = (hb_audio_config_t*)hb_list_audio_config_item(
title->list_audio, ii );
+ // Has the track already been used with this codec?
if (!used[ii])
{
track = ii;
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, "PtoPType", &point_to_point_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);
}
static const char * turbo_opts =
- "ref=1:subme=1:me=dia:analyse=none:trellis=0:"
+ "ref=1:subme=2:me=dia:analyse=none:trellis=0:"
"no-fast-pskip=0:8x8dct=0";
// Construct the x264 options string
}
void
+ghb_part_duration(gint tt, gint sc, gint ec, gint *hh, gint *mm, gint *ss)
+{
+ hb_list_t * list;
+ hb_title_t * title;
+ hb_chapter_t * chapter;
+ gint count, c;
+ gint64 duration;
+
+ *hh = *mm = *ss = 0;
+ if (h_scan == NULL) return;
+ list = hb_get_titles( h_scan );
+ title = (hb_title_t*)hb_list_item( list, tt );
+ if (title == NULL) return;
+
+ *hh = title->hours;
+ *mm = title->minutes;
+ *ss = title->seconds;
+
+ count = hb_list_count(title->list_chapter);
+ if (sc > count) sc = count;
+ if (ec > count) ec = count;
+
+ if (sc == 1 && ec == count)
+ return;
+
+ duration = 0;
+ for (c = sc; c <= ec; c++)
+ {
+ chapter = hb_list_item(title->list_chapter, c-1);
+ duration += chapter->duration;
+ }
+
+ *hh = duration / 90000 / 3600;
+ *mm = ((duration / 90000) % 3600) / 60;
+ *ss = (duration / 90000) % 60;
+}
+
+void
ghb_get_chapter_duration(gint ti, gint ii, gint *hh, gint *mm, gint *ss)
{
hb_list_t * list;
}
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;
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);
{
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);
}
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;
hb_close(&h_scan);
}
+void ghb_backend_scan_stop()
+{
+ hb_scan_stop( h_scan );
+}
+
void
ghb_backend_scan(const gchar *path, gint titleindex, gint preview_count)
{
case HB_STATE_WORKING:
hb_status.queue.state |= GHB_STATE_WORKING;
hb_status.queue.state &= ~GHB_STATE_PAUSED;
+ hb_status.queue.state &= ~GHB_STATE_SEARCHING;
+ 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;
+
+ case HB_STATE_SEARCHING:
+ hb_status.queue.state |= GHB_STATE_SEARCHING;
+ 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;
return FALSE;
}
- title = hb_list_item( list, titleindex );
+ title = hb_list_item( list, titleindex );
if (title == NULL) return FALSE; // Bad titleindex
+ tinfo->index = titleindex;
tinfo->width = title->width;
tinfo->height = title->height;
memcpy(tinfo->crop, title->crop, 4 * sizeof(int));
tinfo->duration = title->duration;
tinfo->angle_count = title->angle_count;
+ tinfo->path = title->path;
+ tinfo->name = title->name;
+ tinfo->type = title->type;
return TRUE;
}
static gboolean busy = FALSE;
g_debug("ghb_set_scale ()\n");
+ picture_settings_deps(ud);
if (h_scan == NULL) return;
list = hb_get_titles( h_scan );
if( !hb_list_count( list ) )
job = title->job;
if (job == NULL) return;
- picture_settings_deps(ud);
if (busy) return;
busy = TRUE;
{
codec = HB_ACODEC_FAAC;
}
- value = get_acodec_value(codec);
+ value = ghb_lookup_acodec_value(codec);
ghb_settings_take_value(asettings, "AudioEncoder", value);
}
gchar *a_unsup = NULL;
return FALSE;
}
g_free(message);
- value = get_acodec_value(codec);
+ value = ghb_lookup_acodec_value(codec);
ghb_settings_take_value(asettings, "AudioEncoder", value);
}
gint mix = ghb_settings_combo_int (asettings, "AudioMixdown");
}
if (!job->start_at_preview)
{
- gint chapter_start, chapter_end;
- chapter_start = ghb_settings_get_int(js, "start_chapter");
- chapter_end = ghb_settings_get_int(js, "end_chapter");
+ gint start, end;
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 );
+ gint duration = title->duration / 90000;
+ job->chapter_start = 1;
+ job->chapter_end = num_chapters;
+ if (ghb_settings_combo_int(js, "PtoPType") == 0)
+ {
+ start = ghb_settings_get_int(js, "start_point");
+ end = ghb_settings_get_int(js, "end_point");
+ job->chapter_start = MIN( num_chapters, start );
+ job->chapter_end = MAX( job->chapter_start, end );
+
+ }
+ if (ghb_settings_combo_int(js, "PtoPType") == 1)
+ {
+ job->chapter_start = 1;
+ job->chapter_end = num_chapters;
+ start = ghb_settings_get_int(js, "start_point");
+ end = ghb_settings_get_int(js, "end_point");
+ job->pts_to_start = (int64_t)MIN(duration-1, start) * 90000;
+ job->pts_to_stop = (int64_t)MAX(start+1, end) * 90000 -
+ job->pts_to_start;
+ }
+ if (ghb_settings_combo_int(js, "PtoPType") == 2)
+ {
+ job->chapter_start = 1;
+ job->chapter_end = num_chapters;
+ start = ghb_settings_get_int(js, "start_point");
+ end = ghb_settings_get_int(js, "end_point");
+ gint64 max_frames;
+ max_frames = (gint64)duration * title->rate / title->rate_base;
+ job->frame_to_start = (int64_t)MIN(max_frames-1, start-1);
+ job->frame_to_stop = (int64_t)MAX(start, end-1) -
+ job->frame_to_start;
+ }
job->chapter_markers = ghb_settings_get_boolean(js, "ChapterMarkers");
if (job->chapter_start == job->chapter_end)
job->chapter_markers = 0;
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++)
+ for(chap = start; chap <= end; chap++)
{
hb_chapter_t * chapter_s;
gchar *name;
-
+
name = NULL;
if (chap-1 < count)
{