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 \
......
This diff is collapsed.
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 );
void rtmp_init_handler( rtmp_handler_t *rtmp_handler );
/*****************************************************************************
* FLV header:
******************************************************************************/
block_t *flv_get_metadata( access_t *p_access );
block_t *flv_insert_header( access_t *p_access, block_t *first_packet );
/*****************************************************************************
* RTMP body header:
******************************************************************************/
rtmp_body_t *rtmp_body_new( int length_buffer );
void rtmp_body_reset( rtmp_body_t * );
......@@ -242,9 +242,6 @@ modules/access/rar/access.c
modules/access/rar/rar.c
modules/access/rar/rar.h
modules/access/rar/stream.c
modules/access/rtmp/access.c
modules/access/rtmp/rtmp_amf_flv.c
modules/access/rtmp/rtmp_amf_flv.h
modules/access/rtp/input.c
modules/access/rtp/rtp.c
modules/access/rtp/rtp.h
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment