Changeset a5170e027644203bf61fab22a34e69696d640709

Show
Ignore:
Timestamp:
09/22/07 16:54:42 (1 year ago)
Author:
Rémi Denis-Courmont <rem@videolan.org>
git-committer:
Rémi Denis-Courmont <rem@videolan.org> 1190472882 +0000
git-parent:

[06ef387db9f271a96d600e423633018fe5c2fcd7]

git-author:
Rémi Denis-Courmont <rem@videolan.org> 1190472882 +0000
Message:

Use a different FOURCC for Speex from RTP (refs #1291),
as it needs some specific processing in the decoder.
Patch from William Hawkins

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • modules/demux/live555.cpp

    r6ee1e19 ra5170e0  
    4040#endif 
    4141 
     42#include "UsageEnvironment.hh" 
    4243#include "BasicUsageEnvironment.hh" 
    4344#include "GroupsockHelper.hh" 
     
    744745                else if( !strcmp( sub->codecName(), "SPEEX" ) ) 
    745746                { 
    746                     tk->fmt.i_codec = VLC_FOURCC( 's', 'p', 'x', ' ' ); 
     747                    tk->fmt.i_codec = VLC_FOURCC( 's', 'p', 'x', 'r' ); 
     748            if ( sub->rtpTimestampFrequency() ) 
     749                tk->fmt.audio.i_rate = sub->rtpTimestampFrequency(); 
     750                    else 
     751            { 
     752                msg_Warn( p_demux,"Using 8kHz as default sample rate." ); 
     753            tk->fmt.audio.i_rate = 8000; 
     754            } 
    747755                } 
    748756            }