X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Ffaad.c;h=6d1c927f48e42a42faca4c22fe4b548aa1560767;hb=c60652e38ac6afd74bd8225e9dae5406f13aaa4f;hp=3633bc893dfa6d6f89c72ecd7837845fc85980bb;hpb=658686029ee756fbf4beb8e0cdcc4b0bc5dd18ed;p=vlc diff --git a/modules/codec/faad.c b/modules/codec/faad.c index 3633bc893d..6d1c927f48 100644 --- a/modules/codec/faad.c +++ b/modules/codec/faad.c @@ -31,6 +31,7 @@ #include #include #include +#include #include @@ -62,7 +63,7 @@ struct decoder_sys_t faacDecHandle *hfaad; /* samples */ - audio_date_t date; + date_t date; /* temporary buffer */ uint8_t *p_buffer; @@ -130,14 +131,15 @@ static int Open( vlc_object_t *p_this ) if( ( p_sys->hfaad = faacDecOpen() ) == NULL ) { msg_Err( p_dec, "cannot initialize faad" ); + free( p_sys ); return VLC_EGENERIC; } /* Misc init */ - aout_DateSet( &p_sys->date, 0 ); + date_Set( &p_sys->date, 0 ); p_dec->fmt_out.i_cat = AUDIO_ES; - if (vlc_CPU() & CPU_CAPABILITY_FPU) + if (HAVE_FPU) p_dec->fmt_out.i_codec = VLC_CODEC_FL32; else p_dec->fmt_out.i_codec = VLC_CODEC_S16N; @@ -157,6 +159,8 @@ static int Open( vlc_object_t *p_this ) &i_rate, &i_channels ) < 0 ) { msg_Err( p_dec, "Failed to initialize faad using extra data" ); + faacDecClose( p_sys->hfaad ); + free( p_sys ); return VLC_EGENERIC; } @@ -165,7 +169,7 @@ static int Open( vlc_object_t *p_this ) p_dec->fmt_out.audio.i_physical_channels = p_dec->fmt_out.audio.i_original_channels = pi_channels_guessed[i_channels]; - aout_DateInit( &p_sys->date, i_rate ); + date_Init( &p_sys->date, i_rate, 1 ); } else { @@ -176,7 +180,7 @@ static int Open( vlc_object_t *p_this ) /* Set the faad config */ cfg = faacDecGetCurrentConfiguration( p_sys->hfaad ); - if (vlc_CPU() & CPU_CAPABILITY_FPU) + if (HAVE_FPU) cfg->outputFormat = FAAD_FMT_FLOAT; else cfg->outputFormat = FAAD_FMT_16BIT; @@ -222,9 +226,7 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) /* FIXME: multiple blocks per frame */ if( p_block->i_buffer > i_header_size ) { - vlc_memcpy( p_block->p_buffer, - p_block->p_buffer + i_header_size, - p_block->i_buffer - i_header_size ); + p_block->p_buffer += i_header_size; p_block->i_buffer -= i_header_size; } } @@ -233,8 +235,17 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) /* Append the block to the temporary buffer */ if( p_sys->i_buffer_size < p_sys->i_buffer + p_block->i_buffer ) { - p_sys->i_buffer_size = p_sys->i_buffer + p_block->i_buffer; - p_sys->p_buffer = realloc( p_sys->p_buffer, p_sys->i_buffer_size ); + size_t i_buffer_size = p_sys->i_buffer + p_block->i_buffer; + uint8_t *p_buffer = realloc( p_sys->p_buffer, i_buffer_size ); + if( p_buffer ) + { + p_sys->i_buffer_size = i_buffer_size; + p_sys->p_buffer = p_buffer; + } + else + { + p_block->i_buffer = 0; + } } if( p_block->i_buffer > 0 ) @@ -261,7 +272,7 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) = p_dec->fmt_out.audio.i_original_channels = pi_channels_guessed[i_channels]; - aout_DateInit( &p_sys->date, i_rate ); + date_Init( &p_sys->date, i_rate, 1 ); } } @@ -284,14 +295,14 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) p_dec->fmt_out.audio.i_physical_channels = p_dec->fmt_out.audio.i_original_channels = pi_channels_guessed[i_channels]; - aout_DateInit( &p_sys->date, i_rate ); + date_Init( &p_sys->date, i_rate, 1 ); } - if( p_block->i_pts != 0 && p_block->i_pts != aout_DateGet( &p_sys->date ) ) + if( p_block->i_pts > VLC_TS_INVALID && p_block->i_pts != date_Get( &p_sys->date ) ) { - aout_DateSet( &p_sys->date, p_block->i_pts ); + date_Set( &p_sys->date, p_block->i_pts ); } - else if( !aout_DateGet( &p_sys->date ) ) + else if( !date_Get( &p_sys->date ) ) { /* We've just started the stream, wait for the first PTS. */ block_Release( p_block ); @@ -353,10 +364,10 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) /* We decoded a valid frame */ if( p_dec->fmt_out.audio.i_rate != frame.samplerate ) { - aout_DateInit( &p_sys->date, frame.samplerate ); - aout_DateSet( &p_sys->date, p_block->i_pts ); + date_Init( &p_sys->date, frame.samplerate, 1 ); + date_Set( &p_sys->date, p_block->i_pts ); } - p_block->i_pts = 0; /* PTS is valid only once */ + p_block->i_pts = VLC_TS_INVALID; /* PTS is valid only once */ p_dec->fmt_out.audio.i_rate = frame.samplerate; p_dec->fmt_out.audio.i_channels = frame.channels; @@ -365,10 +376,11 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) = pi_channels_guessed[frame.channels]; /* Adjust stream info when dealing with SBR/PS */ - if( p_sys->b_sbr != frame.sbr || p_sys->b_ps != frame.ps ) + bool b_sbr = (frame.sbr == 1) || (frame.sbr == 2); + if( p_sys->b_sbr != b_sbr || p_sys->b_ps != frame.ps ) { - const char *psz_ext = (frame.sbr && frame.ps) ? "SBR+PS" : - frame.sbr ? "SBR" : "PS"; + const char *psz_ext = (b_sbr && frame.ps) ? "SBR+PS" : + b_sbr ? "SBR" : "PS"; msg_Dbg( p_dec, "AAC %s (channels: %u, samplerate: %lu)", psz_ext, frame.channels, frame.samplerate ); @@ -378,7 +390,8 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) if( p_dec->p_description ) vlc_meta_AddExtra( p_dec->p_description, _("AAC extension"), psz_ext ); - p_sys->b_sbr = frame.sbr; p_sys->b_ps = frame.ps; + p_sys->b_sbr = b_sbr; + p_sys->b_ps = frame.ps; } /* Convert frame.channel_position to our own channel values */ @@ -415,8 +428,10 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) return NULL; } - p_out->start_date = aout_DateGet( &p_sys->date ); - p_out->end_date = aout_DateIncrement( &p_sys->date, frame.samples / frame.channels ); + p_out->i_pts = date_Get( &p_sys->date ); + p_out->i_length = date_Increment( &p_sys->date, + frame.samples / frame.channels ) + - p_out->i_pts; DoReordering( (uint32_t *)p_out->p_buffer, samples, frame.samples / frame.channels, frame.channels, @@ -473,7 +488,7 @@ static void DoReordering( uint32_t *p_out, uint32_t *p_in, int i_samples, } /* Do the actual reordering */ - if( vlc_CPU() & CPU_CAPABILITY_FPU ) + if( HAVE_FPU ) for( i = 0; i < i_samples; i++ ) for( j = 0; j < i_nb_channels; j++ ) p_out[i * i_nb_channels + pi_chan_table[j]] =