From 0afa4317178d8585ea7ee74bfc8c17b0dd7fddbb Mon Sep 17 00:00:00 2001 From: Laurent Aimar Date: Wed, 10 Mar 2004 21:54:28 +0000 Subject: [PATCH] * stream_output.h: added a vlc_meta_t field to sout_instance_t, this way meta data will be available for stream_outs and muxers. The only 'problem' is that it will be available for sure only after that the first data packet is received by the stream output. --- include/stream_output.h | 19 +++++++++++-------- include/vlc_common.h | 3 +++ include/vlc_meta.h | 3 +-- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/include/stream_output.h b/include/stream_output.h index 6b44508d7c..d0787a57d5 100644 --- a/include/stream_output.h +++ b/include/stream_output.h @@ -233,20 +233,23 @@ struct sout_instance_t { VLC_COMMON_MEMBERS - char * psz_sout; - char * psz_chain; + char *psz_sout; + char *psz_chain; + + /* meta data (Read only) XXX it won't be set before the first packet received */ + vlc_meta_t *p_meta; /* muxer data */ - int i_preheader; /* max over all muxer */ + int i_preheader; /* max over all muxer */ - int i_padding; /* needed by some decoders */ - int i_out_pace_nocontrol; /* count of output that can't control the space */ + int i_padding; /* needed by some decoders */ + int i_out_pace_nocontrol; /* count of output that can't control the space */ - vlc_mutex_t lock; - sout_stream_t *p_stream; + vlc_mutex_t lock; + sout_stream_t *p_stream; /* sout private */ - sout_instance_sys_t *p_sys; + sout_instance_sys_t *p_sys; }; static inline sout_cfg_t *sout_cfg_find( sout_cfg_t *p_cfg, char *psz_name ) diff --git a/include/vlc_common.h b/include/vlc_common.h index ce07045d89..1ca86bdfa8 100644 --- a/include/vlc_common.h +++ b/include/vlc_common.h @@ -312,6 +312,9 @@ typedef int (*httpd_file_callback_t)( httpd_file_sys_t*, httpd_file_t *, uint8_t typedef struct httpd_redirect_t httpd_redirect_t; typedef struct httpd_stream_t httpd_stream_t; +/* divers */ +typedef struct vlc_meta_t vlc_meta_t; + /***************************************************************************** * Variable callbacks diff --git a/include/vlc_meta.h b/include/vlc_meta.h index abed36d36f..4467b88ae1 100644 --- a/include/vlc_meta.h +++ b/include/vlc_meta.h @@ -2,7 +2,7 @@ * vlc_meta.h ***************************************************************************** * Copyright (C) 2004 VideoLAN - * $Id: vlc_meta.h,v 1.2 2004/03/03 12:01:17 fenrir Exp $ + * $Id$ * * Authors: Laurent Aimar * @@ -39,7 +39,6 @@ #define VLC_META_CODEC_NAME N_("Codec Name") #define VLC_META_CODEC_DESCRIPTION N_("Codec Description") -typedef struct vlc_meta_t vlc_meta_t; struct vlc_meta_t { /* meta name/value pairs */ -- 2.39.2