X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Fencfaac.c;h=c955199d062a7de1c52616b9767b48a8954e6ec3;hb=033e32de9c380f54c7d1362a3979da205ebc3a29;hp=645628a8ee44aba9d5cfe2028098d6d3e86d7ada;hpb=1d9c122201261c9f3098a417ed140106e0d6ba0d;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/libhb/encfaac.c b/libhb/encfaac.c
index 645628a8..c955199d 100644
--- a/libhb/encfaac.c
+++ b/libhb/encfaac.c
@@ -36,6 +36,21 @@ hb_work_object_t hb_encfaac =
     encfaacClose
 };
 
+static const int valid_rates[] =
+{
+    22050, 24000, 32000, 44100, 48000, 0
+};
+
+static int find_samplerate( int rate )
+{
+    int i;
+
+    for ( i = 0; valid_rates[i] && rate > valid_rates[i]; ++i )
+    {
+    }
+    return i;
+}
+
 /***********************************************************************
  * hb_work_encfaac_init
  ***********************************************************************
@@ -56,6 +71,28 @@ int encfaacInit( hb_work_object_t * w, hb_job_t * job )
 	/* pass the number of channels used into the private work data */
     pv->out_discrete_channels = HB_AMIXDOWN_GET_DISCRETE_CHANNEL_COUNT(audio->config.out.mixdown);
 
+    /* if the sample rate is 'auto' and that has given us an invalid output */
+    /* rate, map it to the next highest output rate or 48K if above the highest. */
+    int rate_index = find_samplerate(audio->config.out.samplerate);
+    if ( audio->config.out.samplerate != valid_rates[rate_index] )
+    {
+        int rate = valid_rates[valid_rates[rate_index]? rate_index : rate_index - 1];
+        hb_log( "encfaac changing output samplerate from %d to %d",
+                audio->config.out.samplerate, rate );
+        audio->config.out.samplerate = rate;
+
+        /* if the new rate is over the max bandwidth per channel limit */
+        /* lower the bandwidth. */
+        double bw = audio->config.out.bitrate * 1000 / pv->out_discrete_channels;
+        if ( bw > (double)rate * (6144./1024.) )
+        {
+            int newbr = (double)rate * (6.144/1024.) * pv->out_discrete_channels;
+            hb_log( "encfaac changing output bitrate from %d to %d",
+                    audio->config.out.bitrate, newbr );
+            audio->config.out.bitrate = newbr;
+        }
+    }
+
     pv->faac = faacEncOpen( audio->config.out.samplerate, pv->out_discrete_channels,
                             &pv->input_samples, &pv->output_bytes );
     pv->buf  = malloc( pv->input_samples * sizeof( float ) );
@@ -127,12 +164,29 @@ int encfaacInit( hb_work_object_t * w, hb_job_t * job )
 void encfaacClose( hb_work_object_t * w )
 {
     hb_work_private_t * pv = w->private_data;
-    faacEncClose( pv->faac );
-    free( pv->buf );
-    free( pv->obuf );
-    hb_list_empty( &pv->list );
-    free( pv );
-    w->private_data = NULL;
+    if ( pv )
+    {
+        if ( pv->faac )
+        {
+            faacEncClose( pv->faac );
+            pv->faac = NULL;
+        }
+        if ( pv->buf )
+        {
+            free( pv->buf );
+            pv->buf = NULL;
+        }
+        if ( pv->obuf )
+        {
+            free( pv->obuf );
+            pv->obuf = NULL;
+        }
+        if ( pv->list )
+            hb_list_empty( &pv->list );
+
+        free( pv );
+        w->private_data = NULL;
+    }
 }
 
 /***********************************************************************
@@ -206,7 +260,10 @@ static hb_buffer_t *Flush( hb_work_object_t *w, hb_buffer_t *bufin )
         }
     }
     // add the eof marker to the end of our buf chain
-    buf->next = bufin;
+    if ( buf )
+        buf->next = bufin;
+    else
+        bufout = bufin;
     return bufout;
 }