Commit 7f9f6100 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Remove RTMP access module

parent 269bc558
......@@ -63,6 +63,7 @@ Removed modules:
* portaudio audio output
* X11 On Screen Display notifications (xosd)
* Linux Framebuffer On Screen Display interface (fbosd)
* RTMP access: use libavformat avio instead
Changes between 2.0.0 and 2.0.1:
......
......@@ -27,7 +27,6 @@ $Id$
* access_output_udp: UDP Network access_output module
* access_rar: RAR access
* access_realrtsp: Real RTSP access
* access_rtmp: RTMP network access
* access_sftp: SFTP network access module
* access_shm: Shared memory framebuffer access module
* access_smb: SMB shares access module
......
......@@ -99,16 +99,6 @@ libvlc_LTLIBRARIES += \
$(NULL)
endif
libaccess_rtmp_plugin_la_SOURCES = \
rtmp/access.c \
rtmp/rtmp_amf_flv.c \
rtmp/rtmp_amf_flv.h \
$(NULL)
libaccess_rtmp_plugin_la_CFLAGS = $(AM_CFLAGS) \
-fno-strict-aliasing
libaccess_rtmp_plugin_la_LIBADD = $(AM_LIBADD)
libaccess_rtmp_plugin_la_DEPENDENCIES =
libvlc_LTLIBRARIES += \
libfilesystem_plugin.la \
libidummy_plugin.la \
......
/*****************************************************************************
* access.c: RTMP input.
*****************************************************************************
* Copyright (C) URJC - LADyR - Luis Lopez Fernandez
*
* Author: Miguel Angel Cabrera Moya
*
* 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_access.h>
#include <vlc_network.h> /* DOWN: #include <network.h> */
#include <vlc_url.h>
#include <vlc_block.h>
#include "rtmp_amf_flv.h"
/*****************************************************************************
* Module descriptor
*****************************************************************************/
#define SWFURL_TEXT N_("Default SWF Referrer URL")
#define SWFURL_LONGTEXT N_("The SFW URL to use as referrer when connecting to "\
"the server. This is the SWF file that contained " \
"the stream.")
#define PAGEURL_TEXT N_("Default Page Referrer URL")
#define PAGEURL_LONGTEXT N_("The Page URL to use as referrer when connecting to " \
"the server. This is the page housing the SWF " \
"file.")
static int Open ( vlc_object_t * );
static void Close( vlc_object_t * );
vlc_module_begin ()
set_description( N_("RTMP input") )
set_shortname( N_("RTMP") )
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_ACCESS )
add_string( "rtmp-swfurl", "file:///player.swf", SWFURL_TEXT,
SWFURL_LONGTEXT, true )
add_string( "rtmp-pageurl", "file:///player.htm", PAGEURL_TEXT,
PAGEURL_LONGTEXT, true )
set_capability( "access", 0 )
set_callbacks( Open, Close )
add_shortcut( "rtmp" )
vlc_module_end ()
/*****************************************************************************
* Local prototypes
*****************************************************************************/
static ssize_t Read( access_t *, uint8_t *, size_t );
static int Seek( access_t *, uint64_t );
static int Control( access_t *, int, va_list );
static void* ThreadControl( void * );
/*****************************************************************************
* Open: open the rtmp connection
*****************************************************************************/
static int Open( vlc_object_t *p_this )
{
access_t *p_access = (access_t *) p_this;
access_sys_t *p_sys;
char *psz, *p;
int length_path, length_media_name;
int i;
STANDARD_READ_ACCESS_INIT
p_sys->p_thread =
vlc_object_create( p_access, sizeof( rtmp_control_thread_t ) );
if( !p_sys->p_thread )
return VLC_ENOMEM;
/* Parse URI - remove spaces */
p = psz = strdup( p_access->psz_location );
while( (p = strchr( p, ' ' )) != NULL )
*p = '+';
vlc_UrlParse( &p_sys->p_thread->url, psz, 0 );
free( psz );
if( p_sys->p_thread->url.psz_host == NULL
|| *p_sys->p_thread->url.psz_host == '\0' )
{
msg_Warn( p_access, "invalid host" );
goto error;
}
if( p_sys->p_thread->url.i_port <= 0 )
p_sys->p_thread->url.i_port = 1935;
if( p_sys->p_thread->url.psz_path == NULL )
{
msg_Warn( p_access, "invalid path" );
goto error;
}
length_path = strlen( p_sys->p_thread->url.psz_path );
char* psz_tmp = strrchr( p_sys->p_thread->url.psz_path, '/' );
if( !psz_tmp )
goto error;
length_media_name = strlen( psz_tmp ) - 1;
p_sys->p_thread->psz_application = strndup( p_sys->p_thread->url.psz_path + 1, length_path - length_media_name - 2 );
p_sys->p_thread->psz_media = strdup( p_sys->p_thread->url.psz_path + ( length_path - length_media_name ) );
p_sys->p_thread->psz_swf_url = var_CreateGetString( p_access, "rtmp-swfurl" );
p_sys->p_thread->psz_page_url = var_CreateGetString( p_access, "rtmp-pageurl" );
msg_Dbg( p_access, "rtmp: host='%s' port=%d path='%s'",
p_sys->p_thread->url.psz_host, p_sys->p_thread->url.i_port, p_sys->p_thread->url.psz_path );
if( p_sys->p_thread->url.psz_username && *p_sys->p_thread->url.psz_username )
{
msg_Dbg( p_access, " user='%s'", p_sys->p_thread->url.psz_username );
}
/* Initialize thread variables */
p_sys->p_thread->b_error= 0;
p_sys->p_thread->p_fifo_input = block_FifoNew();
p_sys->p_thread->p_empty_blocks = block_FifoNew();
p_sys->p_thread->has_audio = 0;
p_sys->p_thread->has_video = 0;
p_sys->p_thread->metadata_received = 0;
p_sys->p_thread->first_media_packet = 1;
p_sys->p_thread->flv_tag_previous_tag_size = 0x00000000; /* FLV_TAG_FIRST_PREVIOUS_TAG_SIZE */
p_sys->p_thread->chunk_size_recv = 128; /* RTMP_DEFAULT_CHUNK_SIZE */
p_sys->p_thread->chunk_size_send = 128; /* RTMP_DEFAULT_CHUNK_SIZE */
for(i = 0; i < 64; i++)
{
memset( &p_sys->p_thread->rtmp_headers_recv[i], 0, sizeof( rtmp_packet_t ) );
p_sys->p_thread->rtmp_headers_send[i].length_header = -1;
p_sys->p_thread->rtmp_headers_send[i].stream_index = -1;
p_sys->p_thread->rtmp_headers_send[i].timestamp = -1;
p_sys->p_thread->rtmp_headers_send[i].timestamp_relative = -1;
p_sys->p_thread->rtmp_headers_send[i].length_encoded = -1;
p_sys->p_thread->rtmp_headers_send[i].length_body = -1;
p_sys->p_thread->rtmp_headers_send[i].content_type = -1;
p_sys->p_thread->rtmp_headers_send[i].src_dst = -1;
p_sys->p_thread->rtmp_headers_send[i].body = NULL;
}
p_sys->p_thread->p_base_object = p_this;
vlc_cond_init( &p_sys->p_thread->wait );
vlc_mutex_init( &p_sys->p_thread->lock );
p_sys->p_thread->result_connect = 1;
p_sys->p_thread->result_play = 1;
p_sys->p_thread->result_stop = 0;
/* Open connection */
p_sys->p_thread->fd = net_ConnectTCP( p_access, p_sys->p_thread->url.psz_host, p_sys->p_thread->url.i_port );
if( p_sys->p_thread->fd == -1 )
{
int *p_fd_listen;
msg_Warn( p_access, "cannot connect to %s:%d", p_sys->p_thread->url.psz_host, p_sys->p_thread->url.i_port );
msg_Dbg( p_access, "switching to passive mode" );
p_sys->active = 0;
p_fd_listen = net_ListenTCP( p_access, p_sys->p_thread->url.psz_host, p_sys->p_thread->url.i_port );
if( p_fd_listen == NULL )
{
msg_Err( p_access, "cannot listen to %s port %i", p_sys->p_thread->url.psz_host, p_sys->p_thread->url.i_port );
goto error2;
}
p_sys->p_thread->fd = net_Accept( p_access, p_fd_listen );
net_ListenClose( p_fd_listen );
if( rtmp_handshake_passive( p_this, p_sys->p_thread->fd ) < 0 )
{
msg_Err( p_access, "handshake passive failed");
goto error2;
}
p_sys->p_thread->result_publish = 1;
}
else
{
p_sys->active = 1;
if( rtmp_handshake_active( p_this, p_sys->p_thread->fd ) < 0 )
{
msg_Err( p_access, "handshake active failed");
goto error2;
}
p_sys->p_thread->result_publish = 0;
}
if( vlc_clone( &p_sys->p_thread->thread, ThreadControl, p_sys->p_thread,
VLC_THREAD_PRIORITY_INPUT ) )
{
msg_Err( p_access, "cannot spawn rtmp control thread" );
goto error2;
}
if( p_sys->active )
{
if( rtmp_connect_active( p_sys->p_thread ) < 0 )
{
msg_Err( p_access, "connect active failed");
/* Kill the running thread */
vlc_cancel( p_sys->p_thread->thread );
vlc_join( p_sys->p_thread->thread, NULL );
goto error2;
}
}
/* Set vars for reading from fifo */
p_access->p_sys->flv_packet = NULL;
p_access->p_sys->read_packet = 1;
return VLC_SUCCESS;
error2:
vlc_cond_destroy( &p_sys->p_thread->wait );
vlc_mutex_destroy( &p_sys->p_thread->lock );
block_FifoRelease( p_sys->p_thread->p_fifo_input );
block_FifoRelease( p_sys->p_thread->p_empty_blocks );
free( p_sys->p_thread->psz_application );
free( p_sys->p_thread->psz_media );
free( p_sys->p_thread->psz_swf_url );
free( p_sys->p_thread->psz_page_url );
net_Close( p_sys->p_thread->fd );
error:
vlc_UrlClean( &p_sys->p_thread->url );
vlc_object_release( p_sys->p_thread );
free( p_sys );
return VLC_EGENERIC;
}
/*****************************************************************************
* Close: close the rtmp connection
*****************************************************************************/
static void Close( vlc_object_t * p_this )
{
access_t *p_access = (access_t *) p_this;
access_sys_t *p_sys = p_access->p_sys;
int i;
vlc_cancel( p_sys->p_thread->thread );
vlc_join( p_sys->p_thread->thread, NULL );
vlc_cond_destroy( &p_sys->p_thread->wait );
vlc_mutex_destroy( &p_sys->p_thread->lock );
block_FifoRelease( p_sys->p_thread->p_fifo_input );
block_FifoRelease( p_sys->p_thread->p_empty_blocks );
for( i = 0; i < 64; i++ ) /* RTMP_HEADER_STREAM_INDEX_MASK */
{
if( p_sys->p_thread->rtmp_headers_recv[i].body != NULL )
{
free( p_sys->p_thread->rtmp_headers_recv[i].body->body );
free( p_sys->p_thread->rtmp_headers_recv[i].body );
}
}
net_Close( p_sys->p_thread->fd );
vlc_UrlClean( &p_sys->p_thread->url );
free( p_sys->p_thread->psz_application );
free( p_sys->p_thread->psz_media );
free( p_sys->p_thread->psz_swf_url );
free( p_sys->p_thread->psz_page_url );
vlc_object_release( p_sys->p_thread );
free( p_sys );
}
/*****************************************************************************
* Read: standard read on a file descriptor.
*****************************************************************************/
static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len )
{
access_sys_t *p_sys = p_access->p_sys;
rtmp_packet_t *rtmp_packet;
uint8_t *tmp_buffer;
ssize_t i_ret;
size_t i_len_tmp;
i_len_tmp = 0;
while( i_len_tmp < i_len )
{
if( p_sys->p_thread->result_stop || p_access->info.b_eof || !vlc_object_alive (p_access) )
{
p_access->info.b_eof = true;
return 0;
}
if( p_sys->read_packet )
{
if( !p_sys->p_thread->metadata_received )
{
/* Wait until enough data is received for extracting metadata */
#warning This is not thread-safe (because block_FifoCount() is not)!
if( block_FifoCount( p_sys->p_thread->p_fifo_input ) < 10 )
{
#warning This is wrong!
msleep(100000);
continue;
}
p_sys->flv_packet = flv_get_metadata( p_access );
p_sys->p_thread->metadata_received = 1;
}
else
{
p_sys->flv_packet = block_FifoGet( p_sys->p_thread->p_fifo_input );
if( p_sys->flv_packet == NULL )
continue; /* Forced wake-up */
}
if( p_sys->p_thread->first_media_packet )
{
p_sys->flv_packet = flv_insert_header( p_access, p_sys->flv_packet );
p_sys->p_thread->first_media_packet = 0;
}
}
if( i_len - i_len_tmp >= p_sys->flv_packet->i_buffer )
{
p_sys->read_packet = 1;
memcpy( p_buffer + i_len_tmp, p_sys->flv_packet->p_buffer, p_sys->flv_packet->i_buffer );
block_FifoPut( p_sys->p_thread->p_empty_blocks, p_sys->flv_packet );
i_len_tmp += p_sys->flv_packet->i_buffer;
}
else
{
p_sys->read_packet = 0;
memcpy( p_buffer + i_len_tmp, p_sys->flv_packet->p_buffer, i_len - i_len_tmp);
p_sys->flv_packet->i_buffer -= i_len - i_len_tmp;
memmove( p_sys->flv_packet->p_buffer, p_sys->flv_packet->p_buffer + i_len - i_len_tmp, p_sys->flv_packet->i_buffer );
i_len_tmp += i_len - i_len_tmp;
}
}
if( i_len_tmp > 0 )
{
if( p_sys->p_thread->result_publish )
{
/* Send publish onStatus event only once */
p_sys->p_thread->result_publish = 0;
rtmp_packet = rtmp_build_publish_start( p_sys->p_thread );
tmp_buffer = rtmp_encode_packet( p_sys->p_thread, rtmp_packet );
i_ret = net_Write( p_sys->p_thread, p_sys->p_thread->fd, NULL, tmp_buffer, rtmp_packet->length_encoded );
if( i_ret != rtmp_packet->length_encoded )
{
msg_Err( p_access, "failed send publish start" );
goto error;
}
free( rtmp_packet->body->body );
free( rtmp_packet->body );
free( rtmp_packet );
free( tmp_buffer );
}
p_access->info.i_pos += i_len_tmp;
rtmp_packet = rtmp_build_bytes_read( p_sys->p_thread, p_access->info.i_pos );
tmp_buffer = rtmp_encode_packet( p_sys->p_thread, rtmp_packet );
i_ret = net_Write( p_sys->p_thread, p_sys->p_thread->fd, NULL, tmp_buffer, rtmp_packet->length_encoded );
if( i_ret != rtmp_packet->length_encoded )
{
msg_Err( p_access, "failed send bytes read" );
goto error;
}
free( rtmp_packet->body->body );
free( rtmp_packet->body );
free( rtmp_packet );
free( tmp_buffer );
}
return i_len_tmp;
error:
free( rtmp_packet->body->body );
free( rtmp_packet->body );
free( rtmp_packet );
free( tmp_buffer );
return -1;
}
/*****************************************************************************
* Seek: seek to a specific location in a file
*****************************************************************************/
static int Seek( access_t *p_access, uint64_t i_pos )
{
VLC_UNUSED( p_access );
VLC_UNUSED( i_pos );
/*msg_Warn ( p_access, "Seek to %lld", i_pos);
switch( rtmp_seek( p_access, i_pos ) )
{
case -1:
return VLC_EGENERIC;
case 0:
break;
default:
msg_Err( p_access, "You should not be here" );
abort();
}
*/
return VLC_EGENERIC;
}
/*****************************************************************************
* Control:
*****************************************************************************/
static int Control( access_t *p_access, int i_query, va_list args )
{
bool *pb_bool;
int64_t *pi_64;
switch( i_query )
{
/* */
case ACCESS_CAN_SEEK:
case ACCESS_CAN_FASTSEEK:
pb_bool = (bool*) va_arg( args, bool* );
*pb_bool = false; /* TODO */
break;
case ACCESS_CAN_PAUSE:
pb_bool = (bool*) va_arg( args, bool* );
*pb_bool = false; /* TODO */
break;
case ACCESS_CAN_CONTROL_PACE:
pb_bool = (bool*) va_arg( args, bool* );
*pb_bool = true;
break;
/* */
case ACCESS_GET_PTS_DELAY:
pi_64 = (int64_t*) va_arg( args, int64_t * );
*pi_64 = 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:
case ACCESS_GET_CONTENT_TYPE: /* DOWN: comment this line */
return VLC_EGENERIC;
default:
msg_Warn( p_access, "unimplemented query in control" );
return VLC_EGENERIC;
}
return VLC_SUCCESS;
}
/*****************************************************************************
* ThreadControl: manage control messages and pipe media to Read
*****************************************************************************/
static void* ThreadControl( void *p_this )
{
rtmp_control_thread_t *p_thread = p_this;
rtmp_packet_t *rtmp_packet;
int canc = vlc_savecancel ();
rtmp_init_handler( p_thread->rtmp_handler );
for( ;; )
{
vlc_restorecancel( canc );
rtmp_packet = rtmp_read_net_packet( p_thread );
canc = vlc_savecancel( );
if( rtmp_packet != NULL )
{
if( rtmp_packet->content_type < 0x01 /* RTMP_CONTENT_TYPE_CHUNK_SIZE */
|| rtmp_packet->content_type > 0x14 ) /* RTMP_CONTENT_TYPE_INVOKE */
{
free( rtmp_packet->body->body );
free( rtmp_packet->body );
free( rtmp_packet );
msg_Warn( p_thread, "unknown content type received" );
}
else
p_thread->rtmp_handler[rtmp_packet->content_type]( p_thread, rtmp_packet );
}
else
{
/* Sometimes server close connection too soon */
if( p_thread->result_connect )
{
#warning There must be a bug here!
vlc_mutex_lock( &p_thread->lock );
vlc_cond_signal( &p_thread->wait );
vlc_mutex_unlock( &p_thread->lock );
}
#warning info cannot be accessed outside input thread!
((access_t *) p_thread->p_base_object)->info.b_eof = true;
block_FifoWake( p_thread->p_fifo_input );
break;
}
}
vlc_restorecancel (canc);
return NULL;
}
This diff is collapsed.
/*****************************************************************************
* rtmp_amf_flv.h: RTMP, AMF and FLV over RTMP implementation.
*****************************************************************************
* Copyright (C) URJC - LADyR - Luis Lopez Fernandez
*
* Author: Miguel Angel Cabrera Moya
*
* 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Local prototypes (continued from access.c)
*****************************************************************************/
typedef struct rtmp_packet_t rtmp_packet_t;
typedef struct rtmp_body_t rtmp_body_t;
typedef struct rtmp_control_thread_t rtmp_control_thread_t;
typedef void (*rtmp_handler_t)( rtmp_control_thread_t *p_thread, rtmp_packet_t *rtmp_packet );
struct rtmp_packet_t
{
int length_header;
int stream_index;
uint32_t timestamp;
uint32_t timestamp_relative;
int32_t length_encoded;
int32_t length_body;
uint8_t content_type;
uint32_t src_dst;
rtmp_body_t *body;
};
struct rtmp_body_t
{
int32_t length_body; /* without interchunk headers */
int32_t length_buffer;
uint8_t *body;
};
struct rtmp_control_thread_t
{
VLC_COMMON_MEMBERS
int fd;
bool b_error;
vlc_url_t url;
char *psz_application;
char *psz_media;
char *psz_swf_url;
char *psz_page_url;
block_fifo_t *p_fifo_input;
block_fifo_t *p_empty_blocks;
vlc_mutex_t lock;
vlc_cond_t wait;
vlc_thread_t thread;
int result_connect;
int result_publish;
int result_play;
int result_stop;
double stream_client_id;
double stream_server_id;
char *psz_publish;
/* Rebuild FLV variables (access) */
int has_audio;
int has_video;
int metadata_received;
uint8_t metadata_stereo;
uint8_t metadata_samplesize;
uint32_t metadata_samplerate;
uint8_t metadata_audiocodecid;
uint8_t metadata_videocodecid;
uint8_t metadata_frametype;
int first_media_packet;
uint32_t flv_tag_previous_tag_size;
/* Vars for rebuilding FLV (access_output) */
rtmp_body_t *flv_body;
uint8_t flv_content_type;
uint32_t flv_length_body;
uint32_t flv_timestamp;
/* vars for channel state */
uint32_t chunk_size_recv;
uint32_t chunk_size_send;
rtmp_packet_t rtmp_headers_recv[64]; /* RTMP_HEADER_STREAM_MAX */
rtmp_packet_t rtmp_headers_send[64];
rtmp_handler_t rtmp_handler[21]; /* index by RTMP_CONTENT_TYPE */
/* Pointer to base module object (later needs to casted) */
void *p_base_object;
};
struct access_sys_t
{
int active;
/* vars for reading from fifo */
block_t *flv_packet;
int read_packet;
/* thread for filtering and handling control messages */
rtmp_control_thread_t *p_thread;
};
/*****************************************************************************
* RTMP header:
******************************************************************************/
int rtmp_handshake_active( vlc_object_t *p_this, int fd );
int rtmp_handshake_passive( vlc_object_t *p_this, int fd );
int rtmp_connect_active( rtmp_control_thread_t *p_thread );
int rtmp_connect_passive( rtmp_control_thread_t *p_thread );
//int rtmp_seek( access_t *p_access, int64_t i_pos ); TODO
//
rtmp_packet_t *rtmp_build_bytes_read( rtmp_control_thread_t *p_thread, uint32_t reply );
rtmp_packet_t *rtmp_build_publish_start( rtmp_control_thread_t *p_thread );
rtmp_packet_t *rtmp_build_flv_over_rtmp( rtmp_control_thread_t *p_thread, block_t *p_buffer );
rtmp_packet_t *rtmp_read_net_packet( rtmp_control_thread_t *p_thread );
uint8_t *rtmp_encode_packet( rtmp_control_thread_t *p_thread, rtmp_packet_t *rtmp_packet );