Skip to content

V
vlc-gpu
Commit d6807243 authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options

* modules/stream_out/transcode.c: simplifications + more extensive audio... 

* modules/stream_out/transcode.c: simplifications + more extensive audio filter searches for conversions.
parent 95e19fa9
Show whitespace changes
Inline Side-by-side
Showing with 71 additions and 135 deletions
modules/stream_out/transcode.c
View file @ d6807243
...@@ -886,11 +886,42 @@ int audio_BitsPerSample( vlc_fourcc_t i_format ) ...@@ -886,11 +886,42 @@ int audio_BitsPerSample( vlc_fourcc_t i_format )
return 0; return 0;
} }
static filter_t *transcode_audio_filter_new( sout_stream_t *p_stream,
sout_stream_id_t *id,
es_format_t *p_fmt_in,
es_format_t *p_fmt_out )
{
filter_t *p_filter = vlc_object_create( p_stream, VLC_OBJECT_FILTER );
vlc_object_attach( p_filter, p_stream );
p_filter->pf_audio_buffer_new = __block_New;
p_filter->fmt_in = *p_fmt_in;
p_filter->fmt_out = *p_fmt_out;
p_filter->p_module = module_Need( p_filter, "audio filter2", 0, 0 );
if( p_filter->p_module )
{
p_filter->fmt_out.audio.i_bitspersample =
audio_BitsPerSample( p_filter->fmt_out.i_codec );
*p_fmt_in = p_filter->fmt_out;
}
else
{
vlc_object_detach( p_filter );
vlc_object_destroy( p_filter );
p_filter = 0;
}
return p_filter;
}
static int transcode_audio_new( sout_stream_t *p_stream, static int transcode_audio_new( sout_stream_t *p_stream,
sout_stream_id_t *id ) sout_stream_id_t *id )
{ {
sout_stream_sys_t *p_sys = p_stream->p_sys; sout_stream_sys_t *p_sys = p_stream->p_sys;
es_format_t fmt_last; es_format_t fmt_last;
int i_pass = 6;
/* /*
* Open decoder * Open decoder
...@@ -966,113 +997,42 @@ static int transcode_audio_new( sout_stream_t *p_stream, ...@@ -966,113 +997,42 @@ static int transcode_audio_new( sout_stream_t *p_stream,
id->p_encoder->fmt_in.audio.i_bitspersample = id->p_encoder->fmt_in.audio.i_bitspersample =
audio_BitsPerSample( id->p_encoder->fmt_in.i_codec ); audio_BitsPerSample( id->p_encoder->fmt_in.i_codec );
/* Check if we need a filter for the audio format conversion */ /* Load conversion filters */
if( id->p_decoder->fmt_out.i_codec != while( i_pass-- )
id->p_encoder->fmt_in.i_codec )
{ {
id->pp_filter[0] = if( fmt_last.audio.i_channels !=
vlc_object_create( p_stream, VLC_OBJECT_FILTER ); id->p_encoder->fmt_in.audio.i_channels ||
vlc_object_attach( id->pp_filter[0], p_stream ); 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[0]->pf_audio_buffer_new = __block_New;
id->pp_filter[0]->fmt_in = fmt_last;
id->pp_filter[0]->fmt_out = id->p_encoder->fmt_in;
id->pp_filter[0]->p_module =
module_Need( id->pp_filter[0], "audio filter2", 0, 0 );
if( id->pp_filter[0]->p_module ) id->i_filter++;
else
{ {
msg_Dbg( p_stream, "no audio filter found (%4.4s->%4.4s)", id->pp_filter[id->i_filter] =
(char *)&id->pp_filter[0]->fmt_in, transcode_audio_filter_new( p_stream, id, &fmt_last,
(char *)&id->pp_filter[0]->fmt_out ); &id->p_encoder->fmt_in );
vlc_object_detach( id->pp_filter[0] );
vlc_object_destroy( id->pp_filter[0] );
module_Unneed( id->p_decoder, id->p_decoder->p_module );
id->p_decoder->p_module = 0;
module_Unneed( id->p_encoder, id->p_encoder->p_module );
id->p_encoder->p_module = 0;
return VLC_EGENERIC;
}
id->pp_filter[0]->fmt_out.audio.i_bitspersample =
audio_BitsPerSample( id->pp_filter[0]->fmt_out.i_codec );
fmt_last = id->pp_filter[0]->fmt_out;
/* Try a 2 stage conversion */
if( id->pp_filter[0]->fmt_out.i_codec !=
id->p_encoder->fmt_in.i_codec )
{
id->pp_filter[1] =
vlc_object_create( p_stream, VLC_OBJECT_FILTER );
vlc_object_attach( id->pp_filter[1], p_stream );
id->pp_filter[1]->pf_audio_buffer_new = __block_New; if( id->pp_filter[id->i_filter] ) id->i_filter++;
else break;
}
}
id->pp_filter[1]->fmt_in = id->pp_filter[0]->fmt_out; /* Final checks to see if conversions were successful */
id->pp_filter[1]->fmt_out = id->p_encoder->fmt_in; if( fmt_last.i_codec != id->p_encoder->fmt_in.i_codec )
id->pp_filter[1]->p_module =
module_Need( id->pp_filter[1], "audio filter2", 0, 0 );
if( !id->pp_filter[1]->p_module ||
id->pp_filter[1]->fmt_out.i_codec !=
id->p_encoder->fmt_in.i_codec )
{ {
msg_Dbg( p_stream, "no audio filter found (%4.4s->%4.4s)", msg_Dbg( p_stream, "no audio filter found (%4.4s->%4.4s)",
(char *)&id->pp_filter[1]->fmt_in, (char *)&fmt_last.i_codec,
(char *)&id->pp_filter[1]->fmt_out ); (char *)&id->p_encoder->fmt_in.i_codec );
module_Unneed( id->pp_filter[0], id->pp_filter[0]->p_module ); transcode_audio_close( p_stream, id );
vlc_object_detach( id->pp_filter[0] );
vlc_object_destroy( id->pp_filter[0] );
if( id->pp_filter[1]->p_module )
module_Unneed( id->pp_filter[0], id->pp_filter[0]->p_module );
vlc_object_detach( id->pp_filter[1] );
vlc_object_destroy( id->pp_filter[1] );
module_Unneed( id->p_decoder, id->p_decoder->p_module );
id->p_decoder->p_module = 0;
module_Unneed( id->p_encoder, id->p_encoder->p_module );
id->p_encoder->p_module = 0;
return VLC_EGENERIC; return VLC_EGENERIC;
} }
else id->i_filter++;
fmt_last = id->pp_filter[1]->fmt_out;
}
}
/* Check if we need a filter for channel downmixing */ if( fmt_last.audio.i_channels !=
if( fmt_last.audio.i_channels != id->p_encoder->fmt_in.audio.i_channels ) id->p_encoder->fmt_in.audio.i_channels )
{
id->pp_filter[id->i_filter] =
vlc_object_create( p_stream, VLC_OBJECT_FILTER );
vlc_object_attach( id->pp_filter[id->i_filter], p_stream );
id->pp_filter[id->i_filter]->pf_audio_buffer_new = __block_New;
id->pp_filter[id->i_filter]->fmt_in = fmt_last;
id->pp_filter[id->i_filter]->fmt_out = id->p_encoder->fmt_in;
id->pp_filter[id->i_filter]->fmt_out.audio.i_rate =
fmt_last.audio.i_rate;
id->pp_filter[id->i_filter]->p_module =
module_Need( id->pp_filter[id->i_filter], "audio filter2", 0, 0 );
if( id->pp_filter[id->i_filter]->p_module )
{
id->pp_filter[id->i_filter]->fmt_out.audio.i_bitspersample =
audio_BitsPerSample( id->pp_filter[id->i_filter]->fmt_out.i_codec );
fmt_last = id->pp_filter[id->i_filter]->fmt_out;
id->i_filter++;
}
else
{ {
msg_Dbg( p_stream, "no audio filter found for mixing from" msg_Dbg( p_stream, "no audio filter found for mixing from"
" %i to %i channels", " %i to %i channels", fmt_last.audio.i_channels,
id->pp_filter[id->i_filter]->fmt_in.audio.i_channels, id->p_encoder->fmt_in.audio.i_channels );
id->pp_filter[id->i_filter]->fmt_out.audio.i_channels );
vlc_object_detach( id->pp_filter[id->i_filter] );
vlc_object_destroy( id->pp_filter[id->i_filter] );
id->p_encoder->fmt_in.audio.i_channels = fmt_last.audio.i_channels; id->p_encoder->fmt_in.audio.i_channels = fmt_last.audio.i_channels;
id->p_encoder->fmt_out.audio.i_channels =fmt_last.audio.i_channels; id->p_encoder->fmt_out.audio.i_channels = fmt_last.audio.i_channels;
id->p_encoder->fmt_in.audio.i_physical_channels = id->p_encoder->fmt_in.audio.i_physical_channels =
id->p_encoder->fmt_in.audio.i_original_channels = id->p_encoder->fmt_in.audio.i_original_channels =
...@@ -1081,41 +1041,15 @@ static int transcode_audio_new( sout_stream_t *p_stream, ...@@ -1081,41 +1041,15 @@ static int transcode_audio_new( sout_stream_t *p_stream,
id->p_encoder->fmt_out.audio.i_original_channels = id->p_encoder->fmt_out.audio.i_original_channels =
fmt_last.audio.i_physical_channels; fmt_last.audio.i_physical_channels;
} }
}
/* Check if we need a filter for the sampling rate conversion */
if( fmt_last.audio.i_rate != id->p_encoder->fmt_in.audio.i_rate ) if( fmt_last.audio.i_rate != id->p_encoder->fmt_in.audio.i_rate )
{
id->pp_filter[id->i_filter] =
vlc_object_create( p_stream, VLC_OBJECT_FILTER );
vlc_object_attach( id->pp_filter[id->i_filter], p_stream );
id->pp_filter[id->i_filter]->pf_audio_buffer_new = __block_New;
id->pp_filter[id->i_filter]->fmt_in = fmt_last;
id->pp_filter[id->i_filter]->fmt_out = id->p_encoder->fmt_in;
id->pp_filter[id->i_filter]->p_module =
module_Need( id->pp_filter[id->i_filter], "audio filter2", 0, 0 );
if( id->pp_filter[id->i_filter]->p_module )
{
id->pp_filter[id->i_filter]->fmt_out.audio.i_bitspersample =
audio_BitsPerSample( id->pp_filter[id->i_filter]->fmt_out.i_codec );
fmt_last = id->pp_filter[id->i_filter]->fmt_out;
id->i_filter++;
}
else
{ {
msg_Dbg( p_stream, "no audio filter found resampling from" msg_Dbg( p_stream, "no audio filter found resampling from"
" %iHz to %iHz", " %iHz to %iHz", fmt_last.audio.i_rate,
id->pp_filter[id->i_filter]->fmt_in.audio.i_rate, id->p_encoder->fmt_in.audio.i_rate );
id->pp_filter[id->i_filter]->fmt_out.audio.i_rate );
vlc_object_detach( id->pp_filter[id->i_filter] );
vlc_object_destroy( id->pp_filter[id->i_filter] );
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 = fmt_last.audio.i_rate; id->p_encoder->fmt_out.audio.i_rate = fmt_last.audio.i_rate;
} }
}
/* FIXME: Hack for mp3 transcoding support */ /* FIXME: Hack for mp3 transcoding support */
if( id->p_encoder->fmt_out.i_codec == VLC_FOURCC( 'm','p','3',' ' ) ) if( id->p_encoder->fmt_out.i_codec == VLC_FOURCC( 'm','p','3',' ' ) )
...@@ -1132,10 +1066,12 @@ static void transcode_audio_close( sout_stream_t *p_stream, ...@@ -1132,10 +1066,12 @@ static void transcode_audio_close( sout_stream_t *p_stream,
/* Close decoder */ /* Close decoder */
if( id->p_decoder->p_module ) if( id->p_decoder->p_module )
module_Unneed( id->p_decoder, id->p_decoder->p_module ); module_Unneed( id->p_decoder, id->p_decoder->p_module );
id->p_decoder->p_module = 0;
/* Close encoder */ /* Close encoder */
if( id->p_encoder->p_module ) if( id->p_encoder->p_module )
module_Unneed( id->p_encoder, id->p_encoder->p_module ); module_Unneed( id->p_encoder, id->p_encoder->p_module );
id->p_encoder->p_module = 0;
/* Close filters */ /* Close filters */
for( i = 0; i < id->i_filter; i++ ) for( i = 0; i < id->i_filter; i++ )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment