cli: allow user cli options to override defaults for fallback audio encoder

Solves: https://forum.handbrake.fr/viewtopic.php?f=10&t=28074&sid=68d8c5bfffd7081625bcd56fb7c4dad1


git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6236 b64f7644-9d1e-0410-96f1-a4d463321fa5

2 files changed, 66 insertions, 10 deletions

diff --git a/libhb/common.c b/libhb/common.c
index 6ba81f762..0bb2eafd5 100644
--- a/libhb/common.c
+++ b/libhb/common.c
@@ -2001,7 +2001,6 @@ void hb_autopassthru_apply_settings(hb_job_t *job)
                 hb_audio_close(&audio);
                 continue;
             }
-            audio->config.out.samplerate = audio->config.in.samplerate;
             if (!(audio->config.out.codec & HB_ACODEC_PASS_FLAG))
             {
                 if (audio->config.out.codec == job->acodec_fallback)
@@ -2014,15 +2013,65 @@ void hb_autopassthru_apply_settings(hb_job_t *job)
                     hb_log("Auto Passthru: passthru and fallback not possible for track %d, using default encoder",
                            audio->config.out.track);
                 }
-                audio->config.out.mixdown =
-                    hb_mixdown_get_default(audio->config.out.codec,
-                                           audio->config.in.channel_layout);
-                audio->config.out.bitrate =
-                    hb_audio_bitrate_get_default(audio->config.out.codec,
+                if (audio->config.out.mixdown <= 0)
+                {
+                    audio->config.out.mixdown =
+                        hb_mixdown_get_default(audio->config.out.codec,
+                                               audio->config.in.channel_layout);
+                }
+                else
+                {
+                    audio->config.out.mixdown =
+                        hb_mixdown_get_best(audio->config.out.codec,
+                                            audio->config.in.channel_layout,
+                                            audio->config.out.mixdown);
+                }
+                if (audio->config.out.samplerate <= 0)
+                    audio->config.out.samplerate = audio->config.in.samplerate;
+                audio->config.out.samplerate =
+                    hb_audio_samplerate_get_best(audio->config.out.codec,
+                                                 audio->config.out.samplerate,
+                                                 NULL);
+                int quality_not_allowed =
+                    hb_audio_quality_get_default(audio->config.out.codec)
+                            == HB_INVALID_AUDIO_QUALITY;
+                if (audio->config.out.bitrate > 0)
+                {
+                    // Use best bitrate
+                    audio->config.out.bitrate =
+                        hb_audio_bitrate_get_best(audio->config.out.codec,
+                                                  audio->config.out.bitrate,
+                                                  audio->config.out.samplerate,
+                                                  audio->config.out.mixdown);
+                }
+                else if (quality_not_allowed ||
+                         audio->config.out.quality != HB_INVALID_AUDIO_QUALITY)
+                {
+                    // Use default bitrate
+                    audio->config.out.bitrate =
+                        hb_audio_bitrate_get_default(audio->config.out.codec,
                                                  audio->config.out.samplerate,
                                                  audio->config.out.mixdown);
-                audio->config.out.compression_level =
-                    hb_audio_compression_get_default(audio->config.out.codec);
+                }
+                else
+                {
+                    // Use best quality
+                    audio->config.out.quality =
+                        hb_audio_quality_get_best(audio->config.out.codec,
+                                                  audio->config.out.quality);
+                }
+                if (audio->config.out.compression_level < 0)
+                {
+                    audio->config.out.compression_level =
+                        hb_audio_compression_get_default(
+                                        audio->config.out.codec);
+                }
+                else
+                {
+                    audio->config.out.compression_level =
+                        hb_audio_compression_get_best(audio->config.out.codec,
+                                        audio->config.out.compression_level);
+                }
             }
             else
             {
diff --git a/libhb/work.c b/libhb/work.c
index 5c8c38bed..240ccbb92 100644
--- a/libhb/work.c
+++ b/libhb/work.c
@@ -1002,16 +1002,23 @@ static void do_job(hb_job_t *job)
             audio->priv.fifo_out  = hb_fifo_init(FIFO_LARGE, FIFO_LARGE_WAKE);
             audio->priv.fifo_in   = hb_fifo_init(FIFO_LARGE, FIFO_LARGE_WAKE);
 
-            /* Passthru audio, nothing to sanitize here */
+            /* Passthru audio */
             if (audio->config.out.codec & HB_ACODEC_PASS_FLAG)
+            {
+                // Muxer needs these to be set correctly in order to
+                // set audio track MP4 time base.
+                audio->config.out.samples_per_frame =
+                                        audio->config.in.samples_per_frame;
+                audio->config.out.samplerate = audio->config.in.samplerate;
                 continue;
+            }
 
             /* Vorbis language information */
             if (audio->config.out.codec == HB_ACODEC_VORBIS)
                 audio->priv.config.vorbis.language = audio->config.lang.simple;
 
             /* sense-check the requested samplerate */
-            if (audio->config.out.samplerate < 0)
+            if (audio->config.out.samplerate <= 0)
             {
                 // if not specified, set to same as input
                 audio->config.out.samplerate = audio->config.in.samplerate;