Skip to content

V
vlc
Commit 07743d45 authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options

ALL: a bunch of compilation fixes + disabled plugins that don't compile anymore.

parent 21261c74
Hide whitespace changes
Inline Side-by-side
Showing with 86 additions and 83 deletions
configure.ac
View file @ 07743d45
......@@ -893,7 +893,7 @@ dnl
dnl default modules
dnl
AX_ADD_PLUGINS([dummy rc telnet logger gestures memcpy hotkeys netsync])
AX_ADD_PLUGINS([mpgv mpga m4v h264 ps ps2 pva avi asf aac mp4 rawdv nsv real aiff mjpeg])
AX_ADD_PLUGINS([mpgv mpga m4v h264 ps pva avi asf aac mp4 rawdv nsv real aiff mjpeg])
AX_ADD_PLUGINS([cvdsub svcdsub spudec dvbsub mpeg_audio lpcm a52 dts cinepak])
AX_ADD_PLUGINS([deinterlace invert adjust wall transform distort clone crop motionblur])
AX_ADD_PLUGINS([float32tos16 float32tos8 float32tou16 float32tou8 a52tospdif dtstospdif fixed32tofloat32 fixed32tos16 s16tofixed32 s16tofloat32 s16tofloat32swab s8tofloat32 u8tofixed32 u8tofloat32])
......@@ -902,7 +902,7 @@ AX_ADD_PLUGINS([trivial_channel_mixer headphone_channel_mixer])
AX_ADD_PLUGINS([trivial_mixer spdif_mixer float32_mixer])
AX_ADD_PLUGINS([aout_file])
AX_ADD_PLUGINS([i420_rgb i420_yuy2 i422_yuy2 i420_ymga])
AX_ADD_PLUGINS([id3 m3u playlist export sgimb])
AX_ADD_PLUGINS([m3u playlist export sgimb])
AX_ADD_PLUGINS([rawvideo])
AX_ADD_PLUGINS([wav araw demuxsub adpcm a52sys dtssys au])
AX_ADD_PLUGINS([access_file access_udp access_tcp access_http ipv4 access_mms])
......@@ -1837,12 +1837,12 @@ then
fi
dnl
dnl libid3tag support
dnl libid3tag support (FIXME!!! doesn't work with new input)
dnl
AC_CHECK_HEADERS(id3tag.h, [
AC_CHECK_HEADERS(zlib.h, [
AX_ADD_LDFLAGS([id3tag],[-lid3tag -lz])
AX_ADD_PLUGINS([id3tag])]) ])
dnl AC_CHECK_HEADERS(id3tag.h, [
dnl AC_CHECK_HEADERS(zlib.h, [
dnl AX_ADD_LDFLAGS([id3tag],[-lid3tag -lz])
dnl AX_ADD_PLUGINS([id3tag])]) ])
dnl
dnl ffmpeg decoder/demuxer plugin
......@@ -3512,8 +3512,8 @@ dnl
dnl SLP access plugin
dnl
AC_ARG_ENABLE(slp,
[ --enable-slp SLP service discovery support (default enabled)])
if test "${enable_slp}" != "no"
[ --enable-slp SLP service discovery support (default disabled)])
if test "${enable_slp}" = "yes"
then
AC_ARG_WITH(slp,
[ --with-slp=PATH libslp headers and libraries])
......
modules/codec/cmml/intf.c
View file @ 07743d45
......@@ -33,15 +33,12 @@
#include <vlc/vlc.h>
#include <vlc/decoder.h>
#include <vlc/input.h>
#include <vlc/intf.h>
#include <vlc/vout.h>
#include <osd.h>
#include "stream_control.h"
#include "input_ext-intf.h"
#include "input_ext-dec.h"
#include "vlc_keys.h"
#include "browser_open.h"
......
modules/codec/theora.c
View file @ 07743d45
......@@ -26,6 +26,7 @@
*****************************************************************************/
#include <vlc/vlc.h>
#include <vlc/decoder.h>
#include <vlc/input.h>
#include <vlc/sout.h>
#include <ogg/ogg.h>
......
modules/control/netsync.c
View file @ 07743d45
......@@ -334,8 +334,12 @@ static mtime_t GetClockRef( intf_thread_t *p_intf, mtime_t i_pts )
if( !p_input ) return 0;
#if 0
p_pgrm = p_input->stream.p_selected_program;
if( p_pgrm ) return input_ClockGetTS( p_input, p_pgrm, i_pts );
#else
#warning "This code is currently broken. FIXME!!!"
#endif
return 0;
}
modules/demux/Modules.am
View file @ 07743d45
......@@ -11,11 +11,10 @@ SOURCES_wav = wav.c
SOURCES_aac = aac.c
SOURCES_mkv = mkv.cpp
SOURCES_livedotcom = livedotcom.cpp
SOURCES_demux2 = demux2.c
SOURCES_nsv = nsv.c
SOURCES_real = real.c
SOURCES_ts = ts.c ../mux/mpeg/csa.c
SOURCES_ps2 = ps.c ps.h
SOURCES_ps = ps.c ps.h
SOURCES_dvdnav = dvdnav.c
SOURCES_mod = mod.c
SOURCES_pva = pva.c
......
modules/demux/m3u.c
View file @ 07743d45
......@@ -54,14 +54,15 @@ struct demux_sys_t
*****************************************************************************/
static int Activate ( vlc_object_t * );
static void Deactivate( vlc_object_t * );
static int Demux ( input_thread_t * );
static int Demux ( demux_t * );
static int Control ( demux_t *, int, va_list );
/*****************************************************************************
* Module descriptor
*****************************************************************************/
vlc_module_begin();
set_description( _("Playlist metademux") );
set_capability( "demux", 180 );
set_capability( "demux2", 180 );
set_callbacks( Activate, Deactivate );
add_shortcut( "m3u" );
add_shortcut( "asx" );
......@@ -75,47 +76,41 @@ vlc_module_end();
*****************************************************************************/
static int Activate( vlc_object_t * p_this )
{
input_thread_t *p_input = (input_thread_t *)p_this;
char *psz_ext;
int i_type = TYPE_UNKNOWN;
int i_type2 = TYPE_UNKNOWN;
demux_t *p_demux = (demux_t *)p_this;
char *psz_ext;
int i_type = TYPE_UNKNOWN;
int i_type2 = TYPE_UNKNOWN;
/* Initialize access plug-in structures. */
if( p_input->i_mtu == 0 )
{
/* Improve speed. */
p_input->i_bufsize = INPUT_DEFAULT_BUFSIZE;
}
p_input->pf_demux = Demux;
p_input->pf_rewind = NULL;
p_demux->pf_control = Control;
p_demux->pf_demux = Demux;
/* Check for m3u/asx file extension or if the demux has been forced */
psz_ext = strrchr ( p_input->psz_name, '.' );
psz_ext = strrchr ( p_demux->psz_path, '.' );
if( ( psz_ext && !strcasecmp( psz_ext, ".m3u") ) ||
( psz_ext && !strcasecmp( psz_ext, ".ram") ) || /* a .ram file can contain a single rtsp link */
( p_input->psz_demux && !strcmp(p_input->psz_demux, "m3u") ) )
/* a .ram file can contain a single rtsp link */
( psz_ext && !strcasecmp( psz_ext, ".ram") ) ||
( p_demux->psz_demux && !strcmp(p_demux->psz_demux, "m3u") ) )
{
i_type = TYPE_M3U;
}
else if( ( psz_ext && !strcasecmp( psz_ext, ".asx") ) ||
( p_input->psz_demux && !strcmp(p_input->psz_demux, "asx") ) )
( p_demux->psz_demux && !strcmp(p_demux->psz_demux, "asx") ) )
{
i_type = TYPE_ASX;
}
else if( ( psz_ext && !strcasecmp( psz_ext, ".html") ) ||
( p_input->psz_demux && !strcmp(p_input->psz_demux, "html") ) )
( p_demux->psz_demux && !strcmp(p_demux->psz_demux, "html") ) )
{
i_type = TYPE_HTML;
}
else if( ( psz_ext && !strcasecmp( psz_ext, ".pls") ) ||
( p_input->psz_demux && !strcmp(p_input->psz_demux, "pls") ) )
( p_demux->psz_demux && !strcmp(p_demux->psz_demux, "pls") ) )
{
i_type = TYPE_PLS;
}
else if( ( psz_ext && !strcasecmp( psz_ext, ".b4s") ) ||
( p_input->psz_demux && !strcmp(p_input->psz_demux, "b4s") ) )
( p_demux->psz_demux && !strcmp(p_demux->psz_demux, "b4s") ) )
{
i_type = TYPE_B4S;
}
......@@ -127,48 +122,50 @@ static int Activate( vlc_object_t * p_this )
/* XXX we double check for file != m3u as some asx ... are just m3u file */
if( i_type != TYPE_M3U )
{
byte_t *p_peek;
int i_size = input_Peek( p_input, &p_peek, MAX_LINE );
uint8_t *p_peek;
int i_size = stream_Peek( p_demux->s, &p_peek, MAX_LINE );
i_size -= sizeof("[playlist]") - 1;
if ( i_size > 0 ) {
while ( i_size
&& strncasecmp( p_peek, "[playlist]", sizeof("[playlist]") - 1 )
&& strncasecmp( p_peek, "<html>", sizeof("<html>") - 1 )
&& strncasecmp( p_peek, "<asx", sizeof("<asx") - 1 )
&& strncasecmp( p_peek, "<?xml", sizeof("<?xml") -1 ) )
if( i_size > 0 )
{
while( i_size &&
strncasecmp(p_peek, "[playlist]", sizeof("[playlist]") - 1)
&& strncasecmp( p_peek, "<html>", sizeof("<html>") - 1 )
&& strncasecmp( p_peek, "<asx", sizeof("<asx") - 1 )
&& strncasecmp( p_peek, "<?xml", sizeof("<?xml") -1 ) )
{
p_peek++;
i_size--;
}
if ( !i_size )
if( !i_size )
{
;
}
else if ( !strncasecmp( p_peek, "[playlist]", sizeof("[playlist]") -1 ) )
else if( !strncasecmp( p_peek, "[playlist]", sizeof("[playlist]") -1 ) )
{
i_type2 = TYPE_PLS;
}
else if ( !strncasecmp( p_peek, "<html>", sizeof("<html>") -1 ) )
else if( !strncasecmp( p_peek, "<html>", sizeof("<html>") -1 ) )
{
i_type2 = TYPE_HTML;
}
else if ( !strncasecmp( p_peek, "<asx", sizeof("<asx") -1 ) )
else if( !strncasecmp( p_peek, "<asx", sizeof("<asx") -1 ) )
{
i_type2 = TYPE_ASX;
}
#if 0
else if ( !strncasecmp( p_peek, "<?xml", sizeof("<?xml") -1 ) )
else if( !strncasecmp( p_peek, "<?xml", sizeof("<?xml") -1 ) )
{
i_type2 = TYPE_B4S;
}
#endif
}
}
if ( i_type == TYPE_UNKNOWN && i_type2 == TYPE_UNKNOWN)
if( i_type == TYPE_UNKNOWN && i_type2 == TYPE_UNKNOWN)
{
return VLC_EGENERIC;
}
if ( i_type != TYPE_UNKNOWN && i_type2 == TYPE_UNKNOWN )
if( i_type != TYPE_UNKNOWN && i_type2 == TYPE_UNKNOWN )
{
i_type = TYPE_M3U;
}
......@@ -178,8 +175,8 @@ static int Activate( vlc_object_t * p_this )
}
/* Allocate p_m3u */
p_input->p_demux_data = malloc( sizeof( demux_sys_t ) );
p_input->p_demux_data->i_type = i_type;
p_demux->p_sys = malloc( sizeof( demux_sys_t ) );
p_demux->p_sys->i_type = i_type;
return VLC_SUCCESS;
}
......@@ -189,9 +186,8 @@ static int Activate( vlc_object_t * p_this )
*****************************************************************************/
static void Deactivate( vlc_object_t *p_this )
{
input_thread_t *p_input = (input_thread_t *)p_this;
free( p_input->p_demux_data );
demux_t *p_demux = (demux_t *)p_this;
free( p_demux->p_sys );
}
/*****************************************************************************
......@@ -238,11 +234,11 @@ static void XMLSpecialChars ( char *str )
* expand it
* psz_line is \0 terminated
*****************************************************************************/
static int ParseLine( input_thread_t *p_input, char *psz_line, char *psz_data,
static int ParseLine( demux_t *p_demux, char *psz_line, char *psz_data,
vlc_bool_t *pb_next )
{
demux_sys_t *p_m3u = p_input->p_demux_data;
char *psz_bol, *psz_name;
demux_sys_t *p_m3u = p_demux->p_sys;
char *psz_bol, *psz_name;
psz_bol = psz_line;
......@@ -384,7 +380,7 @@ static int ParseLine( input_thread_t *p_input, char *psz_line, char *psz_data,
char *psz_eol;
msg_Dbg( p_input, "b4s line=%s", psz_line );
msg_Dbg( p_demux, "b4s line=%s", psz_line );
/* We are dealing with a B4S file from Winamp 3 */
/* First, search for name *
......@@ -445,7 +441,7 @@ static int ParseLine( input_thread_t *p_input, char *psz_line, char *psz_data,
}
else
{
msg_Warn( p_input, "unknown file type" );
msg_Warn( p_demux, "unknown file type" );
return 0;
}
......@@ -497,7 +493,7 @@ static int ParseLine( input_thread_t *p_input, char *psz_line, char *psz_data,
#endif
{
/* assume the path is relative to the path of the m3u file. */
char *psz_path = strdup( p_input->psz_name );
char *psz_path = strdup( p_demux->psz_path );
#ifndef WIN32
psz_name = strrchr( psz_path, '/' );
......@@ -537,16 +533,15 @@ static int ParseLine( input_thread_t *p_input, char *psz_line, char *psz_data,
return 1;
}
static void ProcessLine ( input_thread_t *p_input, playlist_t *p_playlist,
char *psz_line,
char **ppsz_uri, char **ppsz_name,
static void ProcessLine ( demux_t *p_demux, playlist_t *p_playlist,
char *psz_line, char **ppsz_uri, char **ppsz_name,
int *pi_options, char ***pppsz_options,
int *pi_position )
{
char psz_data[MAX_LINE];
vlc_bool_t b_next;
switch( ParseLine( p_input, psz_line, psz_data, &b_next ) )
switch( ParseLine( p_demux, psz_line, psz_data, &b_next ) )
{
case 1:
if( *ppsz_uri )
......@@ -597,13 +592,12 @@ static void ProcessLine ( input_thread_t *p_input, playlist_t *p_playlist,
*****************************************************************************
* Returns -1 in case of error, 0 in case of EOF, 1 otherwise
*****************************************************************************/
static int Demux ( input_thread_t *p_input )
static int Demux( demux_t *p_demux )
{
demux_sys_t *p_m3u = p_input->p_demux_data;
demux_sys_t *p_m3u = p_demux->p_sys;
data_packet_t *p_data;
char psz_line[MAX_LINE];
char *p_buf, eol_tok;
char *p_buf = 0, eol_tok;
int i_size, i_bufpos, i_linepos = 0;
playlist_t *p_playlist;
vlc_bool_t b_discard = VLC_FALSE;
......@@ -615,11 +609,11 @@ static int Demux ( input_thread_t *p_input )
int i_position;
p_playlist = (playlist_t *) vlc_object_find( p_input, VLC_OBJECT_PLAYLIST,
p_playlist = (playlist_t *) vlc_object_find( p_demux, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
if( !p_playlist )
{
msg_Err( p_input, "can't find playlist" );
msg_Err( p_demux, "can't find playlist" );
return -1;
}
......@@ -633,9 +627,9 @@ static int Demux ( input_thread_t *p_input )
else
eol_tok = '\n';
while( ( i_size = input_SplitBuffer( p_input, &p_data, MAX_LINE ) ) > 0 )
while( ( i_size = stream_Read( p_demux->s, p_buf, MAX_LINE ) ) )
{
i_bufpos = 0; p_buf = p_data->p_payload_start;
i_bufpos = 0;
while( i_size )
{
......@@ -672,18 +666,18 @@ static int Demux ( input_thread_t *p_input )
psz_line[i_linepos] = '\0';
i_linepos = 0;
ProcessLine( p_input, p_playlist, psz_line, &psz_uri, &psz_name,
ProcessLine( p_demux, p_playlist, psz_line, &psz_uri, &psz_name,
&i_options, &ppsz_options, &i_position );
}
input_DeletePacket( p_input->p_method_data, p_data );
free( p_buf );
}
if ( i_linepos && b_discard != VLC_TRUE && eol_tok == '\n' )
{
psz_line[i_linepos] = '\0';
ProcessLine( p_input, p_playlist, psz_line, &psz_uri, &psz_name,
ProcessLine( p_demux, p_playlist, psz_line, &psz_uri, &psz_name,
&i_options, &ppsz_options, &i_position );
/* Is there a pendding uri without b_next */
......@@ -707,3 +701,8 @@ static int Demux ( input_thread_t *p_input )
return 0;
}
static int Control( demux_t *p_demux, int i_query, va_list args )
{
return VLC_EGENERIC;
}
modules/demux/mpeg/Modules.am
View file @ 07743d45
SOURCES_mpeg_system = system.c system.h
SOURCES_m4v = m4v.c
SOURCES_ps = ps.c
SOURCES_ps_old = ps.c
SOURCES_ts_old = ts.c
SOURCES_ts_old_dvbpsi = ts.c
SOURCES_mpga = mpga.c
......
modules/demux/playlist/m3u.c
View file @ 07743d45
......@@ -28,6 +28,7 @@
#include <stdlib.h> /* malloc(), free() */
#include <vlc/vlc.h>
#include <vlc/input.h>
#include <vlc/intf.h>
#include <errno.h> /* ENOMEM */
......
modules/demux/playlist/old.c
View file @ 07743d45
......@@ -2,7 +2,7 @@
* old.c : Old playlist format import
*****************************************************************************
* Copyright (C) 2004 VideoLAN
* $Id: old.c,v 1.2 2004/01/25 20:05:29 hartman Exp $
* $Id$
*
* Authors: Clment Stenac <zorglub@videolan.org>
*
......@@ -27,6 +27,7 @@
#include <stdlib.h> /* malloc(), free() */
#include <vlc/vlc.h>
#include <vlc/input.h>
#include <vlc/intf.h>
#include <errno.h> /* ENOMEM */
......
modules/demux/playlist/pls.c
View file @ 07743d45
......@@ -2,7 +2,7 @@
* pls.c : PLS playlist format import
*****************************************************************************
* Copyright (C) 2004 VideoLAN
* $Id: pls.c,v 1.2 2004/01/25 20:05:29 hartman Exp $
* $Id$
*
* Authors: Clment Stenac <zorglub@videolan.org>
* Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
......@@ -28,6 +28,7 @@
#include <stdlib.h> /* malloc(), free() */
#include <vlc/vlc.h>
#include <vlc/input.h>
#include <vlc/intf.h>
#include <errno.h> /* ENOMEM */
......
modules/demux/ps.c
View file @ 07743d45
......@@ -2,7 +2,7 @@
* ps.c
*****************************************************************************
* Copyright (C) 2004 VideoLAN
* $Id: ps.c,v 1.2 2004/01/25 20:05:28 hartman Exp $
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
......@@ -46,7 +46,7 @@ vlc_module_begin();
set_description( _("PS demuxer") );
set_capability( "demux2", 0 );
set_callbacks( Open, Close );
add_shortcut( "ps2" );
add_shortcut( "ps" );
vlc_module_end();
/*****************************************************************************
......
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