[vlc-devel] commit: Revert " Special case for fourcc samr and sawb in transcode_audio_new()" ( Antoine Cellerier )

[Jean-Paul Saman]

git version control wrote:
> vlc | branch: master | Antoine Cellerier <dionoea at videolan.org> | Sun Jun 22 18:51:56 2008 +0200| [b4a4b564cda53b03aebf818dd2db65709602c68b]
> 
> Revert "Special case for fourcc samr and sawb in transcode_audio_new()"
> That commit broke audio sample rate changing.
> 
> This reverts commit ddac67aaf2bde4179f695bb26033488e8e7c35cc.

Transcoding samr doesn't seem to work anymore. Could you look into this 
please. Here is a test case:

LD_LIBRARY_PATH=extras/contrib/lib ./vlc --reset-plugins-cache 
--reset-config ~/src/videolan/streams/Madagascar_HD.ts --sout 
'#transcode{venc=avcodec{keyint=20,strict-rc=1,trellis=0,noise-reduction=200,hq=bits,pre-me=1,qmin=5,qmax=25},threads=1,high-priority=1,vcodec=H263,fps=10.0,width=176,maxwidth=176,height=144,maxheight=144,vfilter=canvas{width=176,height=144,aspect="4:3"},vb=40,scale=1.0,acodec=samr,ab=7400,samplerate=8000,channels=1,afilter=mono}:rtp{sdp=rtsp://localhost:5554/my.sdp}' 
--sout-ffmpeg-hurry-up --ffmpeg-hurry-up --rt-priority -vvv

>> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b4a4b564cda53b03aebf818dd2db65709602c68b
> ---
> 
>  modules/stream_out/transcode.c |    6 +-----
>  1 files changed, 1 insertions(+), 5 deletions(-)
> 
> diff --git a/modules/stream_out/transcode.c b/modules/stream_out/transcode.c
> index 4a345ae..67b41da 100644
> --- a/modules/stream_out/transcode.c
> +++ b/modules/stream_out/transcode.c
> @@ -1152,11 +1152,7 @@ static int transcode_audio_new( sout_stream_t *p_stream,
>                      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 = 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 =
> 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> http://mailman.videolan.org/listinfo/vlc-devel
>