X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Faes3.c;h=c83124f465528c1d20f9aa7477cd93d1dd33915f;hb=fb77c0f7df71bc228f6d60990a87ac2910e46992;hp=48ae475e03ab8945ee6a4ae5e67b099b4298b120;hpb=f3306b5dc0c08b6c492b4867865c32a5e72201b8;p=vlc

diff --git a/modules/codec/aes3.c b/modules/codec/aes3.c
index 48ae475e03..c83124f465 100644
--- a/modules/codec/aes3.c
+++ b/modules/codec/aes3.c
@@ -41,20 +41,20 @@ static int  OpenDecoder   ( vlc_object_t * );
 static int  OpenPacketizer( vlc_object_t * );
 static void Close         ( vlc_object_t * );
 
-vlc_module_begin();
+vlc_module_begin ()
 
-    set_category( CAT_INPUT );
-    set_subcategory( SUBCAT_INPUT_ACODEC );
-    set_description( _("AES3/SMPTE 302M audio decoder") );
-    set_capability( "decoder", 100 );
-    set_callbacks( OpenDecoder, Close );
+    set_category( CAT_INPUT )
+    set_subcategory( SUBCAT_INPUT_ACODEC )
+    set_description( N_("AES3/SMPTE 302M audio decoder") )
+    set_capability( "decoder", 100 )
+    set_callbacks( OpenDecoder, Close )
 
-    add_submodule();
-    set_description( N_("AES3/SMPTE 302M audio packetizer") );
-    set_capability( "packetizer", 100 );
-    set_callbacks( OpenPacketizer, Close );
+    add_submodule ()
+    set_description( N_("AES3/SMPTE 302M audio packetizer") )
+    set_capability( "packetizer", 100 )
+    set_callbacks( OpenPacketizer, Close )
 
-vlc_module_end();
+vlc_module_end ()
 
 /*****************************************************************************
  * decoder_sys_t : aes3 decoder descriptor
@@ -64,7 +64,7 @@ struct decoder_sys_t
     /*
      * Output properties
      */
-    audio_date_t end_date;
+    date_t end_date;
 };
 
 #define AES3_HEADER_LEN 4
@@ -130,12 +130,13 @@ static aout_buffer_t *Decode( decoder_t *p_dec, block_t **pp_block )
     if( !p_block )
         return NULL;
 
-    p_aout_buffer = p_dec->pf_aout_buffer_new( p_dec, i_frame_length );
+    p_aout_buffer = decoder_NewAudioBuffer( p_dec, i_frame_length );
     if( p_aout_buffer == NULL )
         goto exit;
 
-    p_aout_buffer->start_date = aout_DateGet( &p_sys->end_date );
-    p_aout_buffer->end_date = aout_DateIncrement( &p_sys->end_date, i_frame_length );
+    p_aout_buffer->i_pts = date_Get( &p_sys->end_date );
+    p_aout_buffer->i_length = date_Increment( &p_sys->end_date,
+                                      i_frame_length ) - p_aout_buffer->i_pts;
 
     p_block->i_buffer -= AES3_HEADER_LEN;
     p_block->p_buffer += AES3_HEADER_LEN;
@@ -219,8 +220,8 @@ static block_t *Packetize( decoder_t *p_dec, block_t **pp_block )
     if( !p_block )
         return NULL;
 
-    p_block->i_pts = p_block->i_dts = aout_DateGet( &p_sys->end_date );
-    p_block->i_length = aout_DateIncrement( &p_sys->end_date, i_frame_length ) - p_block->i_pts;
+    p_block->i_pts = p_block->i_dts = date_Get( &p_sys->end_date );
+    p_block->i_length = date_Increment( &p_sys->end_date, i_frame_length ) - p_block->i_pts;
 
     /* Just pass on the incoming frame */
     return p_block;
@@ -233,7 +234,7 @@ static int Open( decoder_t *p_dec, bool b_packetizer )
 {
     decoder_sys_t *p_sys;
 
-    if( p_dec->fmt_in.i_codec != VLC_FOURCC('a','e','s','3') )
+    if( p_dec->fmt_in.i_codec != VLC_CODEC_302M )
         return VLC_EGENERIC;
 
     /* Allocate the memory needed to store the decoder's structure */
@@ -243,8 +244,8 @@ static int Open( decoder_t *p_dec, bool b_packetizer )
         return VLC_EGENERIC;
 
     /* Misc init */
-    aout_DateInit( &p_sys->end_date, 48000 );
-    aout_DateSet( &p_sys->end_date, 0 );
+    date_Init( &p_sys->end_date, 48000, 1 );
+    date_Set( &p_sys->end_date, 0 );
 
     /* Set output properties */
     p_dec->fmt_out.i_cat = AUDIO_ES;
@@ -253,13 +254,16 @@ static int Open( decoder_t *p_dec, bool b_packetizer )
     /* Set callback */
     if( b_packetizer )
     {
-        p_dec->fmt_out.i_codec = VLC_FOURCC('a','e','s','3');
+        p_dec->fmt_out.i_codec = VLC_CODEC_302M;
 
         p_dec->pf_decode_audio = NULL;
         p_dec->pf_packetize    = Packetize;
     }
     else
     {
+        p_dec->fmt_out.i_codec = VLC_CODEC_S16N;
+        p_dec->fmt_out.audio.i_bitspersample = 16;
+
         p_dec->pf_decode_audio = Decode;
         p_dec->pf_packetize    = NULL;
     }
@@ -296,13 +300,13 @@ static block_t *Parse( decoder_t *p_dec, int *pi_frame_length, int *pi_bits,
     *pp_block = NULL; /* So the packet doesn't get re-sent */
 
     /* Date management */
-    if( p_block->i_pts > 0 &&
-        p_block->i_pts != aout_DateGet( &p_sys->end_date ) )
+    if( p_block->i_pts > VLC_TS_INVALID &&
+        p_block->i_pts != date_Get( &p_sys->end_date ) )
     {
-        aout_DateSet( &p_sys->end_date, p_block->i_pts );
+        date_Set( &p_sys->end_date, p_block->i_pts );
     }
 
-    if( !aout_DateGet( &p_sys->end_date ) )
+    if( !date_Get( &p_sys->end_date ) )
     {
         /* We've just started the stream, wait for the first PTS. */
         block_Release( p_block );
@@ -345,7 +349,7 @@ static block_t *Parse( decoder_t *p_dec, int *pi_frame_length, int *pi_bits,
     }
     else
     {
-        p_dec->fmt_out.i_codec = i_bits == 16 ? VLC_FOURCC('s','1','6','l') : VLC_FOURCC('s','2','4','l');
+        p_dec->fmt_out.i_codec = i_bits == 16 ? VLC_CODEC_S16L : VLC_CODEC_S24L;
         p_dec->fmt_out.audio.i_bitspersample = i_bits == 16 ? 16 : 24;
     }