From a5170e027644203bf61fab22a34e69696d640709 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sat, 22 Sep 2007 14:54:42 +0000 Subject: [PATCH] Use a different FOURCC for Speex from RTP (refs #1291), as it needs some specific processing in the decoder. Patch from William Hawkins --- modules/demux/live555.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp index a603f12b96..2ff3fd944d 100644 --- a/modules/demux/live555.cpp +++ b/modules/demux/live555.cpp @@ -39,6 +39,7 @@ # include #endif +#include "UsageEnvironment.hh" #include "BasicUsageEnvironment.hh" #include "GroupsockHelper.hh" #include "liveMedia.hh" @@ -743,7 +744,14 @@ static int SessionsSetup( demux_t *p_demux ) } else if( !strcmp( sub->codecName(), "SPEEX" ) ) { - tk->fmt.i_codec = VLC_FOURCC( 's', 'p', 'x', ' ' ); + tk->fmt.i_codec = VLC_FOURCC( 's', 'p', 'x', 'r' ); + if ( sub->rtpTimestampFrequency() ) + tk->fmt.audio.i_rate = sub->rtpTimestampFrequency(); + else + { + msg_Warn( p_demux,"Using 8kHz as default sample rate." ); + tk->fmt.audio.i_rate = 8000; + } } } else if( !strcmp( sub->mediumName(), "video" ) ) -- 2.39.2