Changeset 4dec9682f6b5b0b6ed2d5187f4652cb680f39000

Timestamp:

13/04/03 22:00:21 (5 years ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1050264021 +0000

git-parent:

[1bab4d1788d1f39537eebc09a5aec491c5064640]

git-author:

Laurent Aimar <fenrir@videolan.org> 1050264021 +0000

Message:

• all: new sout scheme. Now a chain of module are created that can
  

modify/apply on all streams, --sout has the same behavour expect when
starting with a '#'.

With a starting '#' you can specify a chain of modules, it's still

unstable but a lot more powerfull.

You have access to duplicate(that duplicate all stream), transcode

(using only ffmpeg), standard/std and es (that apply muxers and access),
and display. You could chain them with ':' and specify options with
{option1=value,option2=value[,...]}.

ex: * to stream and see the stream to udp/ts:ip

--sout '#duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'

• to transcode,see and stream
  

--sout '#transcode{acodec=mpga}:duplicate{dst=display,dst=std{access=udp,mux=ts,url=ip}}'

Without a starting '#', the url is converted into '#std{acces=,mux=,url}'

Test and report bugs :)

Files:

• configure.ac.in (modified) (5 diffs)
• include/input_ext-intf.h (modified) (2 diffs)
• include/stream_output.h (modified) (9 diffs)
• include/vlc_common.h (modified) (2 diffs)
• modules/Makefile.am (modified) (1 diff)
• modules/mux/avi.c (modified) (7 diffs)
• modules/mux/mpeg/ps.c (modified) (3 diffs)
• modules/mux/mpeg/ts.c (modified) (5 diffs)
• modules/mux/ogg.c (modified) (7 diffs)
• modules/packetizer/a52.c (modified) (4 diffs)
• modules/packetizer/copy.c (modified) (7 diffs)
• modules/packetizer/mpeg4audio.c (modified) (4 diffs)
• modules/packetizer/mpeg4video.c (modified) (8 diffs)
• modules/packetizer/mpegaudio.c (modified) (4 diffs)
• modules/packetizer/mpegvideo.c (modified) (8 diffs)
• modules/stream_out/Modules.am (added)
• modules/stream_out/display.c (added)
• modules/stream_out/dummy.c (added)
• modules/stream_out/duplicate.c (added)
• modules/stream_out/es.c (added)
• modules/stream_out/standard.c (added)
• modules/stream_out/transcode.c (added)
• src/input/input_dec.c (modified) (4 diffs)
• src/input/input_programs.c (modified) (2 diffs)
• src/stream_output/stream_output.c (modified) (18 diffs)

configure.ac.in

