int64_t i_previous_layout;
};
+#define BLOCK_FLAG_PRIVATE_REALLOCATED (1 << BLOCK_FLAG_PRIVATE_SHIFT)
+
static void SetupOutputFormat( decoder_t *p_dec, bool b_trust );
/*****************************************************************************
p_sys->p_context->block_align = p_dec->fmt_in.audio.i_blockalign;
p_sys->p_context->bit_rate = p_dec->fmt_in.i_bitrate;
-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 52, 0, 0 )
- p_sys->p_context->bits_per_sample = p_dec->fmt_in.audio.i_bitspersample;
-#else
p_sys->p_context->bits_per_coded_sample = p_dec->fmt_in.audio.i_bitspersample;
-#endif
if( p_dec->fmt_in.i_extra > 0 )
{
p_sys->i_previous_channels = 0;
p_sys->i_previous_layout = 0;
- date_Set( &p_sys->end_date, 0 );
- if( p_dec->fmt_in.audio.i_rate )
- date_Init( &p_sys->end_date, p_dec->fmt_in.audio.i_rate, 1 );
-
/* */
p_dec->fmt_out.i_cat = AUDIO_ES;
- /* Try to set as much informations as possible but do not trust it */
+ /* Try to set as much information as possible but do not trust it */
SetupOutputFormat( p_dec, false );
+ date_Set( &p_sys->end_date, 0 );
+ if( p_dec->fmt_out.audio.i_rate )
+ date_Init( &p_sys->end_date, p_dec->fmt_out.audio.i_rate, 1 );
+ else if( p_dec->fmt_in.audio.i_rate )
+ date_Init( &p_sys->end_date, p_dec->fmt_in.audio.i_rate, 1 );
+
return VLC_SUCCESS;
}
return NULL;
}
- i_output = __MAX( p_block->i_buffer, p_sys->i_output_max );
- if( i_output > p_sys->i_output_max )
+ if( (p_block->i_flags & BLOCK_FLAG_PRIVATE_REALLOCATED) == 0 )
{
- /* Grow output buffer if necessary (eg. for PCM data) */
- p_sys->p_output = av_realloc( p_sys->p_output, i_output );
+ *pp_block = p_block = block_Realloc( p_block, 0, p_block->i_buffer + FF_INPUT_BUFFER_PADDING_SIZE );
+ if( !p_block )
+ return NULL;
+ p_block->i_buffer -= FF_INPUT_BUFFER_PADDING_SIZE;
+ memset( &p_block->p_buffer[p_block->i_buffer], 0, FF_INPUT_BUFFER_PADDING_SIZE );
+
+ p_block->i_flags |= BLOCK_FLAG_PRIVATE_REALLOCATED;
}
- *pp_block = p_block = block_Realloc( p_block, 0, p_block->i_buffer + FF_INPUT_BUFFER_PADDING_SIZE );
- if( !p_block )
- return NULL;
- p_block->i_buffer -= FF_INPUT_BUFFER_PADDING_SIZE;
- memset( &p_block->p_buffer[p_block->i_buffer], 0, FF_INPUT_BUFFER_PADDING_SIZE );
+ do
+ {
+ i_output = __MAX( p_block->i_buffer, p_sys->i_output_max );
+ if( i_output > p_sys->i_output_max )
+ {
+ /* Grow output buffer if necessary (eg. for PCM data) */
+ p_sys->p_output = av_realloc( p_sys->p_output, i_output );
+ }
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 0, 0 )
- i_used = avcodec_decode_audio2( p_sys->p_context,
- (int16_t*)p_sys->p_output, &i_output,
- p_block->p_buffer, p_block->i_buffer );
-#else
- i_used = avcodec_decode_audio( p_sys->p_context,
- (int16_t*)p_sys->p_output, &i_output,
- p_block->p_buffer, p_block->i_buffer );
-#endif
+ i_used = avcodec_decode_audio2( p_sys->p_context,
+ (int16_t*)p_sys->p_output, &i_output,
+ p_block->p_buffer, p_block->i_buffer );
- if( i_used < 0 || i_output < 0 )
- {
- if( i_used < 0 )
- msg_Warn( p_dec, "cannot decode one frame (%zu bytes)",
- p_block->i_buffer );
+ if( i_used < 0 || i_output < 0 )
+ {
+ if( i_used < 0 )
+ msg_Warn( p_dec, "cannot decode one frame (%zu bytes)",
+ p_block->i_buffer );
- block_Release( p_block );
- return NULL;
- }
- else if( (size_t)i_used > p_block->i_buffer )
- {
- i_used = p_block->i_buffer;
- }
+ block_Release( p_block );
+ return NULL;
+ }
+ else if( (size_t)i_used > p_block->i_buffer )
+ {
+ i_used = p_block->i_buffer;
+ }
- p_block->i_buffer -= i_used;
- p_block->p_buffer += i_used;
+ p_block->i_buffer -= i_used;
+ p_block->p_buffer += i_used;
+
+ } while( p_block->i_buffer > 0 && i_output <= 0 );
if( p_sys->p_context->channels <= 0 || p_sys->p_context->channels > 8 ||
p_sys->p_context->sample_rate <= 0 )
/*****************************************************************************
*
*****************************************************************************/
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 2, 0 )
-# define LIBAVCODEC_AUDIO_LAYOUT
-#else
-# warning "Audio channel layout is unsupported by your avcodec version."
-#endif
-#if defined(LIBAVCODEC_AUDIO_LAYOUT)
+void GetVlcAudioFormat( vlc_fourcc_t *pi_codec, unsigned *pi_bits, int i_sample_fmt )
+{
+ switch( i_sample_fmt )
+ {
+ case SAMPLE_FMT_U8:
+ *pi_codec = VLC_CODEC_U8;
+ *pi_bits = 8;
+ break;
+ case SAMPLE_FMT_S32:
+ *pi_codec = VLC_CODEC_S32N;
+ *pi_bits = 32;
+ break;
+ case SAMPLE_FMT_FLT:
+ *pi_codec = VLC_CODEC_FL32;
+ *pi_bits = 32;
+ break;
+ case SAMPLE_FMT_DBL:
+ *pi_codec = VLC_CODEC_FL64;
+ *pi_bits = 64;
+ break;
+
+ case SAMPLE_FMT_S16:
+ default:
+ *pi_codec = VLC_CODEC_S16N;
+ *pi_bits = 16;
+ break;
+ }
+}
+
static const uint64_t pi_channels_map[][2] =
{
{ CH_FRONT_LEFT, AOUT_CHAN_LEFT },
{ CH_STEREO_LEFT, 0 },
{ CH_STEREO_RIGHT, 0 },
};
-#else
-static const uint64_t pi_channels_map[][2] =
-{
- { 0, AOUT_CHAN_LEFT },
- { 0, AOUT_CHAN_RIGHT },
- { 0, AOUT_CHAN_CENTER },
- { 0, AOUT_CHAN_LFE },
- { 0, AOUT_CHAN_REARLEFT },
- { 0, AOUT_CHAN_REARRIGHT },
- { 0, 0 },
- { 0, 0 },
- { 0, AOUT_CHAN_REARCENTER },
- { 0, AOUT_CHAN_MIDDLELEFT },
- { 0, AOUT_CHAN_MIDDLERIGHT },
- { 0, 0 },
- { 0, 0 },
- { 0, 0 },
- { 0, 0 },
- { 0, 0 },
- { 0, 0 },
- { 0, 0 },
- { 0, 0 },
- { 0, 0 },
-};
-#endif
static void SetupOutputFormat( decoder_t *p_dec, bool b_trust )
{
decoder_sys_t *p_sys = p_dec->p_sys;
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 51, 65, 0 )
- switch( p_sys->p_context->sample_fmt )
- {
- case SAMPLE_FMT_U8:
- p_dec->fmt_out.i_codec = VLC_CODEC_U8;
- p_dec->fmt_out.audio.i_bitspersample = 8;
- break;
- case SAMPLE_FMT_S32:
- p_dec->fmt_out.i_codec = VLC_CODEC_S32N;
- p_dec->fmt_out.audio.i_bitspersample = 32;
- break;
- case SAMPLE_FMT_FLT:
- p_dec->fmt_out.i_codec = VLC_CODEC_FL32;
- p_dec->fmt_out.audio.i_bitspersample = 32;
- break;
- case SAMPLE_FMT_DBL:
- p_dec->fmt_out.i_codec = VLC_CODEC_FL64;
- p_dec->fmt_out.audio.i_bitspersample = 64;
- break;
-
- case SAMPLE_FMT_S16:
- default:
- p_dec->fmt_out.i_codec = VLC_CODEC_S16N;
- p_dec->fmt_out.audio.i_bitspersample = 16;
- break;
- }
-#else
- p_dec->fmt_out.i_codec = VLC_CODEC_S16N;
- p_dec->fmt_out.audio.i_bitspersample = 16;
-#endif
- p_dec->fmt_out.audio.i_rate = p_sys->p_context->sample_rate;
+ GetVlcAudioFormat( &p_dec->fmt_out.i_codec,
+ &p_dec->fmt_out.audio.i_bitspersample,
+ p_sys->p_context->sample_fmt );
+ p_dec->fmt_out.audio.i_rate = p_sys->p_context->sample_rate;
/* */
-#if defined(LIBAVCODEC_AUDIO_LAYOUT)
if( p_sys->i_previous_channels == p_sys->p_context->channels &&
p_sys->i_previous_layout == p_sys->p_context->channel_layout )
return;
-#else
- if( p_sys->i_previous_channels == p_sys->p_context->channels )
- return;
-#endif
if( b_trust )
{
p_sys->i_previous_channels = p_sys->p_context->channels;
-#if defined(LIBAVCODEC_AUDIO_LAYOUT)
p_sys->i_previous_layout = p_sys->p_context->channel_layout;
-#endif
}
/* Specified order
* FIXME should we use fmt_in.audio.i_physical_channels or not ?
*/
-#if defined(LIBAVCODEC_AUDIO_LAYOUT)
const unsigned i_order_max = 8 * sizeof(p_sys->p_context->channel_layout);
-#else
- const unsigned i_order_max = 64;
-#endif
uint32_t pi_order_src[i_order_max];
int i_channels_src = 0;
-#if defined(LIBAVCODEC_AUDIO_LAYOUT)
if( p_sys->p_context->channel_layout )
{
for( unsigned i = 0; i < sizeof(pi_channels_map)/sizeof(*pi_channels_map); i++ )
}
}
else
-#endif
{
/* Create default order */
if( b_trust )
projects / vlc / blobdiff