include/os_specific.h \
include/stream_control.h \
include/stream_output.h \
+ include/announce.h \
include/variables.h \
include/video.h \
include/video_output.h \
src/audio_output/output.c \
src/audio_output/intf.c \
src/stream_output/stream_output.c \
+ src/stream_output/announce.c \
src/misc/mtime.c \
src/misc/modules.c \
src/misc/threads.c \
-$Id: NEWS,v 1.42 2003/05/18 18:56:57 hartman Exp $
+$Id: NEWS,v 1.43 2003/05/20 16:20:33 zorglub Exp $
Changes between 0.5.3 and 0.6.0:
---------------------------------
Stream output:
* New stream output scheme. It is now possible to build a chain of stream outputs allowing for instance to stream and display some content at the same time.
* The stream output now allows to transcode content on the fly.
+ * SAP (Session Announcement Protocol) support.
Miscellaneous:
* New reset option for the preferences
--- /dev/null
+/*****************************************************************************
+ * announce.h : Session announcement
+ *****************************************************************************
+ * Copyright (C) 2002 VideoLAN
+ * $Id: announce.h,v 1.1 2003/05/20 16:20:33 zorglub Exp $
+ *
+ * Authors: Christophe Massiot <massiot@via.ecp.fr>
+ * Laurent Aimar <fenrir@via.ecp.fr>
+ * Eric Petit <titer@videolan.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ *****************************************************************************/
+
+/*****************************************************************************
+ * sap_session_t: SAP Session descriptor
+ *****************************************************************************/
+
+#if defined( UNDER_CE )
+# include <winsock.h>
+#elif defined( WIN32 )
+# include <winsock2.h>
+# include <ws2tcpip.h>
+# define close closesocket
+#else
+# include <netdb.h> /* hostent ... */
+# include <sys/socket.h>
+# include <netinet/in.h>
+# ifdef HAVE_ARPA_INET_H
+# include <arpa/inet.h> /* inet_ntoa(), inet_aton() */
+# endif
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+
+
+struct sap_session_t
+{
+ char psz_url[256];
+ char psz_name[1024];
+ module_t p_network;
+ unsigned int socket;
+ unsigned int sendnow;
+ struct sockaddr_in addr;
+};
+
+
+
+/*****************************************************************************
+ * Prototypes
+ *****************************************************************************/
+VLC_EXPORT( sap_session_t *, sout_SAPNew, ( sout_instance_t *,char * , char * ) );
+VLC_EXPORT( void, sout_SAPSend, ( sout_instance_t *,sap_session_t * ) );
+VLC_EXPORT( void, sout_SAPDelete, ( sap_session_t * ) );
* sout.h: video output header for vlc
*****************************************************************************
* Copyright (C) 2002 VideoLAN
- * $Id: sout.h,v 1.1 2002/08/12 22:12:50 massiot Exp $
+ * $Id: sout.h,v 1.2 2003/05/20 16:20:33 zorglub Exp $
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* Required internal headers
*****************************************************************************/
#include "stream_output.h"
-
+
# ifdef __cplusplus
}
# endif
* Collection of useful common types and macros definitions
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: vlc_common.h,v 1.63 2003/05/12 19:11:53 gbazin Exp $
+ * $Id: vlc_common.h,v 1.64 2003/05/20 16:20:33 zorglub Exp $
*
* Authors: Samuel Hocevar <sam@via.ecp.fr>
* Vincent Seguin <seguin@via.ecp.fr>
typedef struct sout_stream_t sout_stream_t;
typedef struct sout_cfg_t sout_cfg_t;
typedef struct sout_format_t sout_format_t;
+typedef struct sap_session_t sap_session_t;
/* Decoders */
typedef struct decoder_fifo_t decoder_fifo_t;
* standard.c
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
- * $Id: standard.c,v 1.1 2003/04/13 20:00:21 fenrir Exp $
+ * $Id: standard.c,v 1.2 2003/05/20 16:20:33 zorglub Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
*****************************************************************************/
#include <stdlib.h>
#include <string.h>
+#include <unistd.h>
#include <vlc/vlc.h>
#include <vlc/sout.h>
+#include <announce.h>
/*****************************************************************************
* Exported prototypes
struct sout_stream_sys_t
{
- sout_mux_t *p_mux;
+ sout_mux_t *p_mux;
+ sap_session_t *p_sap;
+ unsigned int b_sap;
};
/*****************************************************************************
{
sout_stream_t *p_stream = (sout_stream_t*)p_this;
sout_instance_t *p_sout = p_stream->p_sout;
- sout_stream_sys_t *p_sys;
+ sout_stream_sys_t *p_sys = malloc( sizeof( sout_stream_sys_t) );
char *psz_mux = sout_cfg_find_value( p_stream->p_cfg, "mux" );
char *psz_access = sout_cfg_find_value( p_stream->p_cfg, "access" );
char *psz_url = sout_cfg_find_value( p_stream->p_cfg, "url" );
- sout_access_out_t *p_access;
- sout_mux_t *p_mux;
+ sout_cfg_t *p_sap_cfg = sout_cfg_find( p_stream->p_cfg, "sap" );
- msg_Dbg( p_this, "creating `%s/%s://%s'",
- psz_access, psz_mux, psz_url );
+ char *psz_sap = NULL;
+ sap_session_t *p_sap = NULL;
+
+ sout_access_out_t *p_access;
+ sout_mux_t *p_mux;
+
+ p_sys->b_sap=0;
+ /* SAP is only valid for UDP or RTP streaming */
+ if(p_sap_cfg && (strstr(psz_access,"udp") || strstr( psz_access , "rtp" )))
+ {
+ msg_Info( p_this, "SAP Enabled");
+ p_sys->b_sap=1;
+ if(p_sap_cfg->psz_value)
+ {
+ psz_sap = strdup( p_sap_cfg->psz_value );
+ }
+ else
+ {
+ psz_sap = strdup ( psz_url );
+ }
+ }
+ msg_Dbg( p_this, "creating `%s/%s://%s'",
+ psz_access, psz_mux, psz_url );
+
/* *** find and open appropriate access module *** */
p_access = sout_AccessOutNew( p_sout, psz_access, psz_url );
if( p_access == NULL )
}
msg_Dbg( p_stream, "mux opened" );
+ /* *** Create the SAP Session structure *** */
+ if(p_sys->b_sap)
+ {
+ msg_Dbg( p_sout , "Creating SAP" );
+ p_sap = sout_SAPNew( p_sout , psz_url , psz_sap );
+ }
+
/* XXX beurk */
p_sout->i_preheader = __MAX( p_sout->i_preheader, p_mux->i_preheader );
- p_sys = malloc( sizeof( sout_stream_sys_t ) );
- p_sys->p_mux = p_mux;
+ p_sys->p_mux = p_mux;
+ p_sys->p_sap = p_sap;
+
p_stream->pf_add = Add;
p_stream->pf_del = Del;
p_stream->pf_send = Send;
p_stream->p_sys = p_sys;
-
return VLC_SUCCESS;
}
sout_access_out_t *p_access = p_sys->p_mux->p_access;
+ if(p_sys -> b_sap)
+ sout_SAPDelete( p_sys->p_sap );
sout_MuxDelete( p_sys->p_mux );
sout_AccessOutDelete( p_access );
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
+ sout_instance_t *p_sout = p_stream->p_sout;
+
+
sout_MuxSendBuffer( p_sys->p_mux, id->p_input, p_buffer );
+ if(p_sys -> b_sap)
+ sout_SAPSend( p_sout , p_sys->p_sap );
+
return VLC_SUCCESS;
}
* modules.c : Builtin and plugin modules management functions
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: modules.c,v 1.119 2003/05/05 16:09:36 gbazin Exp $
+ * $Id: modules.c,v 1.120 2003/05/20 16:20:33 zorglub Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Ethan C. Baldridge <BaldridgeE@cadmus.com>
#include "aout_internal.h"
#include "stream_output.h"
+#include "announce.h"
#include "iso_lang.h"
--- /dev/null
+/*****************************************************************************
+ * announce.c : Session announcement
+ *****************************************************************************
+ * Copyright (C) 2002 VideoLAN
+ *
+ * Authors: Christophe Massiot <massiot@via.ecp.fr>
+ * Laurent Aimar <fenrir@via.ecp.fr>
+ * Eric Petit <titer@videolan.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ *****************************************************************************/
+
+/*****************************************************************************
+ * Preamble
+ *****************************************************************************/
+#include <stdlib.h> /* free() */
+#include <stdio.h> /* sprintf() */
+#include <string.h> /* strerror() */
+
+#include <vlc/vlc.h>
+
+#include <vlc/sout.h>
+#undef DEBUG_BUFFER
+
+#include <announce.h>
+#include <network.h>
+
+#define SAP_ADDR "224.2.127.254"
+#define SAP_PORT 9875
+
+/*****************************************************************************
+ * sout_SAPNew: Creates a SAP Session
+ *****************************************************************************/
+sap_session_t * sout_SAPNew ( sout_instance_t *p_sout , char * psz_url_arg , char * psz_name_arg )
+{
+ sap_session_t *p_new;
+ module_t *p_network;
+ network_socket_t socket_desc;
+ char psz_network[12];
+ struct sockaddr_in addr;
+ int ttl=15;
+
+ p_new = (sap_session_t *)malloc( sizeof ( sap_session_t ) ) ;
+
+ sprintf ( p_new->psz_url , "%s" , psz_url_arg );
+ sprintf ( p_new->psz_name , "%s" , psz_name_arg );
+
+ msg_Dbg (p_sout , "Creating SAP Socket" );
+
+ socket_desc.i_type = NETWORK_UDP;
+ socket_desc.psz_bind_addr = SAP_ADDR;
+ socket_desc.i_bind_port = SAP_PORT;
+ socket_desc.psz_server_addr = "";
+ socket_desc.i_server_port = 0;
+ socket_desc.i_handle = 0;
+
+ sprintf ( psz_network,"ipv4" );
+
+ p_sout->p_private=(void*) &socket_desc;
+
+ if( !( p_network = module_Need( p_sout, "network", psz_network ) ) )
+ {
+ msg_Warn( p_sout, "failed to open a connection (udp)" );
+ }
+
+ module_Unneed( p_sout, p_network );
+
+ p_new->socket = socket_desc.i_handle;
+
+ memset( &addr , 0 , sizeof(addr) );
+ addr.sin_family = AF_INET;
+ addr.sin_addr.s_addr = inet_addr(SAP_ADDR);
+ addr.sin_port = htons( SAP_PORT );
+
+ setsockopt( p_new->socket, IPPROTO_IP, IP_MULTICAST_TTL, &ttl, sizeof(ttl) );
+
+ p_new->addr=(struct sockaddr_in)addr;
+
+ return(p_new);
+}
+
+/*****************************************************************************
+ * sout_SAPDelete: Deletes a SAP Session
+ *****************************************************************************/
+void sout_SAPDelete( sap_session_t * p_this )
+{
+ shutdown(p_this->socket,0);
+ free(p_this);
+}
+
+/*****************************************************************************
+ * sout_SAPSend: Sends a SAP packet
+ *****************************************************************************/
+void sout_SAPSend( sout_instance_t *p_sout, sap_session_t * p_this )
+{
+ char sap_msg[2048];
+ char *user="VideoLAN";
+ char *machine="VideoLAN";
+ char *site="VideoLAN";
+ int i_send_result;
+
+ if(p_this->sendnow == 24)
+ {
+ sprintf(sap_msg," ***øv=0 \n\
+ o=%s 3247692199 3247895918 IN IP4 %s \n\
+ s=%s\n\
+ u=%s \n\
+ t=3247691400 3250117800 \n\
+ a=type:test \n\
+ m=audio 1234 udp 14 \n\
+ c=IN IP4 %s/15 \n\
+ xxxxxxxxxxxxxxxxxxxxx \n ",user,machine,p_this->psz_name,site,p_this->psz_url);
+
+ i_send_result = sendto( p_this->socket , sap_msg , strlen(sap_msg) , 0 , (struct sockaddr *)&p_this->addr , sizeof(p_this->addr) );
+
+ if(i_send_result == -1)
+ {
+ msg_Warn(p_sout , "SAP Send failed on socket %i. " , p_this->socket );
+ perror("send");
+ }
+ p_this->sendnow=0;
+ }
+ p_this->sendnow++;
+}
projects / vlc / commitdiff