Protected encoder_sys_t definition with ENABLE_SOUT.

[vlc] / modules / codec / lpcm.c

diff --git a/modules/codec/lpcm.c b/modules/codec/lpcm.c
index 88eab2e85bdcefe7fa6f78eec846f72f81e77187..4d1eb04f13c45733f0a64ca211661a5d26c41e8a 100644 (file)
--- a/modules/codec/lpcm.c
+++ b/modules/codec/lpcm.c
@@ -64,11 +64,13 @@ vlc_module_begin ()
     set_capability( "packetizer", 100 )
     set_callbacks( OpenPacketizer, CloseCommon )
 
+#ifdef ENABLE_SOUT
     add_submodule ()
     set_description( N_("Linear PCM audio encoder") )
     set_capability( "encoder", 100 )
     set_callbacks( OpenEncoder, CloseEncoder )
     add_shortcut( "lpcm" )
+#endif
 
 vlc_module_end ()
 
@@ -91,6 +93,7 @@ struct decoder_sys_t
     int      i_type;
 };
 
+#ifdef ENABLE_SOUT
 struct encoder_sys_t
 {
     int     i_channels;
@@ -101,6 +104,7 @@ struct encoder_sys_t
     int     i_buffer_used;
     int     i_frame_num;
 };
+#endif
 
 /*
  * LPCM DVD header :
@@ -422,6 +426,7 @@ static void CloseCommon( vlc_object_t *p_this )
     free( p_dec->p_sys );
 }
 
+#ifdef ENABLE_SOUT
 /*****************************************************************************
  * OpenEncoder: lpcm encoder construction
  *****************************************************************************/
@@ -443,7 +448,19 @@ static int OpenEncoder( vlc_object_t *p_this )
     if( ( p_enc->p_sys = p_sys =
           (encoder_sys_t *)malloc(sizeof(encoder_sys_t)) ) == NULL )
         return VLC_ENOMEM;
+    
+    /* In DVD LCPM, a frame is always 150 PTS ticks. */
+    p_sys->i_frame_samples = p_enc->fmt_in.audio.i_rate * 150 / 90000;
+    p_sys->p_buffer = (uint8_t *)malloc(
+        p_sys->i_frame_samples *
+        p_enc->fmt_in.audio.i_channels *
+        p_enc->fmt_in.audio.i_bitspersample);
+    p_sys->i_buffer_used = 0;
+    p_sys->i_frame_num = 0;
 
+    p_sys->i_channels = p_enc->fmt_in.audio.i_channels;
+    p_sys->i_rate = p_enc->fmt_in.audio.i_rate;
+    
     p_enc->pf_encode_audio = EncodeFrames;
     p_enc->fmt_in.i_codec = p_enc->fmt_out.i_codec;
 
@@ -453,20 +470,10 @@ static int OpenEncoder( vlc_object_t *p_this )
     p_enc->fmt_out.i_bitrate =
         p_enc->fmt_in.audio.i_channels *
         p_enc->fmt_in.audio.i_rate *
-        p_enc->fmt_in.audio.i_bitspersample;
-    
-    p_sys->i_channels = p_enc->fmt_in.audio.i_channels;
-    p_sys->i_rate = p_enc->fmt_in.audio.i_rate;
+        p_enc->fmt_in.audio.i_bitspersample *
+        (p_sys->i_frame_samples + LPCM_VOB_HEADER_LEN) /
+        p_sys->i_frame_samples;
     
-    /* In DVD LCPM, a frame is always 150 PTS ticks. */
-    p_sys->i_frame_samples = p_enc->fmt_in.audio.i_rate * 150 / 90000;
-    p_sys->p_buffer = (uint8_t *)malloc(
-        p_sys->i_frame_samples *
-        p_enc->fmt_in.audio.i_channels *
-        p_enc->fmt_in.audio.i_bitspersample);
-    p_sys->i_buffer_used = 0;
-    p_sys->i_frame_num = 0;
-
     return VLC_SUCCESS;
 }
 
@@ -546,7 +553,7 @@ static block_t *EncodeFrames( encoder_t *p_enc, aout_buffer_t *p_aout_buf )
         if( !p_first_block )
             p_first_block = p_last_block = p_block;
         else
-            block_ChainLastAppend( &p_last_block, p_block );
+            p_last_block = p_last_block->p_next = p_block;
     }
 
     memcpy( p_sys->p_buffer,
@@ -556,6 +563,7 @@ static block_t *EncodeFrames( encoder_t *p_enc, aout_buffer_t *p_aout_buf )
 
     return p_first_block;
 }
+#endif
 
 /*****************************************************************************
  *