@@ -335 +335 @@
-AC_CHECK_LIB(m,pow,
-  LDFLAGS_ffmpeg="${LDFLAGS_ffmpeg} -lm"
+  LDFLAGS_stream_out_transcode="${LDFLAGS_stream_out_transcode} -lm"
-  LDFLAGS_imdct="${LDFLAGS_imdct} -lm"
-  LDFLAGS_imdct3dn="${LDFLAGS_imdct3dn} -lm"
@@ -1018 +1019 @@
-  PLUGINS="${PLUGINS} packetizer_copy"
-
-
+
+
-
-    dnl Ogg/ogm
@@ -1511 +1513 @@
-    CPPFLAGS_ffmpeg="${CPPFLAGS_ffmpeg} -I${with_ffmpeg}/include/ffmpeg"
-    LDFLAGS_ffmpeg="${LDFLAGS_ffmpeg} -L${with_ffmpeg}/lib"
+
+    CPPFLAGS_stream_out_transcode="${CPPFLAGS_stream_out_transcode} -I${with_ffmpeg}/include/ffmpeg"
+    LDFLAGS_stream_out_transcode="${LDFLAGS_stream_out_transcode} -L${with_ffmpeg}/lib"
+
-  fi
-
@@ -1539 +1545 @@
-      dnl  Use a custom libffmpeg
-      AC_MSG_RESULT(${real_ffmpeg_tree}/libavcodec/libavcodec.a)
-
+ stream_out_transcode
-      LDFLAGS_ffmpeg="${LDFLAGS_ffmpeg} -L${real_ffmpeg_tree}/libavcodec -lavcodec"
-      CPPFLAGS_ffmpeg="${CPPFLAGS_ffmpeg} -I${real_ffmpeg_tree}/libavcodec"
+
+      LDFLAGS_stream_out_transcode="${LDFLAGS_stream_out_transcode} -L${real_ffmpeg_tree}/libavcodec -lavcodec"
+      CPPFLAGS_stream_out_transcode="${CPPFLAGS_stream_out_transcode} -I${real_ffmpeg_tree}/libavcodec"
+
-    else
-      dnl  The given libavcodec wasn't built
@@ -1551 +1561 @@
-    LDFLAGS="${LDFLAGS_save} ${LDFLAGS_ffmpeg}"
-    AC_CHECK_LIB(avcodec, avcodec_init, [
-
-
+
+
+
-      [ AC_MSG_ERROR([Cannot find libavcodec library...]) ])
-    LDFLAGS="${LDFLAGS_save}"

include/input_ext-intf.h

@@ -5 +5 @@
- *****************************************************************************
- * Copyright (C) 1999, 2000 VideoLAN
-7 2003/03/24 17:15:29 gbazin
+8 2003/04/13 20:00:20 fenrir
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -72 +72 @@
-    count_t                 c_packets;                 /* total packets read */
-    count_t                 c_invalid_packets;       /* invalid packets read */
+
+    /* XXX hack: to force a decoder instead of mode based on sout */
+    vlc_bool_t              b_force_decoder;
-};
-

include/stream_output.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-9 2003/03/11 19:02:3
+10 2003/04/13 20:00:2
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -58 +58 @@
-};
-
-packet_
-
-      // AUDIO_ES, VIDEO_ES, SPU_ES
+
+
+
-    vlc_fourcc_t    i_fourcc;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-};
-
@@ -76 +88 @@
-};
-
+typedef struct sout_stream_id_t  sout_stream_id_t;
+
-/* for mux */
-struct sout_input_t
-{
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-struct sout_packetizer_input_t
-{
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-#define SOUT_METHOD_NONE        0x00
@@ -109 +117 @@
-#define SOUT_METHOD_NETWORK     0x20
-
+typedef struct sout_access_out_sys_t   sout_access_out_sys_t;
-struct sout_access_out_t
-{
@@ -181 +190 @@
-};
-
+
+
+struct sout_cfg_t
+{
+    sout_cfg_t  *p_next;
+
+    char        *psz_name;
+    char        *psz_value;
+};
+
+typedef struct sout_stream_sys_t sout_stream_sys_t;
+struct sout_stream_t
+{
+    VLC_COMMON_MEMBERS
+
+    module_t                *p_module;
+    sout_instance_t         *p_sout;
+
+    char                    *psz_name;
+    sout_cfg_t              *p_cfg;
+    char                    *psz_next;
+
+    /* add, remove a stream */
+    sout_stream_id_t *      (*pf_add) ( sout_stream_t *, sout_format_t * );
+    int                     (*pf_del) ( sout_stream_t *, sout_stream_id_t * );
+
+    /* manage a packet */
+    int                     (*pf_send)( sout_stream_t *, sout_stream_id_t *, sout_buffer_t* );
+
+    /* private */
+    sout_stream_sys_t       *p_sys;
+};
+
-typedef struct sout_instance_sys_t sout_instance_sys_t;
-struct sout_instance_t
@@ -186 +228 @@
-    VLC_COMMON_MEMBERS
-
-    /* complete sout string like udp/ts:239.255.12.42#file/ps://essai.ps */
-    char * psz_sout;
-
-
-
-
+
-
-    /* muxer data */
-    int                     i_preheader;    /* max over all muxer */
-
-    int                     i_nb_mux;
-    sout_mux_t              **pp_mux;
-
-    /* here are all packetizer inputs accepted by at least one muxer */
-    vlc_mutex_t             lock;
-
-
+
-
-    /* sout private */
@@ -208 +241 @@
-};
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-/*****************************************************************************
- * Prototypes
@@ -228 +330 @@
-
-#define sout_InputNew( a, b ) __sout_InputNew( VLC_OBJECT(a), b )
-packet_
+
-VLC_EXPORT( int,            sout_InputDelete,      ( sout_packetizer_input_t * ) );
-VLC_EXPORT( int,            sout_InputSendBuffer,  ( sout_packetizer_input_t *, sout_buffer_t* ) );
@@ -244 +346 @@
-VLC_EXPORT( int,                 sout_AccessOutWrite,  ( sout_access_out_t *, sout_buffer_t * ) );
-
+VLC_EXPORT( sout_mux_t *,       sout_MuxNew,          ( sout_instance_t*, char *, sout_access_out_t * ) );
+VLC_EXPORT( sout_input_t *,     sout_MuxAddStream,    ( sout_mux_t *, sout_format_t * ) );
+VLC_EXPORT( void,               sout_MuxDeleteStream, ( sout_mux_t *, sout_input_t * ) );
+VLC_EXPORT( void,               sout_MuxDelete,       ( sout_mux_t * ) );
+VLC_EXPORT( void,               sout_MuxSendBuffer, ( sout_mux_t *, sout_input_t  *, sout_buffer_t * ) );
+
+VLC_EXPORT( char *,             sout_cfg_parser, ( char **, sout_cfg_t **, char * ) );
+VLC_EXPORT( sout_stream_t *,    sout_stream_new, ( sout_instance_t *, char *psz_chain ) );
+VLC_EXPORT( void,               sout_stream_delete, ( sout_stream_t *p_stream ) );
+

include/vlc_common.h

@@ -4 +4 @@
- *****************************************************************************
- * Copyright (C) 1998, 1999, 2000 VideoLAN
-59 2003/03/17 18:02:11 sam
+60 2003/04/13 20:00:20 fenrir
- *
- * Authors: Samuel Hocevar <sam@via.ecp.fr>
@@ -250 +250 @@
-typedef struct sout_packetizer_input_t sout_packetizer_input_t;
-typedef struct sout_buffer_t sout_buffer_t;
-typedef struct sout_packet_format_t sout_packet_format_t;
-typedef struct sout_access_out_t sout_access_out_t;
-typedef struct sout_mux_t sout_mux_t;
-
-
+
+
+
-/* Decoders */
-typedef struct decoder_fifo_t decoder_fifo_t;

modules/Makefile.am

@@ -63 +63 @@
-    mux/mpeg/Modules.am \
-    packetizer/Modules.am \
+    stream_out/Modules.am \
-    video_chroma/Modules.am \
-    video_filter/Modules.am \

modules/mux/avi.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
-1 2003/03/31 03:46:1
+2 2003/04/13 20:00:2
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -232 +232 @@
-                    (uint64_t)p_stream->i_duration;
-        }
-Err
-
-
-
-
-
+Info
+ 
+ 
+ 
+ 
+ 
-    }
-
@@ -267 +267 @@
-        return( -1 );
-    }
-    if( p_input->input_format.p_format == NULL )
-    {
-        msg_Err( p_mux, "stream descriptor missing" );
-        return( -1 );
-    }
-
-    msg_Dbg( p_mux, "adding input" );
@@ -279 +274 @@
-    p_stream = &p_sys->stream[p_sys->i_streams];
-
-input_format.
+p_fmt->
-    {
-        case AUDIO_ES:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            break;
-        case VIDEO_ES:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            break;
-        default:
--1
+VLC_EGENERIC
-    }
-    p_stream->i_totalsize = 0;
@@ -334 +376 @@
-
-    p_sys->i_streams++;
-0
+VLC_SUCCESS
-}
-
@@ -432 +474 @@
-            }
-
+            p_sys->i_movi_size += p_data->i_size;
-            sout_AccessOutWrite( p_mux->p_access, p_data );
-            p_sys->i_movi_size += p_data->i_size;
-
-            i_count--;
@@ -650 +692 @@
-                {
-                    i_scale = i_samplesize;
-i_scale *
+/*i_scale **/
-                }
-                else

