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

Recognize supported media type for SDP from SAP, not only from files

(cherry picked from commit 58469fda)
parent 0fe3057f
...@@ -287,6 +287,22 @@ static inline int min_int( int a, int b ) ...@@ -287,6 +287,22 @@ static inline int min_int( int a, int b )
return a > b ? b : a; return a > b ? b : a;
} }
static bool IsWellKnownPayload (int type)
{
switch (type)
{ /* Should be in sync with modules/demux/rtp.c */
case 0: /* PCMU/8000 */
case 8: /* PCMA/8000 */
case 10: /* L16/44100/2 */
case 11: /* L16/44100 */
case 14: /* MPA/90000 */
case 32: /* MPV/90000 */
case 33: /* MP2/90000 */
return true;
}
return false;
}
/***************************************************************************** /*****************************************************************************
* Open: initialize and create stuff * Open: initialize and create stuff
*****************************************************************************/ *****************************************************************************/
...@@ -394,19 +410,8 @@ static int OpenDemux( vlc_object_t *p_this ) ...@@ -394,19 +410,8 @@ static int OpenDemux( vlc_object_t *p_this )
{ {
p_sdp->psz_uri = NULL; p_sdp->psz_uri = NULL;
} }
switch (p_sdp->i_media_type) if (!IsWellKnownPayload (p_sdp->i_media_type))
{ /* Should be in sync with modules/demux/rtp.c */ goto error;
case 0: /* PCMU/8000 */
case 8: /* PCMA/8000 */
case 10: /* L16/44100/2 */
case 11: /* L16/44100 */
case 14: /* MPA/90000 */
case 32: /* MPV/90000 */
case 33: /* MP2/90000 */
break;
default:
goto error;
}
if( p_sdp->psz_uri == NULL ) goto error; if( p_sdp->psz_uri == NULL ) goto error;
p_demux->p_sys = (demux_sys_t *)malloc( sizeof(demux_sys_t) ); p_demux->p_sys = (demux_sys_t *)malloc( sizeof(demux_sys_t) );
...@@ -780,10 +785,7 @@ static int ParseSAP( services_discovery_t *p_sd, const uint8_t *buf, ...@@ -780,10 +785,7 @@ static int ParseSAP( services_discovery_t *p_sd, const uint8_t *buf,
p_sdp->psz_uri = NULL; p_sdp->psz_uri = NULL;
/* Multi-media or no-parse -> pass to LIVE.COM */ /* Multi-media or no-parse -> pass to LIVE.COM */
if( ( p_sdp->i_media_type != 14 if( !IsWellKnownPayload( p_sdp->i_media_type ) || !p_sd->p_sys->b_parse )
&& p_sdp->i_media_type != 32
&& p_sdp->i_media_type != 33)
|| p_sd->p_sys->b_parse == false )
{ {
free( p_sdp->psz_uri ); free( p_sdp->psz_uri );
if (asprintf( &p_sdp->psz_uri, "sdp://%s", p_sdp->psz_sdp ) == -1) if (asprintf( &p_sdp->psz_uri, "sdp://%s", p_sdp->psz_sdp ) == -1)
......
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