/*****************************************************************************
* display.c: display stream output module
*****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
+ * Copyright (C) 2001, 2002 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* 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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h>
-#include <string.h>
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include <vlc/sout.h>
+#include <vlc_plugin.h>
+#include <vlc_input.h>
+#include <vlc_sout.h>
+#include <vlc_block.h>
/*****************************************************************************
* Module descriptor
*****************************************************************************/
+#define AUDIO_TEXT N_("Enable audio")
+#define AUDIO_LONGTEXT N_( "Enable/disable audio rendering." )
+#define VIDEO_TEXT N_("Enable video")
+#define VIDEO_LONGTEXT N_( "Enable/disable video rendering." )
+#define DELAY_TEXT N_("Delay")
+#define DELAY_LONGTEXT N_( "Introduces a delay in the display of the stream." )
+
static int Open ( vlc_object_t * );
static void Close( vlc_object_t * );
#define SOUT_CFG_PREFIX "sout-display-"
vlc_module_begin();
+ set_shortname( _("Display"));
set_description( _("Display stream output") );
set_capability( "sout stream", 50 );
add_shortcut( "display" );
- add_bool( SOUT_CFG_PREFIX "audio", 1, NULL, "audio", "", VLC_TRUE );
- add_bool( SOUT_CFG_PREFIX "video", 1, NULL, "video", "", VLC_TRUE );
- add_integer( SOUT_CFG_PREFIX "delay", 100, NULL, "delay", "", VLC_TRUE );
+ set_category( CAT_SOUT );
+ set_subcategory( SUBCAT_SOUT_STREAM );
+ add_bool( SOUT_CFG_PREFIX "audio", 1, NULL, AUDIO_TEXT,
+ AUDIO_LONGTEXT, true );
+ add_bool( SOUT_CFG_PREFIX "video", 1, NULL, VIDEO_TEXT,
+ VIDEO_LONGTEXT, true );
+ add_integer( SOUT_CFG_PREFIX "delay", 100, NULL, DELAY_TEXT,
+ DELAY_LONGTEXT, true );
set_callbacks( Open, Close );
vlc_module_end();
struct sout_stream_sys_t
{
input_thread_t *p_input;
+ unsigned i_es;
- vlc_bool_t b_audio;
- vlc_bool_t b_video;
+ bool b_audio;
+ bool b_video;
mtime_t i_delay;
};
{
sout_stream_t *p_stream = (sout_stream_t*)p_this;
sout_stream_sys_t *p_sys;
- vlc_value_t val;
-
- sout_ParseCfg( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options, p_stream->p_cfg );
-
- p_sys = malloc( sizeof( sout_stream_sys_t ) );
- p_sys->p_input = vlc_object_find( p_stream, VLC_OBJECT_INPUT, FIND_ANYWHERE );
- if( !p_sys->p_input )
- {
- msg_Err( p_stream, "cannot find p_input" );
- free( p_sys );
- return VLC_EGENERIC;
- }
- var_Get( p_stream, SOUT_CFG_PREFIX "audio", &val );
- p_sys->b_audio = val.b_bool;
+ p_sys = malloc( sizeof( sout_stream_sys_t ) );
+ if( p_sys == NULL )
+ return VLC_ENOMEM;
- var_Get( p_stream, SOUT_CFG_PREFIX "video", &val );
- p_sys->b_video = val.b_bool;
+ config_ChainParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options,
+ p_stream->p_cfg );
- var_Get( p_stream, SOUT_CFG_PREFIX "delay", &val );
- p_sys->i_delay = (int64_t)val.i_int * 1000;
+ p_sys->p_input = NULL;
+ p_sys->i_es = 0;
+ p_sys->b_audio = var_GetBool( p_stream, SOUT_CFG_PREFIX"audio" );
+ p_sys->b_video = var_GetBool( p_stream, SOUT_CFG_PREFIX "video" );
+ p_sys->i_delay = var_GetInteger( p_stream, SOUT_CFG_PREFIX "delay" );
+ p_sys->i_delay *= 1000;
p_stream->pf_add = Add;
p_stream->pf_del = Del;
p_stream->pf_send = Send;
-
p_stream->p_sys = p_sys;
/* update p_sout->i_out_pace_nocontrol */
/* update p_sout->i_out_pace_nocontrol */
p_stream->p_sout->i_out_pace_nocontrol--;
- vlc_object_release( p_sys->p_input );
-
free( p_sys );
}
struct sout_stream_id_t
{
- es_descriptor_t *p_es;
+ decoder_t *p_dec;
};
static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
}
id = malloc( sizeof( sout_stream_id_t ) );
+ if( id == NULL )
+ return NULL;
- id->p_es = malloc( sizeof( es_descriptor_t ) );
- memset( id->p_es, 0, sizeof( es_descriptor_t ) );
- id->p_es->i_cat = p_fmt->i_cat;
- id->p_es->i_fourcc = p_fmt->i_codec;
- id->p_es->b_force_decoder = VLC_TRUE;
- es_format_Copy( &id->p_es->fmt, p_fmt );
+ if( p_sys->i_es == 0 )
+ {
+ p_sys->p_input = vlc_object_find( p_stream, VLC_OBJECT_INPUT,
+ FIND_PARENT );
+ if( p_sys->p_input == NULL )
+ {
+ msg_Err( p_stream, "cannot find input" );
+ free( id );
+ return NULL;
+ }
+ }
- id->p_es->p_dec = input_RunDecoder( p_sys->p_input, id->p_es );
- if( id->p_es->p_dec == NULL )
+ id->p_dec = input_DecoderNew( p_sys->p_input, p_fmt, true );
+ if( id->p_dec == NULL )
{
msg_Err( p_stream, "cannot create decoder for fcc=`%4.4s'",
(char*)&p_fmt->i_codec );
- free( id->p_es );
free( id );
+ if( p_sys->i_es == 0 )
+ vlc_object_release( p_sys->p_input );
return NULL;
}
+ p_sys->i_es++;
return id;
}
static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
{
- sout_stream_sys_t *p_sys = p_stream->p_sys;
+ input_DecoderDelete( id->p_dec );
+ if( --p_stream->p_sys->i_es == 0)
+ vlc_object_release( p_stream->p_sys->p_input );
- input_EndDecoder( p_sys->p_input, id->p_es );
-
- free( id->p_es );
free( id );
-
return VLC_SUCCESS;
}
p_buffer->p_next = NULL;
- if( id->p_es->p_dec && p_buffer->i_buffer > 0 )
+ if( id->p_dec && p_buffer->i_buffer > 0 )
{
if( p_buffer->i_dts <= 0 )
p_buffer->i_dts= 0;
else
p_buffer->i_pts += p_sys->i_delay;
- input_DecodeBlock( id->p_es->p_dec, p_buffer );
+ input_DecoderDecode( id->p_dec, p_buffer );
}
p_buffer = p_next;
projects / vlc / blobdiff