/* TODO: use SDP and get rid of this hack */
if (unlikely(sys->autodetect))
{ /* Autodetect payload type, _before_ rtp_queue() */
- if (rtp_autodetect (demux, sys->session, block))
- goto drop;
+ rtp_autodetect (demux, sys->session, block);
sys->autodetect = false;
}
#include <vlc_demux.h>
#include <vlc_network.h>
#include <vlc_plugin.h>
+#include <vlc_dialog.h>
#include "rtp.h"
#ifdef HAVE_SRTP
/* Not using SDP, we need to guess the payload format used */
/* see http://www.iana.org/assignments/rtp-parameters */
-int rtp_autodetect (demux_t *demux, rtp_session_t *session,
- const block_t *block)
+void rtp_autodetect (demux_t *demux, rtp_session_t *session,
+ const block_t *block)
{
uint8_t ptype = rtp_ptype (block);
rtp_pt_t pt = {
pt.frequency = 90000;
}
else
- msg_Err (demux, "invalid dynamic payload format `%s' "
+ msg_Err (demux, "unknown dynamic payload format `%s' "
"specified", dynamic);
free (dynamic);
}
- return -1;
+
+ msg_Err (demux, "unspecified payload format (type %"PRIu8")", ptype);
+ msg_Info (demux, "A valid SDP is needed to parse this RTP stream.");
+ dialog_Fatal (demux, N_("SDP required"),
+ N_("A description in SDP format is required to receive the RTP "
+ "stream. Note that rtp:// URIs cannot work with dynamic "
+ "RTP payload format (%"PRIu8")."), ptype);
+ return;
}
rtp_add_type (demux, session, &pt);
- return 0;
}
/*
uint32_t frequency; /* RTP clock rate (Hz) */
uint8_t number;
};
-int rtp_autodetect (demux_t *, rtp_session_t *, const block_t *);
+void rtp_autodetect (demux_t *, rtp_session_t *, const block_t *);
static inline uint8_t rtp_ptype (const block_t *block)
{