* 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include <vlc_interaction.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
-#include "network.h"
+#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_access.h>
+#include <vlc_dialog.h>
+
+#include <vlc_network.h>
#include "rtsp.h"
#include "real.h"
static int Open ( vlc_object_t * );
static void Close( vlc_object_t * );
-#define CACHING_TEXT N_("Caching value (ms)")
-#define CACHING_LONGTEXT N_( \
- "Caching value for RTSP streams. This " \
- "value should be set in milliseconds." )
-
-vlc_module_begin();
- set_description( _("Real RTSP") );
- set_shortname( _("Real RTSP") );
- set_category( CAT_INPUT );
- set_subcategory( SUBCAT_INPUT_ACCESS );
- add_integer( "realrtsp-caching", 3000, NULL,
- CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
- set_capability( "access2", 10 );
- set_callbacks( Open, Close );
- add_shortcut( "realrtsp" );
- add_shortcut( "rtsp" );
- add_shortcut( "pnm" );
-vlc_module_end();
+vlc_module_begin ()
+ set_description( N_("Real RTSP") )
+ set_shortname( N_("Real RTSP") )
+ set_category( CAT_INPUT )
+ set_subcategory( SUBCAT_INPUT_ACCESS )
+ set_capability( "access", 10 )
+ set_callbacks( Open, Close )
+ add_shortcut( "realrtsp", "rtsp", "pnm" )
+vlc_module_end ()
/*****************************************************************************
* Exported prototypes
*****************************************************************************/
static block_t *BlockRead( access_t * );
-static int Seek( access_t *, int64_t );
+static int Seek( access_t *, uint64_t );
static int Control( access_t *, int, va_list );
struct access_sys_t
{
- vlc_bool_t b_seekable;
- vlc_bool_t b_pace_control;
-
rtsp_client_t *p_rtsp;
int fd;
if( p_sys->fd < 0 )
{
msg_Err( p_access, "cannot connect to %s:%d", psz_server, i_port );
- intf_UserFatal( p_access, VLC_FALSE, _("Connection failed"),
+ dialog_Fatal( p_access, _("Connection failed"),
_("VLC could not connect to \"%s:%d\"."), psz_server, i_port );
return VLC_EGENERIC;
}
access_t *p_access = (access_t *)p_userdata;
access_sys_t *p_sys = p_access->p_sys;
- return net_Read( p_access, p_sys->fd, 0, p_buffer, i_buffer, VLC_TRUE );
+ return net_Read( p_access, p_sys->fd, 0, p_buffer, i_buffer, true );
}
static int RtspReadLine( void *p_userdata, uint8_t *p_buffer, int i_buffer )
access_t *p_access = (access_t *)p_userdata;
access_sys_t *p_sys = p_access->p_sys;
- char *psz = net_Gets( VLC_OBJECT(p_access), p_sys->fd, 0 );
+ char *psz = net_Gets( p_access, p_sys->fd, 0 );
//fprintf(stderr, "ReadLine: %s\n", psz);
if( psz ) strncpy( (char *)p_buffer, psz, i_buffer );
else *p_buffer = 0;
- if( psz ) free( psz );
+ free( psz );
return 0;
}
static int RtspWrite( void *p_userdata, uint8_t *p_buffer, int i_buffer )
{
+ VLC_UNUSED(i_buffer);
access_t *p_access = (access_t *)p_userdata;
access_sys_t *p_sys = p_access->p_sys;
//fprintf(stderr, "Write: %s", p_buffer);
- net_Printf( VLC_OBJECT(p_access), p_sys->fd, 0, "%s", p_buffer );
+ net_Printf( p_access, p_sys->fd, 0, "%s", p_buffer );
return 0;
}
{
access_t *p_access = (access_t *)p_this;
access_sys_t *p_sys;
- char *psz_server = 0;
+ char* psz_server = NULL;
int i_result;
- if( !p_access->b_force ) return VLC_EGENERIC;
+ if( !p_access->psz_access || (
+ strncmp( p_access->psz_access, "rtsp", 4 ) &&
+ strncmp( p_access->psz_access, "pnm", 3 ) &&
+ strncmp( p_access->psz_access, "realrtsp", 8 ) ))
+ {
+ return VLC_EGENERIC;
+ }
p_access->pf_read = NULL;
p_access->pf_block = BlockRead;
p_access->pf_seek = Seek;
p_access->pf_control = Control;
- p_access->info.i_update = 0;
- p_access->info.i_size = 0;
p_access->info.i_pos = 0;
- p_access->info.b_eof = VLC_FALSE;
- p_access->info.i_title = 0;
- p_access->info.i_seekpoint = 0;
+ p_access->info.b_eof = false;
p_access->p_sys = p_sys = malloc( sizeof( access_sys_t ) );
+ if( !p_sys )
+ return VLC_ENOMEM;
p_sys->p_rtsp = malloc( sizeof( rtsp_client_t) );
+ if( !p_sys->p_rtsp )
+ {
+ free( p_sys );
+ return VLC_ENOMEM;
+ }
- p_sys->p_header = 0;
+ p_sys->p_header = NULL;
p_sys->p_rtsp->p_userdata = p_access;
p_sys->p_rtsp->pf_connect = RtspConnect;
p_sys->p_rtsp->pf_disconnect = RtspDisconnect;
p_sys->p_rtsp->pf_read_line = RtspReadLine;
p_sys->p_rtsp->pf_write = RtspWrite;
- i_result = rtsp_connect( p_sys->p_rtsp, p_access->psz_path, 0 );
+ i_result = rtsp_connect( p_sys->p_rtsp, p_access->psz_location, 0 );
if( i_result )
{
- msg_Dbg( p_access, "could not connect to: %s", p_access->psz_path );
+ msg_Dbg( p_access, "could not connect to: %s", p_access->psz_location );
free( p_sys->p_rtsp );
- p_sys->p_rtsp = 0;
+ p_sys->p_rtsp = NULL;
goto error;
}
msg_Err( p_access, "rtsp session can not be established" );
- intf_UserFatal( p_access, VLC_FALSE, _("Session failed"),
+ dialog_Fatal( p_access, _("Session failed"), "%s",
_("The requested RTSP session could not be established.") );
goto error;
}
- p_sys->p_header = block_New( p_access, 4096 );
+ p_sys->p_header = block_Alloc( 4096 );
p_sys->p_header->i_buffer =
- rmff_dump_header( h, p_sys->p_header->p_buffer, 1024 );
+ rmff_dump_header( h, (char *)p_sys->p_header->p_buffer, 1024 );
rmff_free_header( h );
}
else
{
- msg_Dbg( p_access, "only real/helix rtsp servers supported for now" );
+ msg_Warn( p_access, "only real/helix rtsp servers supported for now" );
goto error;
}
- /* Update default_pts to a suitable value for file access */
- var_Create( p_access, "realrtsp-caching",
- VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
-
- if( psz_server ) free( psz_server );
+ free( psz_server );
return VLC_SUCCESS;
error:
- if( psz_server ) free( psz_server );
+ free( psz_server );
Close( p_this );
return VLC_EGENERIC;
}
access_sys_t *p_sys = p_access->p_sys;
if( p_sys->p_rtsp ) rtsp_close( p_sys->p_rtsp );
- if( p_sys->p_rtsp ) free( p_sys->p_rtsp );
+ free( p_sys->p_rtsp );
free( p_sys );
}
if( p_sys->p_header )
{
p_block = p_sys->p_header;
- p_sys->p_header = 0;
+ p_sys->p_header = NULL;
return p_block;
}
i_size = real_get_rdt_chunk_header( p_access->p_sys->p_rtsp, &pheader );
- if( i_size <= 0 ) return 0;
+ if( i_size <= 0 ) return NULL;
- p_block = block_New( p_access, i_size );
+ p_block = block_Alloc( i_size );
p_block->i_buffer = real_get_rdt_chunk( p_access->p_sys->p_rtsp, &pheader,
&p_block->p_buffer );
/*****************************************************************************
* Seek: seek to a specific location in a file
*****************************************************************************/
-static int Seek( access_t *p_access, int64_t i_pos )
+static int Seek( access_t *p_access, uint64_t i_pos )
{
+ VLC_UNUSED(p_access);
+ VLC_UNUSED(i_pos);
return VLC_SUCCESS;
}
*****************************************************************************/
static int Control( access_t *p_access, int i_query, va_list args )
{
- vlc_bool_t *pb_bool;
- int *pi_int;
- int64_t *pi_64;
-
switch( i_query )
{
- /* */
case ACCESS_CAN_SEEK:
case ACCESS_CAN_FASTSEEK:
- pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* );
- *pb_bool = VLC_FALSE;//p_sys->b_seekable;
- break;
-
case ACCESS_CAN_PAUSE:
- pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* );
- *pb_bool = VLC_FALSE;
+ *va_arg( args, bool* ) = false;
break;
case ACCESS_CAN_CONTROL_PACE:
- pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* );
- *pb_bool = VLC_TRUE;//p_sys->b_pace_control;
- break;
-
- /* */
- case ACCESS_GET_MTU:
- pi_int = (int*)va_arg( args, int * );
- *pi_int = 0;
+ *va_arg( args, bool* ) = true;
break;
case ACCESS_GET_PTS_DELAY:
- pi_64 = (int64_t*)va_arg( args, int64_t * );
- *pi_64 = var_GetInteger( p_access, "realrtsp-caching" ) * 1000;
+ *va_arg( args, int64_t * ) = INT64_C(1000)
+ * var_InheritInteger(p_access, "network-caching");
break;
- /* */
case ACCESS_SET_PAUSE_STATE:
/* Nothing to do */
break;
- case ACCESS_GET_TITLE_INFO:
- case ACCESS_SET_TITLE:
- case ACCESS_SET_SEEKPOINT:
- case ACCESS_SET_PRIVATE_ID_STATE:
- case ACCESS_GET_META:
- return VLC_EGENERIC;
-
default:
- msg_Warn( p_access, "unimplemented query in control" );
return VLC_EGENERIC;
}
projects / vlc / blobdiff