diff options
| author | jstebbins <[email protected]> | 2010-04-14 16:47:02 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2010-04-14 16:47:02 +0000 |
| commit | 18a10c15de751301f5a67ede5f917a761bf060a5 (patch) | |
| tree | 92a4099768f87cf66f45b4055c81339d3daf33b6 /gtk/src | |
| parent | abeea8ddf0b918eeb48b438d72f8db7a4c166997 (diff) | |
patch to allow higher bitrates with faac
2 channel allows up to 320kbps, 6 channel allows up to 768kbps
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3222 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'gtk/src')
| -rw-r--r-- | gtk/src/audiohandler.c | 4 | ||||
| -rw-r--r-- | gtk/src/hb-backend.c | 11 |
2 files changed, 10 insertions, 5 deletions
diff --git a/gtk/src/audiohandler.c b/gtk/src/audiohandler.c index f8804e561..5895a83c0 100644 --- a/gtk/src/audiohandler.c +++ b/gtk/src/audiohandler.c @@ -79,12 +79,12 @@ ghb_adjust_audio_rate_combos(signal_user_data_t *ud) } else if (acodec == HB_ACODEC_FAAC) { - gint br, last = 160, first = 0; + gint br, last = 320, first = 0; if (mix == HB_AMIXDOWN_6CH) { first = 192; - last = 448; + last = 768; } widget = GHB_WIDGET(ud->builder, "AudioBitrate"); diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c index 78fab8cbd..abe02b8e7 100644 --- a/gtk/src/hb-backend.c +++ b/gtk/src/hb-backend.c @@ -948,7 +948,7 @@ ghb_find_closest_audio_bitrate(gint codec, gint rate) gint result; if (codec == HB_ACODEC_FAAC) - high = 160; + high = 320; result = high; for (ii = 0; ii < hb_audio_bitrates_count; ii++) @@ -1421,7 +1421,12 @@ ghb_get_best_audio_bitrate(gint acodec, gint br, gint channels) { if (acodec & HB_ACODEC_FAAC) { - int maxbr = channels * 80; + int maxbr; + + if (channels == 2) + maxbr = 320; + else + maxbr = 768; if (br > maxbr) br = maxbr; } @@ -2091,7 +2096,7 @@ ghb_find_audio_track( gint count = 0; gint track = -1; gint max_chan = 0; - gboolean *used; + gboolean *used = NULL; gboolean *passthru_used; gint try_acodec; gint passthru_acodec; |