[vlc-commits] block_t ** parameter is never NULL for audio decoding
Rémi Denis-Courmont
git at videolan.org
Thu Aug 25 19:08:26 CEST 2011
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Aug 25 18:54:04 2011 +0300| [48e39d4453616f2b41a55405e11b41407e0b3222] | committer: Rémi Denis-Courmont
block_t ** parameter is never NULL for audio decoding
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=48e39d4453616f2b41a55405e11b41407e0b3222
---
modules/codec/adpcm.c | 6 ++----
modules/codec/araw.c | 5 ++---
modules/codec/avcodec/audio.c | 6 ++----
modules/codec/faad.c | 6 ++----
modules/codec/flac.c | 9 +++++----
modules/codec/fluidsynth.c | 5 +----
modules/codec/omxil/omxil.c | 6 ++----
modules/codec/quicktime.c | 5 ++---
modules/codec/wmafixed/wma.c | 6 ++----
9 files changed, 20 insertions(+), 34 deletions(-)
diff --git a/modules/codec/adpcm.c b/modules/codec/adpcm.c
index 62fab84..0177d07 100644
--- a/modules/codec/adpcm.c
+++ b/modules/codec/adpcm.c
@@ -268,11 +268,9 @@ static int OpenDecoder( vlc_object_t *p_this )
static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
{
decoder_sys_t *p_sys = p_dec->p_sys;
- block_t *p_block;
+ block_t *p_block = *pp_block;
- if( !pp_block || !*pp_block ) return NULL;
-
- p_block = *pp_block;
+ if( !p_block ) return NULL;
if( p_block->i_pts > VLC_TS_INVALID &&
p_block->i_pts != date_Get( &p_sys->end_date ) )
diff --git a/modules/codec/araw.c b/modules/codec/araw.c
index 30c7d15..ea69966 100644
--- a/modules/codec/araw.c
+++ b/modules/codec/araw.c
@@ -346,11 +346,10 @@ static int DecoderOpen( vlc_object_t *p_this )
static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
{
decoder_sys_t *p_sys = p_dec->p_sys;
-
- if( !pp_block || !*pp_block ) return NULL;
-
block_t *p_block = *pp_block;
+ if( !p_block ) return NULL;
+
if( p_block->i_pts > VLC_TS_INVALID &&
p_block->i_pts != date_Get( &p_sys->end_date ) )
{
diff --git a/modules/codec/avcodec/audio.c b/modules/codec/avcodec/audio.c
index 33e7418..bb1343b 100644
--- a/modules/codec/avcodec/audio.c
+++ b/modules/codec/avcodec/audio.c
@@ -257,12 +257,10 @@ aout_buffer_t * DecodeAudio ( decoder_t *p_dec, block_t **pp_block )
decoder_sys_t *p_sys = p_dec->p_sys;
int i_used, i_output;
aout_buffer_t *p_buffer;
- block_t *p_block;
+ block_t *p_block = *pp_block;
AVPacket pkt;
- if( !pp_block || !*pp_block ) return NULL;
-
- p_block = *pp_block;
+ if( !p_block ) return NULL;
if( !p_sys->p_context->extradata_size && p_dec->fmt_in.i_extra &&
p_sys->b_delayed_open)
diff --git a/modules/codec/faad.c b/modules/codec/faad.c
index 6d1c927..5454d6e 100644
--- a/modules/codec/faad.c
+++ b/modules/codec/faad.c
@@ -203,11 +203,9 @@ static int Open( vlc_object_t *p_this )
static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
{
decoder_sys_t *p_sys = p_dec->p_sys;
- block_t *p_block;
+ block_t *p_block = *pp_block;
- if( !pp_block || !*pp_block ) return NULL;
-
- p_block = *pp_block;
+ if( !p_block ) return NULL;
if( p_block->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
{
diff --git a/modules/codec/flac.c b/modules/codec/flac.c
index 519d4c2..9cb441c 100644
--- a/modules/codec/flac.c
+++ b/modules/codec/flac.c
@@ -527,19 +527,20 @@ static void decoder_state_error( decoder_t *p_dec,
static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
{
decoder_sys_t *p_sys = p_dec->p_sys;
+ block_t *p_block = *pp_block;
- if( !pp_block || !*pp_block )
+ if( !p_block )
return NULL;
- if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
+ if( p_block->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
{
- block_Release( *pp_block );
+ block_Release( p_block );
return NULL;
}
if( !p_sys->b_stream_info )
ProcessHeader( p_dec );
- p_sys->p_block = *pp_block;
+ p_sys->p_block = p_block;
*pp_block = NULL;
if( p_sys->p_block->i_pts > VLC_TS_INVALID &&
diff --git a/modules/codec/fluidsynth.c b/modules/codec/fluidsynth.c
index 4a967c2..27b4b61 100644
--- a/modules/codec/fluidsynth.c
+++ b/modules/codec/fluidsynth.c
@@ -165,13 +165,10 @@ static void Close (vlc_object_t *p_this)
static aout_buffer_t *DecodeBlock (decoder_t *p_dec, block_t **pp_block)
{
- block_t *p_block;
decoder_sys_t *p_sys = p_dec->p_sys;
+ block_t *p_block = *pp_block;
aout_buffer_t *p_out = NULL;
- if (pp_block == NULL)
- return NULL;
- p_block = *pp_block;
if (p_block == NULL)
return NULL;
*pp_block = NULL;
diff --git a/modules/codec/omxil/omxil.c b/modules/codec/omxil/omxil.c
index 748da40..a6de434 100644
--- a/modules/codec/omxil/omxil.c
+++ b/modules/codec/omxil/omxil.c
@@ -1154,12 +1154,10 @@ aout_buffer_t *DecodeAudio ( decoder_t *p_dec, block_t **pp_block )
aout_buffer_t *p_buffer = 0;
OMX_BUFFERHEADERTYPE *p_header;
OMX_ERRORTYPE omx_error;
- block_t *p_block;
+ block_t *p_block = *pp_block;
unsigned int i;
- if( !pp_block || !*pp_block ) return NULL;
-
- p_block = *pp_block;
+ if( !p_block ) return NULL;
/* Check for errors from codec */
if(p_sys->b_error)
diff --git a/modules/codec/quicktime.c b/modules/codec/quicktime.c
index ae154fa..0904d4d 100644
--- a/modules/codec/quicktime.c
+++ b/modules/codec/quicktime.c
@@ -528,7 +528,7 @@ static aout_buffer_t *DecodeAudio( decoder_t *p_dec, block_t **pp_block )
{
decoder_sys_t *p_sys = p_dec->p_sys;
- block_t *p_block;
+ block_t *p_block = *pp_block;
int i_error;
#ifdef LOADER
@@ -547,11 +547,10 @@ static aout_buffer_t *DecodeAudio( decoder_t *p_dec, block_t **pp_block )
}
#endif
- if( pp_block == NULL || *pp_block == NULL )
+ if( p_block == NULL )
{
return NULL;
}
- p_block = *pp_block;
if( p_sys->i_out_frames > 0 && p_sys->i_out >= p_sys->i_out_frames )
{
diff --git a/modules/codec/wmafixed/wma.c b/modules/codec/wmafixed/wma.c
index b361861..bc433ce 100644
--- a/modules/codec/wmafixed/wma.c
+++ b/modules/codec/wmafixed/wma.c
@@ -195,15 +195,13 @@ static int OpenDecoder( vlc_object_t *p_this )
static aout_buffer_t *DecodeFrame( decoder_t *p_dec, block_t **pp_block )
{
decoder_sys_t *p_sys = p_dec->p_sys;
- block_t *p_block;
+ block_t *p_block = *pp_block;
aout_buffer_t *p_aout_buffer = NULL;
#ifdef NDEBUG
mtime_t start = mdate(); /* for statistics */
#endif
- if( !pp_block || !*pp_block ) return NULL;
-
- p_block = *pp_block;
+ if( !p_block ) return NULL;
if( p_block->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
{
More information about the vlc-commits
mailing list