vlc/vlc-2.1 | branch: master | Ilkka Ollakka <[email protected]> | Sat Aug 17 16:44:37 2013 +0300| [3b772d9731114f0c19708a66e21a728fa2c6c436] | committer: Jean-Baptiste Kempf
transcode: simplify audio channel stuff a littlebit tested with ticket 9022 samples to 2 channel and without channel definition. Output files seemed to have correct channel amount in both cases. refs #9022 (cherry picked from commit 25a7ec6fc5af3f3973b38e1b0d2be0328bc96611) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=3b772d9731114f0c19708a66e21a728fa2c6c436 --- modules/stream_out/transcode/audio.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/modules/stream_out/transcode/audio.c b/modules/stream_out/transcode/audio.c index c36781c..6d5ccb3 100644 --- a/modules/stream_out/transcode/audio.c +++ b/modules/stream_out/transcode/audio.c @@ -118,8 +118,6 @@ int transcode_audio_new( sout_stream_t *p_stream, id->p_encoder->fmt_in.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_out.audio.i_original_channels; aout_FormatPrepare( &id->p_encoder->fmt_in.audio ); id->p_encoder->p_cfg = p_stream->p_sys->p_audio_cfg; @@ -275,17 +273,8 @@ bool transcode_audio_add( sout_stream_t *p_stream, es_format_t *p_fmt, id->p_decoder->fmt_in.audio.i_channels ); id->p_encoder->fmt_out.audio.i_original_channels = id->p_decoder->fmt_in.audio.i_physical_channels; - if( id->p_decoder->fmt_in.audio.i_channels == - id->p_encoder->fmt_out.audio.i_channels ) - { - id->p_encoder->fmt_out.audio.i_physical_channels = - id->p_decoder->fmt_in.audio.i_physical_channels; - } - else - { - id->p_encoder->fmt_out.audio.i_physical_channels = + id->p_encoder->fmt_out.audio.i_physical_channels = pi_channels_maps[id->p_encoder->fmt_out.audio.i_channels]; - } /* Build decoder -> filter -> encoder chain */ if( transcode_audio_new( p_stream, id ) ) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
