Remove trailing whitespaces.

[vlc] / modules / codec / lpcm.c

diff --git a/modules/codec/lpcm.c b/modules/codec/lpcm.c
index 8e62b152d41ac8bfefbc15afed91464ab9fb135e..defcf45fcbee3fbaded1ff1906922944ab6d0c11 100644 (file)
--- a/modules/codec/lpcm.c
+++ b/modules/codec/lpcm.c
@@ -434,19 +434,29 @@ static int OpenEncoder( vlc_object_t *p_this )
     encoder_sys_t *p_sys;
 
     /* We only support DVD LPCM yet. */
-    if( p_enc->fmt_out.i_codec != VLC_CODEC_DVD_LPCM ||
-        ( p_enc->fmt_in.audio.i_rate != 48000 &&
-          p_enc->fmt_in.audio.i_rate != 96000 &&
-          p_enc->fmt_in.audio.i_rate != 44100 &&
-          p_enc->fmt_in.audio.i_rate != 32000 ) ||
-       p_enc->fmt_in.audio.i_channels > 8 )
+    if( p_enc->fmt_out.i_codec != VLC_CODEC_DVD_LPCM )
         return VLC_EGENERIC;
 
+    if( p_enc->fmt_in.audio.i_rate != 48000 &&
+        p_enc->fmt_in.audio.i_rate != 96000 &&
+        p_enc->fmt_in.audio.i_rate != 44100 &&
+        p_enc->fmt_in.audio.i_rate != 32000 )
+    {
+        msg_Err( p_enc, "DVD LPCM supports only sample rates of 48, 96, 44.1 or 32 kHz" );
+        return VLC_EGENERIC;
+    }
+
+    if( p_enc->fmt_in.audio.i_channels > 8 )
+    {
+        msg_Err( p_enc, "DVD LPCM supports a maximum of eight channels" );
+        return VLC_EGENERIC;
+    }
+
     /* Allocate the memory needed to store the encoder's structure */
     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(
@@ -458,7 +468,7 @@ static int OpenEncoder( vlc_object_t *p_this )
 
     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;
 
@@ -471,7 +481,7 @@ static int OpenEncoder( vlc_object_t *p_this )
         p_enc->fmt_in.audio.i_bitspersample *
         (p_sys->i_frame_samples + LPCM_VOB_HEADER_LEN) /
         p_sys->i_frame_samples;
-    
+
     return VLC_SUCCESS;
 }
 
@@ -515,6 +525,8 @@ static block_t *EncodeFrames( encoder_t *p_enc, aout_buffer_t *p_aout_buf )
     case 32000:
         i_freq_code = 3;
         break;
+    default:
+        assert(0);
     }
 
     int i_bytes_consumed = 0;
@@ -539,7 +551,7 @@ static block_t *EncodeFrames( encoder_t *p_enc, aout_buffer_t *p_aout_buf )
 
         memcpy( frame + 6, p_sys->p_buffer, i_kept_bytes );
         memcpy( frame + 6 + i_kept_bytes, p_aout_buf->p_buffer + i_bytes_consumed, i_consume_bytes );
-     
+
         p_sys->i_frame_num++;
         p_sys->i_buffer_used = 0;
         i_bytes_consumed += i_consume_bytes;
@@ -547,7 +559,7 @@ static block_t *EncodeFrames( encoder_t *p_enc, aout_buffer_t *p_aout_buf )
         p_block->i_dts = p_block->i_pts = p_aout_buf->i_pts +
             (i * p_sys->i_frame_samples + i_start_offset) * CLOCK_FREQ / p_sys->i_rate;
         p_block->i_length = p_sys->i_frame_samples * CLOCK_FREQ / p_sys->i_rate;
-    
+
         if( !p_first_block )
             p_first_block = p_last_block = p_block;
         else