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 bed9ddf17b96df604901307a1d40842b21cc91f3..4d1eb04f13c45733f0a64ca211661a5d26c41e8a 100644 (file)
--- a/modules/codec/lpcm.c
+++ b/modules/codec/lpcm.c
@@ -93,6 +93,7 @@ struct decoder_sys_t
     int      i_type;
 };
 
+#ifdef ENABLE_SOUT
 struct encoder_sys_t
 {
     int     i_channels;
@@ -103,6 +104,7 @@ struct encoder_sys_t
     int     i_buffer_used;
     int     i_frame_num;
 };
+#endif
 
 /*
  * LPCM DVD header :
@@ -446,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;
 
@@ -456,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;
 }