[vlc-commits] Rawaud: reindent
Jean-Baptiste Kempf
git at videolan.org
Sun Feb 12 14:32:35 CET 2017
vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Feb 12 14:21:14 2017 +0100| [47042247700fc0c9922acce768ecdcee30ecb50a] | committer: Jean-Baptiste Kempf
Rawaud: reindent
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=47042247700fc0c9922acce768ecdcee30ecb50a
---
modules/demux/rawaud.c | 37 ++++++++++++++++++-------------------
1 file changed, 18 insertions(+), 19 deletions(-)
diff --git a/modules/demux/rawaud.c b/modules/demux/rawaud.c
index 1e6d97d..3a639b91 100644
--- a/modules/demux/rawaud.c
+++ b/modules/demux/rawaud.c
@@ -152,7 +152,7 @@ static int Open( vlc_object_t * p_this )
default:
msg_Err( p_demux, "unknown fourcc format %4.4s",
- (char *)&p_sys->fmt.i_codec);
+ (char *)&p_sys->fmt.i_codec);
es_format_Clean( &p_sys->fmt );
free( p_sys );
return VLC_EGENERIC;
@@ -166,18 +166,18 @@ static int Open( vlc_object_t * p_this )
if( p_sys->fmt.audio.i_rate <= 0 || p_sys->fmt.audio.i_rate > 384000 )
{
- msg_Err( p_demux, "invalid sample rate");
- es_format_Clean( &p_sys->fmt );
- free( p_sys );
- return VLC_EGENERIC;
+ msg_Err( p_demux, "invalid sample rate");
+ es_format_Clean( &p_sys->fmt );
+ free( p_sys );
+ return VLC_EGENERIC;
}
if( p_sys->fmt.audio.i_channels <= 0 || p_sys->fmt.audio.i_channels > 32 )
{
- msg_Err( p_demux, "invalid number of channels");
- es_format_Clean( &p_sys->fmt );
- free( p_sys );
- return VLC_EGENERIC;
+ msg_Err( p_demux, "invalid number of channels");
+ es_format_Clean( &p_sys->fmt );
+ free( p_sys );
+ return VLC_EGENERIC;
}
p_sys->fmt.i_bitrate = p_sys->fmt.audio.i_rate *
@@ -193,12 +193,12 @@ static int Open( vlc_object_t * p_this )
}
msg_Dbg( p_demux,
- "format initialized: channels=%d , samplerate=%d Hz, fourcc=%4.4s, bits per sample = %d, bitrate = %d bit/s",
- p_sys->fmt.audio.i_channels,
- p_sys->fmt.audio.i_rate,
- (char*)&p_sys->fmt.i_codec,
- p_sys->fmt.audio.i_bitspersample,
- p_sys->fmt.i_bitrate);
+ "format initialized: channels=%d , samplerate=%d Hz, fourcc=%4.4s, bits per sample = %d, bitrate = %d bit/s",
+ p_sys->fmt.audio.i_channels,
+ p_sys->fmt.audio.i_rate,
+ (char*)&p_sys->fmt.i_codec,
+ p_sys->fmt.audio.i_bitspersample,
+ p_sys->fmt.i_bitrate);
/* add the es */
p_sys->p_es = es_out_Add( p_demux->out, &p_sys->fmt );
@@ -210,7 +210,7 @@ static int Open( vlc_object_t * p_this )
/* calculate 50ms frame size/time */
p_sys->i_frame_samples = __MAX( p_sys->fmt.audio.i_rate / 20, 1 );
- p_sys->i_seek_step = p_sys->fmt.audio.i_channels *
+ p_sys->i_seek_step = p_sys->fmt.audio.i_channels *
( (p_sys->fmt.audio.i_bitspersample + 7) / 8 );
p_sys->i_frame_size = p_sys->i_frame_samples * p_sys->i_seek_step;
msg_Dbg( p_demux, "frame size is %d bytes ", p_sys->i_frame_size);
@@ -249,8 +249,7 @@ static int Demux( demux_t *p_demux )
return 0;
}
- p_block->i_dts =
- p_block->i_pts = VLC_TS_0 + date_Get( &p_sys->pts );
+ p_block->i_dts = p_block->i_pts = VLC_TS_0 + date_Get( &p_sys->pts );
es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_block->i_pts );
es_out_Send( p_demux->out, p_sys->p_es, p_block );
@@ -268,5 +267,5 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
demux_sys_t *p_sys = p_demux->p_sys;
return demux_vaControlHelper( p_demux->s, 0, -1,
- p_sys->fmt.i_bitrate, p_sys->i_seek_step, i_query, args );
+ p_sys->fmt.i_bitrate, p_sys->i_seek_step, i_query, args );
}
More information about the vlc-commits
mailing list