id = malloc( sizeof( sout_stream_id_t ) );
if( !id )
- {
- msg_Err( p_stream, "out of memory" );
goto error;
- }
memset( id, 0, sizeof(sout_stream_id_t) );
id->id = NULL;
/* Create decoder object */
id->p_decoder = vlc_object_create( p_stream, VLC_OBJECT_DECODER );
if( !id->p_decoder )
- {
- msg_Err( p_stream, "out of memory" );
goto error;
- }
vlc_object_attach( id->p_decoder, p_stream );
id->p_decoder->p_module = NULL;
id->p_decoder->fmt_in = *p_fmt;
/* Create encoder object */
id->p_encoder = vlc_object_create( p_stream, VLC_OBJECT_ENCODER );
if( !id->p_encoder )
- {
- msg_Err( p_stream, "out of memory" );
goto error;
- }
vlc_object_attach( id->p_encoder, p_stream );
id->p_encoder->p_module = NULL;
return id;
- error:
- if( id->p_decoder )
+error:
+ if( id )
{
- vlc_object_detach( id->p_decoder );
- vlc_object_release( id->p_decoder );
- id->p_decoder = NULL;
- }
+ if( id->p_decoder )
+ {
+ vlc_object_detach( id->p_decoder );
+ vlc_object_release( id->p_decoder );
+ id->p_decoder = NULL;
+ }
- if( id->p_encoder )
- {
- vlc_object_detach( id->p_encoder );
- es_format_Clean( &id->p_encoder->fmt_out );
- vlc_object_release( id->p_encoder );
- id->p_encoder = NULL;
- }
+ if( id->p_encoder )
+ {
+ vlc_object_detach( id->p_encoder );
+ es_format_Clean( &id->p_encoder->fmt_out );
+ vlc_object_release( id->p_encoder );
+ id->p_encoder = NULL;
+ }
- free( id );
+ free( id );
+ }
return NULL;
}
* decoder reencoder part
****************************************************************************/
-static int audio_BitsPerSample( vlc_fourcc_t i_format )
-{
- switch( i_format )
- {
- case VLC_FOURCC('u','8',' ',' '):
- case VLC_FOURCC('s','8',' ',' '):
- return 8;
-
- case VLC_FOURCC('u','1','6','l'):
- case VLC_FOURCC('s','1','6','l'):
- case VLC_FOURCC('u','1','6','b'):
- case VLC_FOURCC('s','1','6','b'):
- return 16;
-
- case VLC_FOURCC('u','2','4','l'):
- case VLC_FOURCC('s','2','4','l'):
- case VLC_FOURCC('u','2','4','b'):
- case VLC_FOURCC('s','2','4','b'):
- return 24;
-
- case VLC_FOURCC('u','3','2','l'):
- case VLC_FOURCC('s','3','2','l'):
- case VLC_FOURCC('u','3','2','b'):
- case VLC_FOURCC('s','3','2','b'):
- case VLC_FOURCC('f','l','3','2'):
- case VLC_FOURCC('f','i','3','2'):
- return 32;
-
- case VLC_FOURCC('f','l','6','4'):
- return 64;
- }
-
- return 0;
-}
-
static block_t *transcode_audio_alloc( filter_t *p_filter, int size )
{
VLC_UNUSED( p_filter );
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
es_format_t fmt_last;
+ int i;
/*
* Open decoder
return VLC_EGENERIC;
}
id->p_decoder->fmt_out.audio.i_bitspersample =
- audio_BitsPerSample( id->p_decoder->fmt_out.i_codec );
+ aout_BitsPerSample( id->p_decoder->fmt_out.i_codec );
fmt_last = id->p_decoder->fmt_out;
/* Fix AAC SBR changing number of channels and sampling rate */
if( !(id->p_decoder->fmt_in.i_codec == VLC_FOURCC('m','p','4','a') &&
id->p_decoder->fmt_out.i_codec );
id->p_encoder->fmt_in.audio.i_format = id->p_decoder->fmt_out.i_codec;
- if( ( id->p_encoder->fmt_out.i_codec == VLC_FOURCC('s','a','m','r') ) ||
- ( id->p_encoder->fmt_out.i_codec == VLC_FOURCC('s','a','w','b') ) )
- id->p_encoder->fmt_in.audio.i_rate = id->p_encoder->fmt_out.audio.i_rate;
- else
- id->p_encoder->fmt_in.audio.i_rate = fmt_last.audio.i_rate;
+ id->p_encoder->fmt_in.audio.i_rate = fmt_last.audio.i_rate;//id->p_encoder->fmt_out.audio.i_rate;
id->p_encoder->fmt_in.audio.i_physical_channels =
id->p_encoder->fmt_out.audio.i_physical_channels;
id->p_encoder->fmt_in.audio.i_original_channels =
id->p_encoder->fmt_in.audio.i_channels =
id->p_encoder->fmt_out.audio.i_channels;
id->p_encoder->fmt_in.audio.i_bitspersample =
- audio_BitsPerSample( id->p_encoder->fmt_in.i_codec );
+ aout_BitsPerSample( id->p_encoder->fmt_in.i_codec );
id->p_encoder->p_cfg = p_stream->p_sys->p_audio_cfg;
id->p_encoder->p_module =
}
id->p_encoder->fmt_in.audio.i_format = id->p_encoder->fmt_in.i_codec;
id->p_encoder->fmt_in.audio.i_bitspersample =
- audio_BitsPerSample( id->p_encoder->fmt_in.i_codec );
+ aout_BitsPerSample( id->p_encoder->fmt_in.i_codec );
/* Init filter chain */
id->p_f_chain = filter_chain_New( p_stream, "audio filter2", true,
fmt_last.audio.i_rate != id->p_encoder->fmt_in.audio.i_rate )
{
/* We'll have to go through fl32 first */
- es_format_t fmt_out = id->p_encoder->fmt_in;
- fmt_out.i_codec = fmt_out.audio.i_format = VLC_FOURCC('f','l','3','2');
- filter_chain_AppendFilter( id->p_f_chain, NULL, NULL, &fmt_last, &fmt_out );
- fmt_last = fmt_out;
+ fmt_last.i_codec = fmt_last.audio.i_format = VLC_FOURCC('f','l','3','2');
+ fmt_last.audio.i_bitspersample = aout_BitsPerSample( fmt_last.i_codec );
+ filter_chain_AppendFilter( id->p_f_chain, NULL, NULL, NULL, &fmt_last );
+ fmt_last = *filter_chain_GetFmtOut( id->p_f_chain );
}
- /* FIXME: same comment as in "#if 0"ed code */
- int i;
for( i = 0; i < 4; i++ )
{
if( (fmt_last.audio.i_channels !=
}
}
-#if 0
-/* FIXME FIXME FIXME WHAT DOES THIS CODE DO? LOOKS LIKE IT'S RANDOMLY TRYING
-TO CHAIN A BUNCH OF AUDIO FILTERS */
- for( i = 0; i < TRANSCODE_FILTERS; i++ )
- {
- if( (fmt_last.audio.i_channels !=
- id->p_encoder->fmt_in.audio.i_channels) ||
- (fmt_last.audio.i_rate != id->p_encoder->fmt_in.audio.i_rate) ||
- (fmt_last.i_codec != id->p_encoder->fmt_in.i_codec) )
- {
- id->pp_filter[id->i_filter] =
- transcode_audio_filter_new( p_stream, id, &fmt_last,
- &id->p_encoder->fmt_in, NULL );
-
- if( id->pp_filter[id->i_filter] )
- id->i_filter++;
- else
- break;
- }
- }
-#endif
-
/* Final checks to see if conversions were successful */
if( fmt_last.i_codec != id->p_encoder->fmt_in.i_codec )
{
}
id->p_encoder->fmt_in.audio.i_format = id->p_encoder->fmt_in.i_codec;
id->p_encoder->fmt_in.audio.i_bitspersample =
- audio_BitsPerSample( id->p_encoder->fmt_in.i_codec );
+ aout_BitsPerSample( id->p_encoder->fmt_in.i_codec );
#else
msg_Err( p_stream, "no audio filter found for mixing from"
" %i to %i channels", fmt_last.audio.i_channels,