httpd_message_t *, httpd_message_t * );
-static rtsp_client_t *RtspClientNew( sout_stream_t *, char *psz_session );
-static rtsp_client_t *RtspClientGet( sout_stream_t *, char *psz_session );
+static rtsp_client_t *RtspClientNew( sout_stream_t *, const char *psz_session );
+static rtsp_client_t *RtspClientGet( sout_stream_t *, const char *psz_session );
static void RtspClientDel( sout_stream_t *, rtsp_client_t * );
/*****************************************************************************
if( val.i_int < 0 )
{
- msg_Err( p_stream, "illegal TTL %d", val.i_int );
- free( p_sys );
- return VLC_EGENERIC;
+ msg_Warn( p_stream, "illegal TTL %d, using 1", val.i_int );
+ val.i_int = -1;
}
p_sys->i_ttl = val.i_int;
if( *val.psz_string )
{
sout_access_out_t *p_grab;
- char *psz_rtpmap, url[NI_MAXHOST + 8], access[17], psz_ttl[5], ipv;
+ const char *psz_rtpmap;
+ char url[NI_MAXHOST + 8], access[17], psz_ttl[5], ipv;
if( b_rtsp )
{
p_grab->p_sout = p_sout;
p_grab->psz_access = strdup( "grab" );
p_grab->p_cfg = NULL;
- p_grab->psz_name = strdup( "" );
+ p_grab->psz_path = strdup( "" );
p_grab->p_sys = (sout_access_out_sys_t*)p_stream;
p_grab->pf_seek = NULL;
p_grab->pf_write = AccessOutGrabberWrite;
a= source-filter: we need our source address
a= x-plgroup: (missing)
RTP packets need to get the correct src IP address */
- if( net_AddressIsMulticast( (vlc_object_t *)p_stream, p_sys->psz_destination ) )
+ if( (ipv == 4)
+ && net_AddressIsMulticast( (vlc_object_t *)p_stream, p_sys->psz_destination ) )
{
snprintf( psz_ttl, sizeof( psz_ttl ), "/%d", p_sys->i_ttl );
psz_ttl[sizeof( psz_ttl ) - 1] = '\0';
}
if( b_rtsp )
{
- p += sprintf( p, "a=control:trackID=%d\r\n", i );
+ p += sprintf( p, "a=control:/trackID=%d\r\n", i );
}
}
if( p_sys->p_mux )
s[2*i_data] = '\0';
}
-static const char basis_64[] =
- "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-int ap_base64encode_len(int len)
-{
- return ((len + 2) / 3 * 4) + 1;
-}
-
-int ap_base64encode_binary(char *encoded,
- const unsigned char *string, int len)
-{
- int i;
- char *p;
-
- p = encoded;
- for (i = 0; i < len - 2; i += 3) {
- *p++ = basis_64[(string[i] >> 2) & 0x3F];
- *p++ = basis_64[((string[i] & 0x3) << 4) |
- ((int) (string[i + 1] & 0xF0) >> 4)];
- *p++ = basis_64[((string[i + 1] & 0xF) << 2) |
- ((int) (string[i + 2] & 0xC0) >> 6)];
- *p++ = basis_64[string[i + 2] & 0x3F];
- }
- if (i < len) {
- *p++ = basis_64[(string[i] >> 2) & 0x3F];
- if (i == (len - 1)) {
- *p++ = basis_64[((string[i] & 0x3) << 4)];
- *p++ = '=';
- }
- else {
- *p++ = basis_64[((string[i] & 0x3) << 4) |
- ((int) (string[i + 1] & 0xF0) >> 4)];
- *p++ = basis_64[((string[i + 1] & 0xF) << 2)];
- }
- *p++ = '=';
- }
-
- *p++ = '\0';
- return p - encoded;
-}
-
-int ap_base64encode(char *encoded, const char *string, int len)
-{
- return ap_base64encode_binary(encoded, (const unsigned char *) string, len);
-}
-
-char *b64_encode(char *buf, int len)
-{
- int elen;
- char *out;
-
- if(len == 0)
- len = strlen(buf);
-
- elen = ap_base64encode_len(len);
- out = (char *) malloc(sizeof(char) * (elen + 1));
-
- ap_base64encode(out, buf, len);
-
- return out;
-}
-
static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
{
sout_instance_t *p_sout = p_stream->p_sout;
id->i_clock_rate = 90000;
id->psz_rtpmap = strdup( "H264/90000" );
id->pf_packetize = rtp_packetize_h264;
+ id->psz_fmtp = NULL;
+
if( p_fmt->i_extra > 0 )
{
uint8_t *p_buffer = p_fmt->p_extra;
int i_buffer = p_fmt->i_extra;
char *p_64_sps = NULL;
char *p_64_pps = NULL;
- char hexa[6];
-
+ char hexa[6+1];
+
while( i_buffer > 4 &&
- p_buffer[0] == 0 && p_buffer[1] == 0 &&
- p_buffer[2] == 0 && p_buffer[3] == 1 )
+ p_buffer[0] == 0 && p_buffer[1] == 0 &&
+ p_buffer[2] == 0 && p_buffer[3] == 1 )
{
const int i_nal_type = p_buffer[4]&0x1f;
- int i_offset = 1;
+ int i_offset;
int i_size = 0;
- int i_startcode = 0;
- int i_encoded = 0;
-
+
msg_Dbg( p_stream, "we found a startcode for NAL with TYPE:%d", i_nal_type );
-
- for( i_offset = 1; i_offset+3 < i_buffer ; i_offset++)
+
+ i_size = i_buffer;
+ for( i_offset = 4; i_offset+3 < i_buffer ; i_offset++)
{
if( p_buffer[i_offset] == 0 && p_buffer[i_offset+1] == 0 && p_buffer[i_offset+2] == 0 && p_buffer[i_offset+3] == 1 )
{
/* we found another startcode */
- i_startcode = i_offset;
+ i_size = i_offset;
break;
}
}
- i_size = i_startcode ? i_startcode : i_buffer;
if( i_nal_type == 7 )
{
- p_64_sps = (char *)malloc( ap_base64encode_len( i_size - 4) );
- i_encoded = ap_base64encode_binary( p_64_sps, &p_buffer[4], i_size - 4 );
- p_64_sps[i_encoded] = '\0';
+ p_64_sps = vlc_b64_encode_binary( &p_buffer[4], i_size - 4 );
sprintf_hexa( hexa, &p_buffer[5], 3 );
- hexa[6] = '\0';
}
- if( i_nal_type == 8 )
+ else if( i_nal_type == 8 )
{
- p_64_pps = (char *)malloc( ap_base64encode_len( i_size - 4) );
- i_encoded = ap_base64encode_binary( p_64_pps, &p_buffer[4], i_size - 4 );
- p_64_pps[i_encoded] = '\0';
+ p_64_pps = vlc_b64_encode_binary( &p_buffer[4], i_size - 4 );
}
i_buffer -= i_size;
p_buffer += i_size;
}
- /* FIXME: All this is a bit unsafe */
- asprintf( &id->psz_fmtp, "packetization-mode=1;profile-level-id=%s;sprop-parameter-sets=%s,%s;", hexa, p_64_sps, p_64_pps );
- free( p_64_sps );
- free( p_64_pps );
+ /* */
+ if( p_64_sps && p_64_pps )
+ asprintf( &id->psz_fmtp, "packetization-mode=1;profile-level-id=%s;sprop-parameter-sets=%s,%s;", hexa, p_64_sps, p_64_pps );
+ if( p_64_sps )
+ free( p_64_sps );
+ if( p_64_pps )
+ free( p_64_pps );
}
- else
+ if( !id->psz_fmtp )
id->psz_fmtp = strdup( "packetization-mode=1" );
-if( p_fmt->i_extra > 0 )
-msg_Dbg( p_stream, "WE HAVE %d bytes extra data", p_fmt->i_extra );
break;
case VLC_FOURCC( 'm', 'p', '4', 'v' ):
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
sout_instance_t *p_sout = p_stream->p_sout;
- announce_method_t *p_method = sout_AnnounceMethodCreate( METHOD_TYPE_SAP );
+ announce_method_t *p_method = sout_SAPMethod();
/* Remove the previous session */
if( p_sys->p_session != NULL)
if( ( p_sys->i_es > 0 || p_sys->p_mux ) && p_sys->psz_sdp && *p_sys->psz_sdp )
{
- p_sys->p_session = sout_AnnounceRegisterSDP( p_sout, p_sys->psz_sdp,
+ p_sys->p_session = sout_AnnounceRegisterSDP( p_sout, SOUT_CFG_PREFIX,
+ p_sys->psz_sdp,
p_sys->psz_destination,
p_method );
}
- free( p_method );
+ sout_MethodRelease( p_method );
return VLC_SUCCESS;
}
/****************************************************************************
* RTSP:
****************************************************************************/
-static rtsp_client_t *RtspClientNew( sout_stream_t *p_stream, char *psz_session )
+static rtsp_client_t *RtspClientNew( sout_stream_t *p_stream, const char *psz_session )
{
rtsp_client_t *rtsp = malloc( sizeof( rtsp_client_t ));
- rtsp->psz_session = psz_session;
+ rtsp->psz_session = strdup( psz_session );
rtsp->i_last = 0;
rtsp->b_playing = VLC_FALSE;
rtsp->i_id = 0;
return rtsp;
}
-static rtsp_client_t *RtspClientGet( sout_stream_t *p_stream, char *psz_session )
+static rtsp_client_t *RtspClientGet( sout_stream_t *p_stream, const char *psz_session )
{
int i;
sout_stream_t *p_stream = (sout_stream_t*)p_args;
sout_stream_sys_t *p_sys = p_stream->p_sys;
char *psz_destination = p_sys->psz_destination;
- char *psz_session = NULL;
- char *psz_cseq = NULL;
+ const char *psz_session = NULL;
+ const char *psz_cseq = NULL;
int i_cseq = 0;
if( answer == NULL || query == NULL )
answer->i_status = 200;
answer->psz_status = strdup( "OK" );
httpd_MsgAdd( answer, "Content-type", "%s", "application/sdp" );
- httpd_MsgAdd( answer, "Content-Base", "%s/", p_sys->psz_rtsp_control );
+ httpd_MsgAdd( answer, "Content-Base", "%s", p_sys->psz_rtsp_control );
answer->p_body = (uint8_t *)psz_sdp;
answer->i_body = strlen( psz_sdp );
break;
httpd_MsgAdd( answer, "Cache-Control", "%s", "no-cache" );
if( psz_session )
- {
httpd_MsgAdd( answer, "Session", "%s;timeout=5", psz_session );
- }
return VLC_SUCCESS;
}
sout_stream_id_t *id = (sout_stream_id_t*)p_args;
sout_stream_t *p_stream = id->p_stream;
sout_stream_sys_t *p_sys = p_stream->p_sys;
- char *psz_session = NULL;
- char *psz_cseq = NULL;
+ char psz_session_init[100];
+ const char *psz_session = NULL;
+ const char *psz_cseq = NULL;
int i_cseq = 0;
if( answer == NULL || query == NULL )
- {
return VLC_SUCCESS;
- }
//fprintf( stderr, "RtspCallback query: type=%d\n", query->i_type );
+ /* */
+ snprintf( psz_session_init, sizeof(psz_session_init), "%d", rand() );
+
+ /* */
answer->i_proto = HTTPD_PROTO_RTSP;
answer->i_version= query->i_version;
answer->i_type = HTTPD_MSG_ANSWER;
{
case HTTPD_MSG_SETUP:
{
- char *psz_transport = httpd_MsgGet( query, "Transport" );
+ const char *psz_transport = httpd_MsgGet( query, "Transport" );
//fprintf( stderr, "HTTPD_MSG_SETUP: transport=%s\n", psz_transport );
answer->psz_status = strdup( "OK" );
answer->i_body = 0;
answer->p_body = NULL;
+
psz_session = httpd_MsgGet( query, "Session" );
if( !psz_session )
- {
- psz_session = malloc( 100 );
- sprintf( psz_session, "%d", rand() );
- }
+ psz_session = psz_session_init;
+
httpd_MsgAdd( answer, "Transport",
"RTP/AVP/UDP;destination=%s;port=%d-%d;ttl=%d",
id->psz_destination, id->i_port,id->i_port+1,
psz_session = httpd_MsgGet( query, "Session" );
if( !psz_session )
{
- psz_session = malloc( 100 );
- sprintf( psz_session, "%d", rand() );
-
- rtsp = RtspClientNew( p_stream, psz_session );
+ psz_session = psz_session_init;
+ rtsp = RtspClientNew( p_stream, psz_session_init );
}
else
{
httpd_MsgAdd( answer, "Cache-Control", "%s", "no-cache" );
if( psz_session )
- {
httpd_MsgAdd( answer, "Session", "%s"/*;timeout=5*/, psz_session );
- }
return VLC_SUCCESS;
}
}
/* rfc3984 */
-static int rtp_packetize_h264( sout_stream_t *p_stream, sout_stream_id_t *id,
- block_t *in )
+static int rtp_packetize_h264_nal( sout_stream_t *p_stream, sout_stream_id_t *id,
+ const uint8_t *p_data, int i_data, int64_t i_pts, int64_t i_dts, vlc_bool_t b_last, int64_t i_length )
{
- int i_max = id->i_mtu - 12; /* payload max in one packet */
- int i_count = ( in->i_buffer + i_max - 1 ) / i_max;
- uint8_t *p_data = in->p_buffer;
- int i_data = in->i_buffer;
- block_t *out;
- int i_nal_type;
- int i_payload;
-
- while( i_data > 5 &&
- ( p_data[0] != 0x00 || p_data[1] != 0x00 || p_data[2] != 0x01 || /* startcode */
- (p_data[3]&0x1f) < 1 || (p_data[3]&0x1f) > 23 ) ) /* naltype should be between 1 and 23 */
- {
- p_data++;
- i_data--;
- }
+ const int i_max = id->i_mtu - 12; /* payload max in one packet */
+ int i_nal_hdr;
+ int i_nal_type;
if( i_data < 5 )
return VLC_SUCCESS;
- p_data+=3;
- i_data-=3;
- i_nal_type = p_data[0]&0x1f;
-
- /* Skip global headers */
+ i_nal_hdr = p_data[3];
+ i_nal_type = i_nal_hdr&0x1f;
if( i_nal_type == 7 || i_nal_type == 8 )
- return VLC_SUCCESS;
-
- if( i_data <= i_max ) /* The whole pack will fit in one rtp payload */
{
- /* single NAL */
- i_payload = __MIN( i_max, i_data );
- out = block_New( p_stream, 12 + i_payload );
+ /* XXX Why do you want to remove them ? It will break streaming with
+ * SPS/PPS change (broadcast) ? */
+ return VLC_SUCCESS;
+ }
- /* rtp common header */
- rtp_packetize_common( id, out, 1,
- in->i_pts > 0 ? in->i_pts : in->i_dts );
+ /* Skip start code */
+ p_data += 3;
+ i_data -= 3;
- memcpy( &out->p_buffer[12], p_data, i_payload );
+ /* */
+ if( i_data <= i_max )
+ {
+ /* Single NAL unit packet */
+ block_t *out = block_New( p_stream, 12 + i_data );
+ out->i_dts = i_dts;
+ out->i_length = i_length;
- out->i_buffer = 12 + i_payload;
- out->i_dts = in->i_dts;
- out->i_length = in->i_length;
+ /* */
+ rtp_packetize_common( id, out, b_last, i_pts );
+ out->i_buffer = 12 + i_data;
- rtp_packetize_send( id, out );
+ memcpy( &out->p_buffer[12], p_data, i_data );
- /*msg_Dbg( p_stream, "nal-out plain %d %02x", i_payload, out->p_buffer[16] );*/
+ rtp_packetize_send( id, out );
}
else
{
- /* FU-A */
- uint8_t nalh; /* The nalheader byte */
- int i=0, start=1, end=0, first=0;
-
- nalh = *p_data;
+ /* FU-A Fragmentation Unit without interleaving */
+ const int i_count = ( i_data-1 + i_max-2 - 1 ) / (i_max-2);
+ int i;
+
p_data++;
i_data--;
- i_max = id->i_mtu - 14;
- i_count = ( i_data + i_max - 1 ) / i_max;
-
- /*msg_Dbg( p_stream, "nal-out fragmented %02x %d", nalh, i_rest);*/
-
- while( end == 0 )
+ for( i = 0; i < i_count; i++ )
{
- i_payload = __MIN( i_max, i_data );
- out = block_New( p_stream, 14 + i_payload );
-
- if( i_data == i_payload )
- end = 1;
+ const int i_payload = __MIN( i_data, i_max-2 );
+ block_t *out = block_New( p_stream, 12 + 2 + i_payload );
+ out->i_dts = i_dts + i * i_length / i_count;
+ out->i_length = i_length / i_count;
- /* rtp common header */
- rtp_packetize_common( id, out, (end)?1:0,
- in->i_pts > 0 ? in->i_pts : in->i_dts );
+ /* */
+ rtp_packetize_common( id, out, (b_last && i_payload == i_data), i_pts );
+ out->i_buffer = 14 + i_payload;
/* FU indicator */
- out->p_buffer[12] = (nalh&0x60)|28;
+ out->p_buffer[12] = 0x00 | (i_nal_hdr & 0x60) | 28;
/* FU header */
- out->p_buffer[13] = (start<<7)|(end<<6)|(nalh&0x1f);
+ out->p_buffer[13] = ( i == 0 ? 0x80 : 0x00 ) | ( (i == i_count-1) ? 0x40 : 0x00 ) | i_nal_type;
+ memcpy( &out->p_buffer[14], p_data, i_payload );
- memcpy( &out->p_buffer[14], p_data+first, i_payload );
-
- out->i_buffer = 14 + i_payload;
+ rtp_packetize_send( id, out );
- // not sure what of these should be used and what it does :)
- out->i_pts = in->i_pts;
- out->i_dts = in->i_dts;
- //out->i_dts = in->i_dts + i * in->i_length / i_count;
- //out->i_length = in->i_length / i_count;
+ i_data -= i_payload;
+ p_data += i_payload;
+ }
+ }
+ return VLC_SUCCESS;
+}
- rtp_packetize_send( id, out );
+static int rtp_packetize_h264( sout_stream_t *p_stream, sout_stream_id_t *id,
+ block_t *in )
+{
+ const uint8_t *p_buffer = in->p_buffer;
+ int i_buffer = in->i_buffer;
- /*msg_Dbg( p_stream, "nal-out fragmented: frag %d %d %02x %02x %d", start,end,
- out->p_buffer[12], out->p_buffer[13], i_payload );*/
+ while( i_buffer > 4 && ( p_buffer[0] != 0 || p_buffer[1] != 0 || p_buffer[2] != 1 ) )
+ {
+ i_buffer--;
+ p_buffer++;
+ }
- i_data -= i_payload;
- first += i_payload;
- i++;
- start=0;
+ /* Split nal units */
+ while( i_buffer > 4 )
+ {
+ int i_offset;
+ int i_size = i_buffer;
+ int i_skip = i_buffer;
+
+ /* search nal end */
+ for( i_offset = 4; i_offset+2 < i_buffer ; i_offset++)
+ {
+ if( p_buffer[i_offset] == 0 && p_buffer[i_offset+1] == 0 && p_buffer[i_offset+2] == 1 )
+ {
+ /* we found another startcode */
+ i_size = i_offset - ( p_buffer[i_offset-1] == 0 ? 1 : 0);
+ i_skip = i_offset;
+ break;
+ }
}
+ /* TODO add STAP-A to remove a lot of overhead with small slice/sei/... */
+ rtp_packetize_h264_nal( p_stream, id, p_buffer, i_size,
+ (in->i_pts > 0 ? in->i_pts : in->i_dts), in->i_dts,
+ (i_size >= i_buffer), in->i_length * i_size / in->i_buffer );
+
+ i_buffer -= i_skip;
+ p_buffer += i_skip;
}
return VLC_SUCCESS;
}
projects / vlc / blobdiff