[vlc-devel] commit: Sanitize input headers (pass 4). (Laurent Aimar )
git version control
git at videolan.org
Mon Oct 13 20:24:54 CEST 2008
vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Mon Oct 13 20:20:54 2008 +0200| [ea83a25e84bca24d045c34713ce7008ea5ce4e8a] | committer: Laurent Aimar
Sanitize input headers (pass 4).
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ea83a25e84bca24d045c34713ce7008ea5ce4e8a
---
src/Makefile.am | 3 +-
src/input/access.c | 4 +-
src/input/access.h | 43 ++++++++++++++++++
src/input/demux.c | 6 +--
src/input/demux.h | 4 +-
src/input/input.c | 1 +
src/input/input_internal.h | 31 +------------
src/input/stream.c | 7 ++-
src/input/stream.h | 65 +++++++++++++++++++++++++++
src/input/{mem_stream.c => stream_memory.c} | 8 +--
10 files changed, 126 insertions(+), 46 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index cc7c932..63cee7a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -311,10 +311,11 @@ SOURCES_libvlc_common = \
input/decoder.h \
input/demux.h \
input/es_out.h \
+ input/stream.h \
input/input_internal.h \
input/vlm_internal.h \
input/stream.c \
- input/mem_stream.c \
+ input/stream_memory.c \
input/subtitles.c \
input/var.c \
video_output/video_output.c \
diff --git a/src/input/access.c b/src/input/access.c
index 6cb3552..b6e4201 100644
--- a/src/input/access.c
+++ b/src/input/access.c
@@ -25,10 +25,8 @@
# include "config.h"
#endif
-#include <vlc_common.h>
-#include <libvlc.h>
-
#include "access.h"
+#include <libvlc.h>
/*****************************************************************************
* access_InternalNew:
diff --git a/src/input/access.h b/src/input/access.h
new file mode 100644
index 0000000..51f5429
--- /dev/null
+++ b/src/input/access.h
@@ -0,0 +1,43 @@
+/*****************************************************************************
+ * access.h: Input access functions
+ *****************************************************************************
+ * Copyright (C) 1998-2008 the VideoLAN team
+ * Copyright (C) 2008 Laurent Aimar
+ * $Id$
+ *
+ * Authors: Laurent Aimar <fenrir at via.ecp.fr>
+ *
+ * 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.
+ *****************************************************************************/
+
+#if defined(__PLUGIN__) || defined(__BUILTIN__) || !defined(__LIBVLC__)
+# error This header file can only be included from LibVLC.
+#endif
+
+#ifndef _INPUT_ACCESS_H
+#define _INPUT_ACCESS_H 1
+
+#include <vlc_common.h>
+#include <vlc_access.h>
+
+#define access_New( a, b, c, d ) __access_New(VLC_OBJECT(a), b, c, d )
+access_t * __access_New( vlc_object_t *p_obj, const char *psz_access,
+ const char *psz_demux, const char *psz_path );
+access_t * access_FilterNew( access_t *p_source,
+ const char *psz_access_filter );
+void access_Delete( access_t * );
+
+#endif
+
diff --git a/src/input/demux.c b/src/input/demux.c
index 31484f3..89264a6 100644
--- a/src/input/demux.c
+++ b/src/input/demux.c
@@ -25,11 +25,9 @@
# include "config.h"
#endif
-#include <vlc_common.h>
-#include <vlc_codec.h>
-
-#include "input_internal.h"
#include "demux.h"
+#include <libvlc.h>
+#include <vlc_codec.h>
static bool SkipID3Tag( demux_t * );
static bool SkipAPETag( demux_t *p_demux );
diff --git a/src/input/demux.h b/src/input/demux.h
index c2f1bf5..77ea695 100644
--- a/src/input/demux.h
+++ b/src/input/demux.h
@@ -29,9 +29,11 @@
#ifndef _INPUT_DEMUX_H
#define _INPUT_DEMUX_H 1
-#include <libvlc.h>
+#include <vlc_common.h>
#include <vlc_demux.h>
+#include "stream.h"
+
/* stream_t *s could be null and then it mean a access+demux in one */
#define demux_New( a, b, c, d, e, f,g ) __demux_New(VLC_OBJECT(a),b,c,d,e,f,g)
demux_t *__demux_New(vlc_object_t *p_obj, const char *psz_access, const char *psz_demux, const char *psz_path, stream_t *s, es_out_t *out, bool );
diff --git a/src/input/input.c b/src/input/input.c
index bf696f3..acae8ea 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -39,6 +39,7 @@
#include "es_out.h"
#include "access.h"
#include "demux.h"
+#include "stream.h"
#include <vlc_sout.h>
#include "../stream_output/stream_output.h"
diff --git a/src/input/input_internal.h b/src/input/input_internal.h
index 915becf..878d8f0 100644
--- a/src/input/input_internal.h
+++ b/src/input/input_internal.h
@@ -31,6 +31,7 @@
#include <vlc_access.h>
#include <vlc_demux.h>
#include <vlc_input.h>
+#include <libvlc.h>
/*****************************************************************************
* Private input fields
@@ -372,34 +373,4 @@ char *input_CreateFilename( vlc_object_t *p_obj, const char *psz_path, const cha
#define INPUT_RECORD_PREFIX "vlc-record-%Y-%m-%d-%H:%M:%S-$ N-$ p"
-/* Stream */
-/**
- * stream_t definition
- */
-struct stream_t
-{
- VLC_COMMON_MEMBERS
-
- /*block_t *(*pf_block) ( stream_t *, int i_size );*/
- int (*pf_read) ( stream_t *, void *p_read, unsigned int i_read );
- int (*pf_peek) ( stream_t *, const uint8_t **pp_peek, unsigned int i_peek );
- int (*pf_control)( stream_t *, int i_query, va_list );
- void (*pf_destroy)( stream_t *);
-
- stream_sys_t *p_sys;
-
- /* UTF-16 and UTF-32 file reading */
- vlc_iconv_t conv;
- int i_char_width;
- bool b_little_endian;
-};
-
-#include <libvlc.h>
-
-static inline stream_t *vlc_stream_create( vlc_object_t *obj )
-{
- return (stream_t *)vlc_custom_create( obj, sizeof(stream_t),
- VLC_OBJECT_GENERIC, "stream" );
-}
-
#endif
diff --git a/src/input/stream.c b/src/input/stream.c
index 489f616..c6395e1 100644
--- a/src/input/stream.c
+++ b/src/input/stream.c
@@ -26,16 +26,19 @@
#endif
#include <dirent.h>
+#include <assert.h>
#include <vlc_common.h>
#include <vlc_strings.h>
#include <vlc_osd.h>
#include <vlc_charset.h>
-#include <assert.h>
+#include <libvlc.h>
-#include "input_internal.h"
#include "access.h"
+#include "stream.h"
+
+#include "input_internal.h"
#undef STREAM_DEBUG
diff --git a/src/input/stream.h b/src/input/stream.h
new file mode 100644
index 0000000..1b8a510
--- /dev/null
+++ b/src/input/stream.h
@@ -0,0 +1,65 @@
+/*****************************************************************************
+ * stream.h: Input stream functions
+ *****************************************************************************
+ * Copyright (C) 1998-2008 the VideoLAN team
+ * Copyright (C) 2008 Laurent Aimar
+ * $Id$
+ *
+ * Authors: Laurent Aimar <fenrir at via.ecp.fr>
+ *
+ * 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.
+ *****************************************************************************/
+
+#if defined(__PLUGIN__) || defined(__BUILTIN__) || !defined(__LIBVLC__)
+# error This header file can only be included from LibVLC.
+#endif
+
+#ifndef _INPUT_STREAM_H
+#define _INPUT_STREAM_H 1
+
+#include <vlc_common.h>
+#include <vlc_stream.h>
+
+/**
+ * stream_t definition
+ */
+struct stream_t
+{
+ VLC_COMMON_MEMBERS
+
+ /*block_t *(*pf_block) ( stream_t *, int i_size );*/
+ int (*pf_read) ( stream_t *, void *p_read, unsigned int i_read );
+ int (*pf_peek) ( stream_t *, const uint8_t **pp_peek, unsigned int i_peek );
+ int (*pf_control)( stream_t *, int i_query, va_list );
+ void (*pf_destroy)( stream_t *);
+
+ stream_sys_t *p_sys;
+
+ /* UTF-16 and UTF-32 file reading */
+ vlc_iconv_t conv;
+ int i_char_width;
+ bool b_little_endian;
+};
+
+#include <libvlc.h>
+
+static inline stream_t *vlc_stream_create( vlc_object_t *obj )
+{
+ return (stream_t *)vlc_custom_create( obj, sizeof(stream_t),
+ VLC_OBJECT_GENERIC, "stream" );
+}
+
+#endif
+
diff --git a/src/input/mem_stream.c b/src/input/stream_memory.c
similarity index 96%
rename from src/input/mem_stream.c
rename to src/input/stream_memory.c
index fd38b11..341f5f6 100644
--- a/src/input/mem_stream.c
+++ b/src/input/stream_memory.c
@@ -1,7 +1,7 @@
/*****************************************************************************
- * mem_stream.c: stream_t wrapper around memory buffer
+ * stream_memory.c: stream_t wrapper around memory buffer
*****************************************************************************
- * Copyright (C) 1999-2004 the VideoLAN team
+ * Copyright (C) 1999-2008 the VideoLAN team
* $Id$
*
* Authors: Sigmund Augdal Helberg <dnumgis at videolan.org>
@@ -25,9 +25,7 @@
# include "config.h"
#endif
-#include <vlc_common.h>
-
-#include "input_internal.h"
+#include "stream.h"
struct stream_sys_t
{
More information about the vlc-devel
mailing list