modules/mux/mpeg/ps.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
-1 2003/03/11 19:02:30
+2 2003/04/13 20:00:21
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -175 +175 @@
-    p_input->p_sys = (void*)p_stream = malloc( sizeof( ps_stream_t ) );
-    p_stream->i_ok = 0;
-input_format.
+p_fmt->
-    {
-        case VIDEO_ES:
-
-input_format.
+p_fmt->
-            {
-                case VLC_FOURCC( 'm', 'p', 'g', 'v' ):
@@ -191 +191 @@
-            break;
-        case AUDIO_ES:
-input_format.
+p_fmt->
-            {
-                case VLC_FOURCC( 'a', '5', '2', ' ' ):

modules/mux/mpeg/ts.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
-5 2003/03/11 19:02:30
+6 2003/04/13 20:00:21
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -224 +224 @@
-    sout_mux_sys_t      *p_sys = p_mux->p_sys;
-    ts_stream_t         *p_stream;
-    BITMAPINFOHEADER    *p_bih;
-    WAVEFORMATEX        *p_wf;
-
-    msg_Dbg( p_mux, "adding input" );
@@ -237 +235 @@
-    p_stream->i_continuity_counter = 0;
-
-input_format.
+p_fmt->
-    {
-        case VIDEO_ES:
-input_format.
+p_fmt->
-            {
-                case VLC_FOURCC( 'm', 'p','g', 'v' ):
@@ -270 +268 @@
-            }
-            p_sys->i_video_bound++;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-                p_stream->p_decoder_specific_info =
-                    malloc( p_stream->i_decoder_specific_info_len );
-                memcpy( p_stream->p_decoder_specific_info,
-&p_bih[1]
-stream->i_decoder_specific_info_len
+p_input->p_fmt->p_extra_data
+input->p_fmt->i_extra_data
-            }
-            else
-            {
-                p_stream->p_decoder_specific_info = NULL;
-                p_stream->i_decoder_specific_info_len = 0;
-            }
-            break;
+
-        case AUDIO_ES:
-input_format.
+p_fmt->
-            {
-                case VLC_FOURCC( 'a', '5','2', ' ' ):
@@ -325 +313 @@
-            }
-            p_sys->i_audio_bound++;
-
-if( p_wf && p_wf->cbSize > 0 )
-{
-    p_stream->i_decoder_specific_info_len = p_wf->cbSize;
+
+p_stream->i_decoder_specific_info_len = p_input->p_fmt->i_extra_data;
+if( p_stream->i_decoder_specific_info_len > 0 )
+{
-                p_stream->p_decoder_specific_info =
-                    malloc( p_stream->i_decoder_specific_info_len );
-                memcpy( p_stream->p_decoder_specific_info,
-&p_wf[1]
-stream->i_decoder_specific_info_len
+p_input->p_fmt->p_extra_data
+input->p_fmt->i_extra_data
-            }
-            else
-            {
-                p_stream->p_decoder_specific_info = NULL;
-                p_stream->i_decoder_specific_info_len = 0;
-            }
-            break;

modules/mux/ogg.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
-4 2003/03/31 03:46:1
+5 2003/04/13 20:00:2
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -210 +210 @@
-    ogg_stream_t        *p_stream;
-
-    BITMAPINFOHEADER    *p_bih;
-    WAVEFORMATEX        *p_wf;
-
-    msg_Dbg( p_mux, "adding input" );
-    p_input->p_sys = (void*)p_stream = malloc( sizeof( ogg_stream_t ) );
-
-input_format.
-input_format.
+p_fmt->
+p_fmt->
-    p_stream->i_packet_no = 0;
-
-    p_stream->header.i_packet_type = PACKET_TYPE_HEADER;
-input_format.
+p_fmt->
-    {
-        case VIDEO_ES:
-
-
+
-            {
-                case VLC_FOURCC( 'm', 'p','4', 'v' ):
@@ -232 +228 @@
-                            "video    ",
-                            8 );
-input_format.
+p_fmt->
-                    {
-                        memcpy( p_stream->header.sub_type, "XVID", 4 );
-                    }
-input_format.
+p_fmt->
-                    {
-                        memcpy( p_stream->header.sub_type, "DIV3", 4 );
@@ -247 +243 @@
-                    SetDWLE( &p_stream->header.i_buffer_size, 1024*1024 );
-                    SetWLE( &p_stream->header.i_bits_per_sample, 0 );
-
-
-
-
-
-
-
-
-
-
+
+
-                    break;
-                default:
@@ -264 +252 @@
-            break;
-        case AUDIO_ES:
-
-
+
-            {
-                case VLC_FOURCC( 'm', 'p','g', 'a' ):
@@ -272 +259 @@
-                            "audio    ",
-                            8 );
-input_format.
+p_fmt->
-                    {
-                        memcpy( p_stream->header.sub_type, "55  ", 4 );
-                    }
-input_format.
+p_fmt->
-                    {
-                        memcpy( p_stream->header.sub_type, "2000", 4 );
@@ -284 +271 @@
-                    SetDWLE( &p_stream->header.i_default_len, 0 );      /* ??? */
-                    SetDWLE( &p_stream->header.i_buffer_size, 30*1024 );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-                    break;
-                case VLC_FOURCC( 'v', 'o', 'r', 'b' ):