Commit de7eedf4 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

* Fix AMR from liveMedia decoding. Patch by Alex Antropoff <alant at transtelecom dot md>

parent 6ba683e6
...@@ -1272,7 +1272,16 @@ static void StreamRead( void *p_private, unsigned int i_size, ...@@ -1272,7 +1272,16 @@ static void StreamRead( void *p_private, unsigned int i_size,
msg_Warn( p_demux, "buffer overflow" ); msg_Warn( p_demux, "buffer overflow" );
} }
/* FIXME could i_size be > buffer size ? */ /* FIXME could i_size be > buffer size ? */
if( tk->fmt.i_codec == VLC_FOURCC('H','2','6','1') ) if( tk->fmt.i_codec == VLC_FOURCC('s','a','m','r') ||
tk->fmt.i_codec == VLC_FOURCC('s','a','w','b') )
{
AMRAudioSource *amrSource = (AMRAudioSource*)tk->readSource;
p_block = block_New( p_demux, i_size + 1 );
p_block->p_buffer[0] = amrSource->lastFrameHeader();
memcpy( p_block->p_buffer + 1, tk->p_buffer, i_size );
}
else if( tk->fmt.i_codec == VLC_FOURCC('H','2','6','1') )
{ {
#if LIVEMEDIA_LIBRARY_VERSION_INT >= 1081468800 #if LIVEMEDIA_LIBRARY_VERSION_INT >= 1081468800
H261VideoRTPSource *h261Source = (H261VideoRTPSource*)tk->rtpSource; H261VideoRTPSource *h261Source = (H261VideoRTPSource*)tk->rtpSource;
......
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