DTS to SPDIF: audio filter2

modules/audio_filter/converter/dtstospdif.c

@@ -31,28 +31,22 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 
-
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#endif
-
 #include <vlc_aout.h>
+#include <vlc_filter.h>
 
 /*****************************************************************************
  * Local structures
  *****************************************************************************/
-struct aout_filter_sys_t
+struct filter_sys_t
 {
+    mtime_t start_date;
+
     /* 3 DTS frames have to be packed into an S/PDIF frame.
      * We accumulate DTS frames from the decoder until we have enough to
      * send. */
-
+    size_t i_frame_size;
     uint8_t *p_buf;
-
-    mtime_t start_date;
-
-    int i_frames;
-    unsigned int i_frame_size;
+    unsigned i_frames;
 };
 
 /*****************************************************************************
@@ -60,8 +54,7 @@ struct aout_filter_sys_t
  *****************************************************************************/
 static int  Create    ( vlc_object_t * );
 static void Close     ( vlc_object_t * );
-static void DoWork    ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
-                        aout_buffer_t * );
+static block_t *DoWork( filter_t *, block_t * );
 
 /*****************************************************************************
  * Module descriptor
@@ -70,7 +63,7 @@ vlc_module_begin ()
     set_category( CAT_AUDIO )
     set_subcategory( SUBCAT_AUDIO_MISC )
     set_description( N_("Audio filter for DTS->S/PDIF encapsulation") )
-    set_capability( "audio filter", 10 )
+    set_capability( "audio filter2", 10 )
     set_callbacks( Create, Close )
 vlc_module_end ()
 
@@ -79,24 +72,27 @@ vlc_module_end ()
  *****************************************************************************/
 static int Create( vlc_object_t *p_this )
 {
-    aout_filter_t * p_filter = (aout_filter_t *)p_this;
+    filter_t * p_filter = (filter_t *)p_this;
+    filter_sys_t *p_sys;
 
     if( p_filter->fmt_in.audio.i_format != VLC_CODEC_DTS ||
         ( p_filter->fmt_out.audio.i_format != VLC_CODEC_SPDIFL &&
           p_filter->fmt_out.audio.i_format != VLC_CODEC_SPDIFB ) )
     {
-        return -1;
+        return VLC_EGENERIC;
     }
 
     /* Allocate the memory needed to store the module's structure */
-    p_filter->p_sys = calloc( 1, sizeof(struct aout_filter_sys_t) );
-    if( !p_filter->p_sys )
+    p_sys = p_filter->p_sys = malloc( sizeof(*p_sys) );
+    if( !p_sys )
         return VLC_ENOMEM;
+    p_sys->p_buf = NULL;
+    p_sys->i_frame_size = 0;
+    p_sys->i_frames = 0;
 
-    p_filter->pf_do_work = DoWork;
-    p_filter->b_in_place = 1;
+    p_filter->pf_audio_filter = DoWork;
 
-    return 0;
+    return VLC_SUCCESS;
 }
 
 /*****************************************************************************
@@ -104,16 +100,16 @@ static int Create( vlc_object_t *p_this )
  *****************************************************************************/
 static void Close( vlc_object_t * p_this )
 {
-    aout_filter_t * p_filter = (aout_filter_t *)p_this;
-    if( p_filter->p_sys->i_frame_size ) free( p_filter->p_sys->p_buf );
+    filter_t * p_filter = (filter_t *)p_this;
+
+    free( p_filter->p_sys->p_buf );
     free( p_filter->p_sys );
 }
 
 /*****************************************************************************
  * DoWork: convert a buffer
  *****************************************************************************/
-static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
-                    aout_buffer_t * p_in_buf, aout_buffer_t * p_out_buf )
+static block_t *DoWork( filter_t * p_filter, block_t * p_in_buf )
 {
     uint32_t i_ac5_spdif_type = 0;
     uint16_t i_fz = p_in_buf->i_nb_samples * 4;
@@ -124,10 +120,9 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
     if( p_in_buf->i_buffer != p_filter->p_sys->i_frame_size )
     {
         /* Frame size changed, reset everything */
-        msg_Warn( p_aout, "Frame size changed from %u to %u, "
+        msg_Warn( p_filter, "Frame size changed from %zu to %zu, "
                           "resetting everything.",
-                  p_filter->p_sys->i_frame_size,
-                  (unsigned)p_in_buf->i_buffer );
+                  p_filter->p_sys->i_frame_size, p_in_buf->i_buffer );
 
         p_filter->p_sys->i_frame_size = p_in_buf->i_buffer;
         p_filter->p_sys->p_buf = realloc( p_filter->p_sys->p_buf,
@@ -136,6 +131,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
     }
 
     /* Backup frame */
+    /* TODO: keeping the blocks in a list would save one memcpy */
     vlc_memcpy( p_filter->p_sys->p_buf + p_in_buf->i_buffer *
                   p_filter->p_sys->i_frames,
                 p_in_buf->p_buffer, p_in_buf->i_buffer );
@@ -149,12 +145,15 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
             p_filter->p_sys->start_date = p_in_buf->i_pts;
 
         /* Not enough data */
-        p_out_buf->i_nb_samples = 0;
-        p_out_buf->i_buffer = 0;
-        return;
+        block_Release( p_in_buf );
+        return NULL;
     }
 
     p_filter->p_sys->i_frames = 0;
+    block_t *p_out_buf = filter_NewAudioBuffer( p_filter,
+                                                12 * p_in_buf->i_nb_samples );
+    if( !p_out_buf )
+        goto out;
 
     for( i_frame = 0; i_frame < 3; i_frame++ )
     {
@@ -216,4 +215,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
     p_out_buf->i_pts = p_filter->p_sys->start_date;
     p_out_buf->i_nb_samples = p_in_buf->i_nb_samples * 3;
     p_out_buf->i_buffer = p_out_buf->i_nb_samples * 4;
+out:
+    block_Release( p_in_buf );
+    return p_out_buf;
 }