diff options
| -rw-r--r-- | gtk/src/audiohandler.c | 234 | ||||
| -rw-r--r-- | gtk/src/audiohandler.h | 1 | ||||
| -rw-r--r-- | gtk/src/hb-backend.c | 4 | ||||
| -rw-r--r-- | gtk/src/queuehandler.c | 5 | ||||
| -rw-r--r-- | libhb/preset.c | 99 | ||||
| -rw-r--r-- | libhb/preset.h | 2 |
6 files changed, 224 insertions, 121 deletions
diff --git a/gtk/src/audiohandler.c b/gtk/src/audiohandler.c index ba35ef972..c42ebdbfd 100644 --- a/gtk/src/audiohandler.c +++ b/gtk/src/audiohandler.c @@ -41,112 +41,46 @@ static void ghb_clear_audio_list_ui(GtkBuilder *builder); static gboolean block_updates = FALSE; -static void -ghb_sanitize_audio_settings(GhbValue *settings, GhbValue *asettings) +gboolean ghb_audio_quality_enabled(const GhbValue *asettings) { - int title_id, titleindex; - const hb_title_t *title; - gint track, acodec, mix; - double quality; - hb_audio_config_t *aconfig; - gint bitrate; - gint sr; - GhbValue *val; - gboolean qe; + int bitrate; + double quality; + GhbValue * val; - const char *mux_id; - const hb_container_t *mux; + bitrate = ghb_dict_get_int(asettings, "Bitrate"); + quality = ghb_dict_get_double(asettings, "Quality"); + val = ghb_dict_get(asettings, "Quality"); - mux_id = ghb_dict_get_string(settings, "FileFormat"); - mux = ghb_lookup_container_by_name(mux_id); + return !(bitrate > 0 || val == NULL || quality == HB_INVALID_AUDIO_QUALITY); +} - title_id = ghb_dict_get_int(settings, "title"); - title = ghb_lookup_title(title_id, &titleindex); +static void +ghb_sanitize_audio_settings(GhbValue *settings, GhbValue *asettings) +{ + // Sanitize codec + const char * mux_name; + int title_id, mux, acodec, fallback, copy_mask, track; + hb_audio_config_t * aconfig; + const hb_title_t * title; - track = ghb_dict_get_int(asettings, "Track"); - acodec = ghb_settings_audio_encoder_codec(asettings, "Encoder"); - mix = ghb_settings_mixdown_mix(asettings, "Mixdown"); - bitrate = ghb_dict_get_int(asettings, "Bitrate"); - quality = ghb_dict_get_double(asettings, "Quality"); - sr = ghb_dict_get_int(asettings, "Samplerate"); - val = ghb_dict_get(asettings, "QualityEnable"); - if (val == NULL) - { - val = ghb_dict_get(asettings, "Quality"); - if (bitrate > 0 || val == NULL || quality == HB_INVALID_AUDIO_QUALITY) - { - ghb_dict_set_bool(asettings, "QualityEnable", 0); - } - else - { - ghb_dict_set_bool(asettings, "QualityEnable", 1); - } - } - qe = ghb_dict_get_bool(asettings, "QualityEnable"); + title_id = ghb_dict_get_int(settings, "title"); + title = ghb_lookup_title(title_id, NULL); - aconfig = ghb_get_audio_info(title, track); - if (sr == 0 && aconfig != NULL) - { - sr = aconfig->in.samplerate; - } + mux_name = ghb_dict_get_string(settings, "FileFormat"); + mux = hb_container_get_from_name(mux_name); - int fallback, copy_mask; + acodec = ghb_settings_audio_encoder_codec(asettings, "Encoder"); fallback = ghb_select_fallback(settings, acodec); copy_mask = ghb_get_copy_mask(settings); - acodec = ghb_select_audio_codec(mux->format, aconfig, acodec, + track = ghb_dict_get_int(asettings, "Track"); + aconfig = ghb_get_audio_info(title, track); + acodec = ghb_select_audio_codec(mux, aconfig, acodec, fallback, copy_mask); - if (ghb_audio_is_passthru(acodec)) - { - mix = HB_AMIXDOWN_NONE; - ghb_dict_set_string(asettings, "Mixdown", - hb_mixdown_get_short_name(mix)); - ghb_dict_set(asettings, "Samplerate", ghb_int_value_new(0)); - ghb_dict_set_double(asettings, "DRC", 0.0); - } - else - { - if (mix == HB_AMIXDOWN_NONE) - mix = ghb_get_best_mix(aconfig, acodec, mix); - if (qe) - { - float low, high, gran; - int dir; - hb_audio_quality_get_limits(acodec, &low, &high, &gran, &dir); - if (quality < low || quality > high) - { - quality = hb_audio_quality_get_default(acodec); - } - else - { - quality = hb_audio_quality_get_best(acodec, quality); - } - } - else - { - if (bitrate != -1) - { - bitrate = hb_audio_bitrate_get_best(acodec, bitrate, sr, mix); - } - else - { - bitrate = hb_audio_bitrate_get_default(acodec, sr, mix); - } - } - ghb_dict_set_string(asettings, "Mixdown", - hb_mixdown_get_short_name(mix)); - } - if (qe) - { - bitrate = -1; - } - else - { - quality = HB_INVALID_AUDIO_QUALITY; - } - ghb_dict_set_int(asettings, "Quality", quality); - ghb_dict_set_int(asettings, "Bitrate", bitrate); ghb_dict_set_string(asettings, "Encoder", hb_audio_encoder_get_short_name(acodec)); + + // Sanitize the rest + hb_sanitize_audio_settings(title, asettings); } static gdouble get_quality(int codec, gdouble quality) @@ -166,6 +100,10 @@ static gdouble get_ui_quality(GhbValue *settings) { int codec = ghb_settings_audio_encoder_codec(settings, "Encoder"); gdouble quality = ghb_dict_get_double(settings, "Quality"); + if (quality == HB_INVALID_AUDIO_QUALITY) + { + return quality; + } return get_quality(codec, quality); } @@ -273,7 +211,7 @@ audio_deps(signal_user_data_t *ud, GhbValue *asettings, GtkWidget *widget) int track = -1, title_id, mix = 0, acodec = 0, sr = 0; hb_audio_config_t *aconfig = NULL; const hb_title_t *title; - gboolean qe = FALSE; + gboolean qe; title_id = ghb_dict_get_int(ud->settings, "title"); title = ghb_lookup_title(title_id, NULL); @@ -285,7 +223,6 @@ audio_deps(signal_user_data_t *ud, GhbValue *asettings, GtkWidget *widget) aconfig = ghb_get_audio_info(title, track); mix = ghb_settings_mixdown_mix(asettings, "Mixdown"); sr = ghb_dict_get_int(asettings, "Samplerate"); - qe = ghb_dict_get_bool(asettings, "QualityEnable"); if (sr == 0 && aconfig != NULL) { sr = aconfig->in.samplerate; @@ -308,6 +245,7 @@ audio_deps(signal_user_data_t *ud, GhbValue *asettings, GtkWidget *widget) widget = GHB_WIDGET(ud->builder, "AudioTrackDRCValue"); gtk_widget_set_sensitive(widget, enable_drc); + qe = ghb_dict_get_bool(ud->settings, "AudioTrackQualityEnable"); enable_quality_widgets(ud, qe, acodec, sr, mix); widget = GHB_WIDGET(ud->builder, "AudioMixdown"); @@ -541,7 +479,7 @@ audio_update_dialog_widgets(signal_user_data_t *ud, GhbValue *asettings) ghb_ui_update(ud, "AudioTrackQualityValue", ghb_string_value(s_quality)); // Setting a radio button to FALSE does not automatically make // the other one TRUE - qe = ghb_dict_get_bool(asettings, "QualityEnable"); + qe = ghb_audio_quality_enabled(asettings); if (qe) { ghb_ui_update(ud, "AudioTrackQualityEnable", @@ -578,7 +516,6 @@ audio_add_track( const hb_title_t *title, int track, int encoder, - gboolean enable_quality, gdouble quality, int bitrate, int samplerate, @@ -595,12 +532,7 @@ audio_add_track( ghb_dict_set_int(asettings, "Track", track); ghb_dict_set_string(asettings, "Encoder", hb_audio_encoder_get_short_name(encoder)); - ghb_dict_set_bool(asettings, "QualityEnable", enable_quality); ghb_dict_set_double(asettings, "Quality", quality); - if (enable_quality) - { - bitrate = -1; - } ghb_dict_set_int(asettings, "Bitrate", bitrate); ghb_dict_set_int(asettings, "Samplerate", samplerate); @@ -655,6 +587,14 @@ audio_select_and_add_track( gain = ghb_dict_get_double(audio, "AudioTrackGainSlider"); enable_quality = ghb_dict_get_bool(audio, "AudioTrackQualityEnable"); quality = ghb_dict_get_double(audio, "AudioTrackQuality"); + if (enable_quality) + { + bitrate = -1; + } + else + { + quality = HB_INVALID_AUDIO_QUALITY; + } track = ghb_find_audio_track(title, lang, start_track); if (track >= 0) @@ -669,7 +609,7 @@ audio_select_and_add_track( mux->format, aconfig, acodec, fallback, copy_mask); asettings = audio_add_track(settings, title, track, select_acodec, - enable_quality, quality, bitrate, + quality, bitrate, samplerate, mix, drc, gain); } return asettings; @@ -772,19 +712,20 @@ audio_refresh_list_row_ui( s_track = aconfig->lang.description; encoder = ghb_settings_audio_encoder(settings, "Encoder"); - double quality = ghb_dict_get_double(settings, "Quality"); - int bitrate = ghb_dict_get_int(settings, "Bitrate"); - if (bitrate > 0) - { - s_br_quality = g_strdup_printf(_("Bitrate: %dkbps\n"), bitrate); - } - else if (quality != HB_INVALID_AUDIO_QUALITY) + gboolean qe = ghb_audio_quality_enabled(settings); + double quality = ghb_dict_get_double(settings, "Quality"); + int bitrate = ghb_dict_get_int(settings, "Bitrate"); + if (qe && quality != HB_INVALID_AUDIO_QUALITY) { char *tmp = ghb_format_quality(_("Quality: "), encoder->codec, quality); s_br_quality = g_strdup_printf("%s\n", tmp); g_free(tmp); } + else if (bitrate > 0) + { + s_br_quality = g_strdup_printf(_("Bitrate: %dkbps\n"), bitrate); + } else { s_br_quality = g_strdup(""); @@ -984,6 +925,14 @@ audio_codec_changed_cb(GtkWidget *widget, signal_user_data_t *ud) int dir; hb_audio_quality_get_limits(acodec, &low, &high, &gran, &dir); defval = hb_audio_quality_get_default(acodec); + if (asettings != NULL && ghb_audio_quality_enabled(asettings)) + { + gdouble quality = ghb_dict_get_double(asettings, "Quality"); + if (low <= quality && quality <= high) + { + defval = quality; + } + } GtkScaleButton *sb; GtkAdjustment *adj; sb = GTK_SCALE_BUTTON(GHB_WIDGET(ud->builder, "AudioTrackQualityX")); @@ -993,7 +942,7 @@ audio_codec_changed_cb(GtkWidget *widget, signal_user_data_t *ud) // Quality values are inverted defval = high - defval + low; } - gtk_adjustment_configure(adj, defval, low, high, gran, gran * 10, 0); + gtk_adjustment_configure(adj, defval, low, high, gran, gran, 0); if (block_updates) { @@ -1132,7 +1081,11 @@ audio_bitrate_changed_cb(GtkWidget *widget, signal_user_data_t *ud) ghb_widget_to_setting(ud->settings, widget); br = ghb_settings_audio_bitrate_rate(ud->settings, "AudioBitrate"); - audio_update_setting(ghb_int_value_new(br), "Bitrate", ud); + GhbValue * asettings = audio_get_selected_settings(ud, NULL); + if (asettings != NULL && !ghb_audio_quality_enabled(asettings)) + { + audio_update_setting(ghb_int_value_new(br), "Bitrate", ud); + } } G_MODULE_EXPORT void @@ -1149,7 +1102,50 @@ G_MODULE_EXPORT void audio_quality_radio_changed_cb(GtkWidget *widget, signal_user_data_t *ud) { ghb_widget_to_setting(ud->settings, widget); - audio_update_setting(ghb_widget_value(widget), "QualityEnable", ud); + + GhbValue * asettings = audio_get_selected_settings(ud, NULL); + if (asettings != NULL) + { + if (ghb_dict_get_bool(ud->settings, "AudioTrackQualityEnable")) + { + double quality = ghb_dict_get_double(asettings, "Quality"); + if (quality == HB_INVALID_AUDIO_QUALITY) + { + int acodec; + + acodec = ghb_settings_audio_encoder_codec(asettings, "Encoder"); + quality = hb_audio_quality_get_default(acodec); + ghb_dict_set_double(asettings, "Quality", quality); + } + ghb_dict_set_int(asettings, "Bitrate", -1); + } + else + { + int bitrate = ghb_dict_get_int(asettings, "Bitrate"); + if (bitrate <= 0) + { + const hb_title_t * title; + hb_audio_config_t * aconfig; + int track, acodec, sr, mix, title_id; + + title_id = ghb_dict_get_int(ud->settings, "title"); + title = ghb_lookup_title(title_id, NULL); + track = ghb_dict_get_int(asettings, "Track"); + acodec = ghb_settings_audio_encoder_codec(asettings, "Encoder"); + aconfig = ghb_get_audio_info(title, track); + mix = ghb_settings_mixdown_mix(asettings, "Mixdown"); + sr = ghb_dict_get_int(asettings, "Samplerate"); + if (sr == 0 && aconfig != NULL) + { + sr = aconfig->in.samplerate; + } + bitrate = hb_audio_bitrate_get_default(acodec, sr, mix); + ghb_dict_set_int(asettings, "Bitrate", bitrate); + } + ghb_dict_set_double(asettings, "Quality", HB_INVALID_AUDIO_QUALITY); + } + } + audio_deps(ud, asettings, NULL); } G_MODULE_EXPORT void @@ -1209,7 +1205,11 @@ quality_widget_changed_cb(GtkWidget *widget, gdouble quality, signal_user_data_t ghb_ui_update( ud, "AudioTrackQualityValue", ghb_string_value(s_quality)); g_free(s_quality); - audio_update_setting(ghb_double_value_new(quality), "Quality", ud); + GhbValue * asettings = audio_get_selected_settings(ud, NULL); + if (asettings != NULL && ghb_audio_quality_enabled(asettings)) + { + audio_update_setting(ghb_double_value_new(quality), "Quality", ud); + } } G_MODULE_EXPORT void @@ -1551,6 +1551,8 @@ G_MODULE_EXPORT void audio_reset_clicked_cb(GtkWidget *widget, signal_user_data_t *ud) { ghb_set_pref_audio_settings(ud->settings); + ghb_sanitize_audio_tracks(ud); + audio_update_dialog_widgets(ud, audio_get_selected_settings(ud, NULL)); audio_refresh_list_ui(ud); } @@ -2087,7 +2089,7 @@ static void audio_quality_update_limits( GtkAdjustment *adj; sb = GTK_SCALE_BUTTON(widget); adj = gtk_scale_button_get_adjustment(sb); - gtk_adjustment_configure (adj, value, low, high, gran, gran * 10, 0); + gtk_adjustment_configure (adj, value, low, high, gran, gran, 0); } void audio_def_set_limits(signal_user_data_t *ud, GtkWidget *widget, gboolean set_default) diff --git a/gtk/src/audiohandler.h b/gtk/src/audiohandler.h index fb8e3e095..bb01e30fd 100644 --- a/gtk/src/audiohandler.h +++ b/gtk/src/audiohandler.h @@ -43,5 +43,6 @@ void ghb_audio_defaults_to_ui(signal_user_data_t *ud); GtkListBoxRow* ghb_find_lang_row(GtkListBox *list_box, int lang_idx); void ghb_audio_title_change(signal_user_data_t *ud, gboolean title_valid); void ghb_clear_audio_selection(GtkBuilder *builder); +gboolean ghb_audio_quality_enabled(const GhbValue *asettings); #endif // _AUDIOHANDLER_H_ diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c index 3eef1fede..17ab63d28 100644 --- a/gtk/src/hb-backend.c +++ b/gtk/src/hb-backend.c @@ -4094,8 +4094,8 @@ ghb_validate_audio(GhbValue *settings, GtkWindow *parent) int ghb_add_job(hb_handle_t *h, GhbValue *job_dict) { - char *json_job; - int sequence_id; + char * json_job; + int sequence_id; json_job = hb_value_get_json(job_dict); sequence_id = hb_add_json(h, json_job); diff --git a/gtk/src/queuehandler.c b/gtk/src/queuehandler.c index ffb9016fd..d8838ba74 100644 --- a/gtk/src/queuehandler.c +++ b/gtk/src/queuehandler.c @@ -634,10 +634,9 @@ add_to_queue_list(signal_user_data_t *ud, GhbValue *queueDict, GtkTreeIter *pite asettings = ghb_array_get(jobAudioList, ii); audio_encoder = ghb_settings_audio_encoder(asettings, "Encoder"); - double q = ghb_dict_get_double(asettings, "Quality"); - if (ghb_dict_get_bool(asettings, "QualityEnable") && - q != HB_INVALID_AUDIO_QUALITY) + if (ghb_audio_quality_enabled(asettings)) { + double q = ghb_dict_get_double(asettings, "Quality"); quality = ghb_format_quality(_("Quality: "), audio_encoder->codec, q); } else diff --git a/libhb/preset.c b/libhb/preset.c index 8f6ccc07c..60f46b218 100644 --- a/libhb/preset.c +++ b/libhb/preset.c @@ -507,6 +507,101 @@ static int sanitize_audio_codec(int in_codec, int out_codec, return codec; } +void hb_sanitize_audio_settings(const hb_title_t * title, + hb_value_t * audio_settings) +{ + const char * mix_name; + const char * codec_name; + int track, codec, mix, bitrate, samplerate; + int quality_enable; + double quality; + hb_value_t * val; + hb_audio_config_t * audio_config = NULL; + + track = hb_dict_get_int(audio_settings, "Track"); + codec_name = hb_dict_get_string(audio_settings, "Encoder"); + codec = hb_audio_encoder_get_from_name(codec_name); + mix_name = hb_dict_get_string(audio_settings, "Mixdown"); + mix = hb_mixdown_get_from_name(mix_name); + bitrate = hb_dict_get_int(audio_settings, "Bitrate"); + quality = hb_dict_get_double(audio_settings, "Quality"); + samplerate = hb_dict_get_int(audio_settings, "Samplerate"); + val = hb_dict_get(audio_settings, "Quality"); + quality_enable = !(bitrate > 0 || val == NULL || + quality == HB_INVALID_AUDIO_QUALITY); + + if (title != NULL) + { + audio_config = hb_list_audio_config_item(title->list_audio, track); + } + if (samplerate == 0 && audio_config != NULL) + { + samplerate = audio_config->in.samplerate; + } + + if (codec & HB_ACODEC_PASS_FLAG) + { + mix = HB_AMIXDOWN_NONE; + hb_dict_set(audio_settings, "Mixdown", + hb_value_string(hb_mixdown_get_short_name(mix))); + hb_dict_set(audio_settings, "Samplerate", hb_value_int(0)); + hb_dict_set(audio_settings, "DRC", hb_value_double(0.0)); + } + else + { + int layout = AV_CH_LAYOUT_5POINT1; + if (audio_config != NULL) + { + layout = audio_config->in.channel_layout; + } + if (mix == HB_AMIXDOWN_NONE) + { + mix = HB_INVALID_AMIXDOWN; + } + mix = hb_mixdown_get_best(codec, layout, mix); + if (quality_enable) + { + float low, high, gran; + int dir; + hb_audio_quality_get_limits(codec, &low, &high, &gran, &dir); + if (quality < low || quality > high) + { + quality = hb_audio_quality_get_default(codec); + } + else + { + quality = hb_audio_quality_get_best(codec, quality); + } + } + else + { + if (bitrate != -1) + { + bitrate = hb_audio_bitrate_get_best(codec, bitrate, + samplerate, mix); + } + else + { + bitrate = hb_audio_bitrate_get_default(codec, samplerate, mix); + } + } + hb_dict_set(audio_settings, "Mixdown", + hb_value_string(hb_mixdown_get_short_name(mix))); + } + if (quality_enable) + { + bitrate = -1; + } + else + { + quality = HB_INVALID_AUDIO_QUALITY; + } + hb_dict_set(audio_settings, "Quality", hb_value_double(quality)); + hb_dict_set(audio_settings, "Bitrate", hb_value_int(bitrate)); + hb_dict_set(audio_settings, "Encoder", + hb_value_string(hb_audio_encoder_get_short_name(codec))); +} + static void add_audio_for_lang(hb_value_array_t *list, const hb_dict_t *preset, hb_title_t *title, int mux, int copy_mask, int fallback, const char *lang, @@ -616,6 +711,10 @@ static void add_audio_for_lang(hb_value_array_t *list, const hb_dict_t *preset, HB_VALUE_TYPE_INT)); } } + + // Sanitize the settings before adding to the audio list + hb_sanitize_audio_settings(title, audio_dict); + hb_value_array_append(list, audio_dict); } if (behavior == 2) diff --git a/libhb/preset.h b/libhb/preset.h index 25653ff62..0515b3cd1 100644 --- a/libhb/preset.h +++ b/libhb/preset.h @@ -149,6 +149,8 @@ int hb_preset_job_add_subtitles(hb_handle_t *h, int title_index, // Reinitialize audio from preset defaults. int hb_preset_job_add_audio(hb_handle_t *h, int title_index, const hb_dict_t *preset, hb_dict_t *job_dict); +void hb_sanitize_audio_settings(const hb_title_t * title, + hb_value_t * audio_settings); // Lookup a preset in the preset list. The "name" may contain '/' // separators to explicitely specify a preset within the preset lists |