Commit a5170e02 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Use a different FOURCC for Speex from RTP (refs #1291),

as it needs some specific processing in the decoder.
Patch from William Hawkins
parent 06ef387d
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
# include <winsock2.h> # include <winsock2.h>
#endif #endif
#include "UsageEnvironment.hh"
#include "BasicUsageEnvironment.hh" #include "BasicUsageEnvironment.hh"
#include "GroupsockHelper.hh" #include "GroupsockHelper.hh"
#include "liveMedia.hh" #include "liveMedia.hh"
...@@ -743,7 +744,14 @@ static int SessionsSetup( demux_t *p_demux ) ...@@ -743,7 +744,14 @@ static int SessionsSetup( demux_t *p_demux )
} }
else if( !strcmp( sub->codecName(), "SPEEX" ) ) 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" ) ) else if( !strcmp( sub->mediumName(), "video" ) )
......
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