X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=gtk%2Fsrc%2Faudiohandler.c;h=f8804e561b536d35af0ff0314129925109ed9513;hb=b67c31f229fcdd3dd1d8784938229ae61f822282;hp=1638e0a27cd19945475fd25c0687c9076150e9e8;hpb=b46d27700507369ab125f043f8e0a5ed3f7c77e7;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/gtk/src/audiohandler.c b/gtk/src/audiohandler.c index 1638e0a2..f8804e56 100644 --- a/gtk/src/audiohandler.c +++ b/gtk/src/audiohandler.c @@ -47,15 +47,27 @@ ghb_adjust_audio_rate_combos(signal_user_data_t *ud) if (ghb_audio_is_passthru (acodec)) { - ghb_set_default_bitrate_opts (ud->builder, -1); + ghb_set_default_bitrate_opts (ud->builder, 0, -1); if (ghb_get_audio_info (&ainfo, titleindex, audioindex)) { gint br = ainfo.bitrate / 1000; // Set the values for bitrate and samplerate to the input rates - ghb_set_passthru_bitrate_opts (ud->builder, br); + if (br < 8) + br = 160; + if (ghb_audio_is_passthru (ainfo.codec)) + { + ghb_set_passthru_bitrate_opts (ud->builder, br); + ghb_ui_update(ud, "AudioMixdown", ghb_int64_value(0)); + } + else + { + acodec = ghb_select_audio_codec(ud, audioindex); + br = ghb_find_closest_audio_bitrate(acodec, br); + mix = ghb_get_best_mix( titleindex, audioindex, acodec, 0); + ghb_ui_update(ud, "AudioMixdown", ghb_int64_value(mix)); + } ghb_ui_update(ud, "AudioBitrate", ghb_int64_value(br)); ghb_ui_update(ud, "AudioSamplerate", ghb_int64_value(0)); - ghb_ui_update(ud, "AudioMixdown", ghb_int64_value(0)); } else { @@ -65,26 +77,34 @@ ghb_adjust_audio_rate_combos(signal_user_data_t *ud) } ghb_ui_update(ud, "AudioTrackDRCSlider", ghb_double_value(0)); } - else if (acodec == HB_ACODEC_FAAC && mix != HB_AMIXDOWN_6CH) + else if (acodec == HB_ACODEC_FAAC) { - gint br; + gint br, last = 160, first = 0; + + if (mix == HB_AMIXDOWN_6CH) + { + first = 192; + last = 448; + } widget = GHB_WIDGET(ud->builder, "AudioBitrate"); gval = ghb_widget_value(widget); br = ghb_lookup_combo_int("AudioBitrate", gval); ghb_value_free(gval); - if (br > 160) - ghb_ui_update(ud, "AudioBitrate", ghb_int64_value(160)); - ghb_set_default_bitrate_opts (ud->builder, 160); + if (br > last) + ghb_ui_update(ud, "AudioBitrate", ghb_int64_value(last)); + if (br < first) + ghb_ui_update(ud, "AudioBitrate", ghb_int64_value(first)); + ghb_set_default_bitrate_opts (ud->builder, first, last); } else { - ghb_set_default_bitrate_opts (ud->builder, -1); + ghb_set_default_bitrate_opts (ud->builder, 0, -1); } } -void -free_audio_index_list(gpointer data) +static void +free_audio_hash_key_value(gpointer data) { g_free(data); } @@ -107,19 +127,27 @@ ghb_get_user_audio_lang(signal_user_data_t *ud, gint titleindex, gint track) void ghb_set_pref_audio(gint titleindex, signal_user_data_t *ud) { - gint acodec_code, mix_code, track; + gint fallback_acodec, track; gchar *source_lang = NULL; GtkWidget *button; ghb_audio_info_t ainfo; GHashTable *track_indices; + gint mux; const GValue *pref_audio; - const GValue *audio, *acodec, *bitrate, *rate, *mix, *drc; + const GValue *audio, *drc; + gint acodec, bitrate, mix; + gdouble rate; gint count, ii, list_count; g_debug("set_pref_audio"); + mux = ghb_settings_combo_int(ud->settings, "FileFormat"); + if (mux == HB_MUX_MP4) + fallback_acodec = HB_ACODEC_FAAC; + else + fallback_acodec = HB_ACODEC_LAME; track_indices = g_hash_table_new_full(g_int_hash, g_int_equal, - NULL, free_audio_index_list); + free_audio_hash_key_value, free_audio_hash_key_value); // Clear the audio list ghb_clear_audio_list(ud); // Find "best" audio based on audio preferences @@ -138,60 +166,67 @@ ghb_set_pref_audio(gint titleindex, signal_user_data_t *ud) for (ii = 0; ii < count; ii++) { audio = ghb_array_get_nth(pref_audio, ii); - acodec = ghb_settings_get_value(audio, "AudioEncoder"); - bitrate = ghb_settings_get_value(audio, "AudioBitrate"); - rate = ghb_settings_get_value(audio, "AudioSamplerate"); - mix = ghb_settings_get_value(audio, "AudioMixdown"); + acodec = ghb_settings_combo_int(audio, "AudioEncoder"); + bitrate = ghb_settings_combo_int(audio, "AudioBitrate"); + rate = ghb_settings_combo_double(audio, "AudioSamplerate"); + mix = ghb_settings_combo_int(audio, "AudioMixdown"); drc = ghb_settings_get_value(audio, "AudioTrackDRCSlider"); - acodec_code = ghb_lookup_combo_int("AudioEncoder", acodec); + //acodec_code = ghb_lookup_combo_int("AudioEncoder", acodec); // If there are multiple audios using the same codec, then // select sequential tracks for each. The hash keeps track // of the tracks used for each codec. track = ghb_find_audio_track(titleindex, source_lang, - acodec_code, track_indices); + acodec, fallback_acodec, track_indices); // Check to see if: - // 1. pref codec is ac3 - // 2. source codec is not ac3 + // 1. pref codec is passthru + // 2. source codec is not passthru // 3. next pref is enabled if (ghb_get_audio_info (&ainfo, titleindex, track) && - ghb_audio_is_passthru (acodec_code)) + ghb_audio_is_passthru (acodec)) { - // HB_ACODEC_* are bit fields. Treat acodec_code as mask - if (!(ainfo.codec & acodec_code)) + // HB_ACODEC_* are bit fields. Treat acodec as mask + if (!(ainfo.codec & acodec & (HB_ACODEC_AC3 | HB_ACODEC_DCA))) { - acodec_code = ghb_get_default_acodec(); + acodec = fallback_acodec; // If there's more audio to process, or we've already // placed one in the list, then we can skip this one if ((ii + 1 < count) || (list_count != 0)) { // Skip this audio - acodec_code = 0; + acodec = 0; + } + else + { + bitrate = ainfo.bitrate / 1000; + if (bitrate < 8) + bitrate = 160; + rate = 0; + mix = HB_AMIXDOWN_DOLBYPLII; } } else { - acodec_code &= ainfo.codec; + acodec &= ainfo.codec; } } if (titleindex >= 0 && track < 0) - acodec_code = 0; - if (acodec_code != 0) + acodec = 0; + if (acodec != 0) { // Add to audio list g_signal_emit_by_name(button, "clicked", ud); list_count++; ghb_ui_update(ud, "AudioTrack", ghb_int64_value(track)); - ghb_ui_update(ud, "AudioEncoder", acodec); - if (!ghb_audio_is_passthru (acodec_code)) + ghb_ui_update(ud, "AudioEncoder", ghb_int64_value(acodec)); + if (!ghb_audio_is_passthru (acodec)) { // This gets set autimatically if the codec is passthru - ghb_ui_update(ud, "AudioBitrate", bitrate); - ghb_ui_update(ud, "AudioSamplerate", rate); - mix_code = ghb_lookup_combo_int("AudioMixdown", mix); - mix_code = ghb_get_best_mix( - titleindex, track, acodec_code, mix_code); - ghb_ui_update(ud, "AudioMixdown", ghb_int64_value(mix_code)); + ghb_ui_update(ud, "AudioBitrate", ghb_int64_value(bitrate)); + ghb_ui_update(ud, "AudioSamplerate", ghb_double_value(rate)); + mix = ghb_get_best_mix( titleindex, track, acodec, mix); + ghb_ui_update(ud, "AudioMixdown", ghb_int64_value(mix)); } + ghb_adjust_audio_rate_combos(ud); ghb_ui_update(ud, "AudioTrackDRCSlider", drc); } } @@ -232,8 +267,8 @@ get_selected_asettings(signal_user_data_t *ud) return asettings; } -static void -audio_list_refresh_selected(signal_user_data_t *ud) +void +ghb_audio_list_refresh_selected(signal_user_data_t *ud) { GtkTreeView *treeview; GtkTreePath *treepath; @@ -245,13 +280,14 @@ audio_list_refresh_selected(signal_user_data_t *ud) GValue *asettings = NULL; const GValue *audio_list; - g_debug("audio_list_refresh_selected ()"); + g_debug("ghb_audio_list_refresh_selected ()"); treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "audio_list")); selection = gtk_tree_view_get_selection (treeview); if (gtk_tree_selection_get_selected(selection, &store, &iter)) { const gchar *track, *codec, *br, *sr, *mix; gchar *s_drc, *s_track, *s_codec, *s_br, *s_sr, *s_mix; + gint itrack, icodec; gdouble drc; // Get the row number treepath = gtk_tree_model_get_path (store, &iter); @@ -266,7 +302,9 @@ audio_list_refresh_selected(signal_user_data_t *ud) asettings = ghb_array_get_nth(audio_list, row); track = ghb_settings_combo_option(asettings, "AudioTrack"); + itrack = ghb_settings_combo_int(asettings, "AudioTrack"); codec = ghb_settings_combo_option(asettings, "AudioEncoder"); + icodec = ghb_settings_combo_int(asettings, "AudioEncoder"); br = ghb_settings_combo_option(asettings, "AudioBitrate"); sr = ghb_settings_combo_option(asettings, "AudioSamplerate"); mix = ghb_settings_combo_option(asettings, "AudioMixdown"); @@ -282,6 +320,9 @@ audio_list_refresh_selected(signal_user_data_t *ud) else s_drc = g_strdup_printf("%.1f", drc); + if (icodec == HB_ACODEC_MASK) + codec = ghb_select_audio_codec_str(ud, itrack); + gtk_list_store_set(GTK_LIST_STORE(store), &iter, // These are displayed in list 0, track, @@ -337,28 +378,15 @@ audio_codec_changed_cb(GtkWidget *widget, signal_user_data_t *ud) } ghb_adjust_audio_rate_combos(ud); ghb_grey_combo_options (ud->builder); - ghb_check_dependency(ud, widget); + ghb_check_dependency(ud, widget, NULL); prev_acodec = acodec_code; asettings = get_selected_asettings(ud); if (asettings != NULL) { ghb_widget_to_setting(asettings, widget); - audio_list_refresh_selected(ud); - } - - const GValue *audio_list; - audio_list = ghb_settings_get_value(ud->settings, "audio_list"); - if (ghb_ac3_in_audio_list (audio_list)) - { - gchar *container; - - container = ghb_settings_get_string(ud->settings, "FileFormat"); - if (strcmp(container, "mp4") == 0) - { - ghb_ui_update(ud, "FileFormat", ghb_string_value("m4v")); - } - g_free(container); + ghb_audio_list_refresh_selected(ud); } + ghb_update_destination_extension(ud); ghb_live_reset(ud); } @@ -369,7 +397,7 @@ audio_track_changed_cb(GtkWidget *widget, signal_user_data_t *ud) g_debug("audio_track_changed_cb ()"); ghb_adjust_audio_rate_combos(ud); - ghb_check_dependency(ud, widget); + ghb_check_dependency(ud, widget, NULL); ghb_grey_combo_options(ud->builder); asettings = get_selected_asettings(ud); if (asettings != NULL) @@ -377,7 +405,7 @@ audio_track_changed_cb(GtkWidget *widget, signal_user_data_t *ud) const gchar *track; ghb_widget_to_setting(asettings, widget); - audio_list_refresh_selected(ud); + ghb_audio_list_refresh_selected(ud); track = ghb_settings_combo_option(asettings, "AudioTrack"); ghb_settings_set_string(asettings, "AudioTrackDescription", track); } @@ -391,12 +419,12 @@ audio_mix_changed_cb(GtkWidget *widget, signal_user_data_t *ud) g_debug("audio_mix_changed_cb ()"); ghb_adjust_audio_rate_combos(ud); - ghb_check_dependency(ud, widget); + ghb_check_dependency(ud, widget, NULL); asettings = get_selected_asettings(ud); if (asettings != NULL) { ghb_widget_to_setting(asettings, widget); - audio_list_refresh_selected(ud); + ghb_audio_list_refresh_selected(ud); } ghb_live_reset(ud); } @@ -407,12 +435,12 @@ audio_widget_changed_cb(GtkWidget *widget, signal_user_data_t *ud) GValue *asettings; g_debug("audio_widget_changed_cb ()"); - ghb_check_dependency(ud, widget); + ghb_check_dependency(ud, widget, NULL); asettings = get_selected_asettings(ud); if (asettings != NULL) { ghb_widget_to_setting(asettings, widget); - audio_list_refresh_selected(ud); + ghb_audio_list_refresh_selected(ud); } ghb_live_reset(ud); } @@ -433,12 +461,12 @@ drc_widget_changed_cb(GtkWidget *widget, gdouble val, signal_user_data_t *ud) drc = g_strdup_printf("%.1f", val); gtk_label_set_text(label, drc); g_free(drc); - ghb_check_dependency(ud, widget); + ghb_check_dependency(ud, widget, NULL); asettings = get_selected_asettings(ud); if (asettings != NULL) { ghb_widget_to_setting(asettings, widget); - audio_list_refresh_selected(ud); + ghb_audio_list_refresh_selected(ud); } ghb_live_reset(ud); } @@ -450,10 +478,10 @@ drc_widget_changed_cb(GtkWidget *widget, gdouble val, signal_user_data_t *ud) G_MODULE_EXPORT void subtitle_changed_cb(GtkWidget *widget, signal_user_data_t *ud) { - const gchar *name = gtk_widget_get_name(widget); + const gchar *name = ghb_get_setting_key(widget); g_debug("subtitle_changed_cb () %s", name); ghb_widget_to_setting(ud->settings, widget); - ghb_check_dependency(ud, widget); + ghb_check_dependency(ud, widget, NULL); ghb_live_reset(ud); } @@ -487,6 +515,7 @@ add_to_audio_list(signal_user_data_t *ud, GValue *settings) GtkTreeSelection *selection; const gchar *track, *codec, *br, *sr, *mix; gchar *s_drc, *s_track, *s_codec, *s_br, *s_sr, *s_mix; + gint icodec, itrack; gdouble drc; g_debug("add_to_audio_list ()"); @@ -495,7 +524,9 @@ add_to_audio_list(signal_user_data_t *ud, GValue *settings) store = GTK_LIST_STORE(gtk_tree_view_get_model(treeview)); track = ghb_settings_combo_option(settings, "AudioTrack"); + itrack = ghb_settings_combo_int(settings, "AudioTrack"); codec = ghb_settings_combo_option(settings, "AudioEncoder"); + icodec = ghb_settings_combo_int(settings, "AudioEncoder"); br = ghb_settings_combo_option(settings, "AudioBitrate"); sr = ghb_settings_combo_option(settings, "AudioSamplerate"); mix = ghb_settings_combo_option(settings, "AudioMixdown"); @@ -511,6 +542,10 @@ add_to_audio_list(signal_user_data_t *ud, GValue *settings) else s_drc = g_strdup_printf("%.1f", drc); + if (icodec == HB_ACODEC_MASK) + { + codec = ghb_select_audio_codec_str(ud, itrack); + } gtk_list_store_append(store, &iter); gtk_list_store_set(store, &iter, @@ -616,6 +651,7 @@ audio_add_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud) { gtk_widget_set_sensitive(xwidget, FALSE); } + ghb_update_destination_extension(ud); } G_MODULE_EXPORT void