Don't copy the frame before passing it to x264, let x264 look directly into our HB...

[handbrake-jp/handbrake-jp-git.git] / libhb / deca52.c

diff --git a/libhb/deca52.c b/libhb/deca52.c
index de33b3e..90dd9e7 100644 (file)
--- a/libhb/deca52.c
+++ b/libhb/deca52.c
@@ -20,6 +20,7 @@ struct hb_work_private_s
     int           rate;
     int           bitrate;
     float         level;
+    float         dynamic_range_compression;
     
     int           error;
     int           sync;
@@ -27,6 +28,8 @@ struct hb_work_private_s
 
     int64_t       next_expected_pts;
 
+    int64_t       sequence;
+
     uint8_t       frame[3840];
 
     hb_list_t   * list;
@@ -54,6 +57,30 @@ hb_work_object_t hb_deca52 =
 static hb_buffer_t * Decode( hb_work_object_t * w );
 
 /***********************************************************************
+ * dynrng_call
+ ***********************************************************************
+ * Boosts soft audio -- taken from gbooker's work in A52Decoder, comment and all..
+ * Two cases 
+ * 1) The user requested a compression of 1 or less, return the typical power rule 
+ * 2) The user requested a compression of more than 1 (decompression): 
+ *    If the stream's requested compression is less than 1.0 (loud sound), return the normal compression 
+ *    If the stream's requested compression is more than 1.0 (soft sound), use power rule (which will make
+ *   it louder in this case). 
+ * 
+ **********************************************************************/
+static sample_t dynrng_call (sample_t c, void *data)
+{        
+        double *level = (double *)data;
+        float levelToUse = (float)*level;
+        if(c > 1.0 || levelToUse <= 1.0)
+        {
+            return powf(c, levelToUse);
+        }
+        else
+                return c;
+}
+ 
+/***********************************************************************
  * hb_work_deca52_init
  ***********************************************************************
  * Allocate the work object, initialize liba52
@@ -78,7 +105,10 @@ int deca52Init( hb_work_object_t * w, hb_job_t * job )
        pv->out_discrete_channels = HB_AMIXDOWN_GET_DISCRETE_CHANNEL_COUNT(w->amixdown);
 
     pv->level     = 32768.0;
+    pv->dynamic_range_compression = job->dynamic_range_compression;
+    
     pv->next_expected_pts = 0;
+    pv->sequence = 0;
     
     return 0;
 }
@@ -109,13 +139,19 @@ int deca52Work( hb_work_object_t * w, hb_buffer_t ** buf_in,
     hb_work_private_t * pv = w->private_data;
     hb_buffer_t * buf;
 
+    if( buf_in && *buf_in )
+    {
+        pv->sequence = (*buf_in)->sequence;
+    }
+
     hb_list_add( pv->list, *buf_in );
     *buf_in = NULL;
 
     /* If we got more than a frame, chain raw buffers */
     *buf_out = buf = Decode( w );
     while( buf )
-    {
+    { 
+        buf->sequence = pv->sequence;
         buf->next = Decode( w );
         buf       = buf->next;
     }
@@ -192,6 +228,11 @@ static hb_buffer_t * Decode( hb_work_object_t * w )
     /* Feed liba52 */
     a52_frame( pv->state, pv->frame, &pv->flags_out, &pv->level, 0 );
 
+    if ( pv->dynamic_range_compression )
+    {
+        a52_dynrng( pv->state, dynrng_call, &pv->dynamic_range_compression);        
+    }
+    
     /* 6 blocks per frame, 256 samples per block, channelsused channels */
     buf        = hb_buffer_init( 6 * 256 * pv->out_discrete_channels * sizeof( float ) );
     if (pts == -1)