/*****************************************************************************
* display.c: display stream output module
*****************************************************************************
- * Copyright (C) 2001, 2002 the VideoLAN team
- * $Id$
+ * Copyright (C) 2001-2011 the VideoLAN team
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_input.h>
#include <vlc_sout.h>
#include <vlc_block.h>
#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_TEXT N_("Delay (ms)")
#define DELAY_LONGTEXT N_( "Introduces a delay in the display of the stream." )
static int Open ( 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" );
- set_category( CAT_SOUT );
- set_subcategory( SUBCAT_SOUT_STREAM );
- add_bool( SOUT_CFG_PREFIX "audio", 1, NULL, AUDIO_TEXT,
- AUDIO_LONGTEXT, VLC_TRUE );
- add_bool( SOUT_CFG_PREFIX "video", 1, NULL, VIDEO_TEXT,
- VIDEO_LONGTEXT, VLC_TRUE );
- add_integer( SOUT_CFG_PREFIX "delay", 100, NULL, DELAY_TEXT,
- DELAY_LONGTEXT, VLC_TRUE );
- set_callbacks( Open, Close );
-vlc_module_end();
+vlc_module_begin ()
+ set_shortname( N_("Display"))
+ set_description( N_("Display stream output") )
+ set_capability( "sout stream", 50 )
+ add_shortcut( "display" )
+ set_category( CAT_SOUT )
+ set_subcategory( SUBCAT_SOUT_STREAM )
+
+ add_bool( SOUT_CFG_PREFIX "audio", true, AUDIO_TEXT,
+ AUDIO_LONGTEXT, true )
+ add_bool( SOUT_CFG_PREFIX "video", true, VIDEO_TEXT,
+ VIDEO_LONGTEXT, true )
+ add_integer( SOUT_CFG_PREFIX "delay", 100, DELAY_TEXT,
+ DELAY_LONGTEXT, true )
+ set_callbacks( Open, Close )
+vlc_module_end ()
/*****************************************************************************
* Exported prototypes
*****************************************************************************/
-static const char *ppsz_sout_options[] = {
+static const char *const ppsz_sout_options[] = {
"audio", "video", "delay", NULL
};
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;
+ input_resource_t *p_resource;
};
/*****************************************************************************
if( p_sys == NULL )
return VLC_ENOMEM;
+ p_sys->p_resource = input_resource_New( p_this );
+ if( unlikely(p_sys->p_resource == NULL) )
+ {
+ free( p_sys );
+ return VLC_ENOMEM;
+ }
+
config_ChainParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options,
p_stream->p_cfg );
- 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_sys->i_delay = p_sys->i_delay * CLOCK_FREQ / 1000;
p_stream->pf_add = Add;
p_stream->pf_del = Del;
/* update p_sout->i_out_pace_nocontrol */
p_stream->p_sout->i_out_pace_nocontrol--;
+ input_resource_Terminate( p_sys->p_resource );
+ input_resource_Release( p_sys->p_resource );
free( p_sys );
}
-struct sout_stream_id_t
-{
- decoder_t *p_dec;
-};
-
static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
- sout_stream_id_t *id;
if( ( p_fmt->i_cat == AUDIO_ES && !p_sys->b_audio )||
( p_fmt->i_cat == VIDEO_ES && !p_sys->b_video ) )
return NULL;
}
- id = malloc( sizeof( sout_stream_id_t ) );
- if( id == NULL )
- return NULL;
-
- 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_dec = input_DecoderNew( p_sys->p_input, p_fmt, VLC_TRUE );
- if( id->p_dec == NULL )
+ decoder_t *p_dec = input_DecoderCreate( VLC_OBJECT(p_stream), p_fmt,
+ p_sys->p_resource );
+ if( p_dec == NULL )
{
msg_Err( p_stream, "cannot create decoder for fcc=`%4.4s'",
(char*)&p_fmt->i_codec );
- free( id );
- if( p_sys->i_es == 0 )
- vlc_object_release( p_sys->p_input );
return NULL;
}
-
- p_sys->i_es++;
- return id;
+ return (sout_stream_id_t *)p_dec;
}
static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
{
- input_DecoderDelete( id->p_dec );
- if( --p_stream->p_sys->i_es == 0)
- vlc_object_release( p_stream->p_sys->p_input );
-
- free( id );
+ (void) p_stream;
+ input_DecoderDelete( (decoder_t *)id );
return VLC_SUCCESS;
}
p_buffer->p_next = NULL;
- if( id->p_dec && p_buffer->i_buffer > 0 )
+ if( id != NULL && p_buffer->i_buffer > 0 )
{
- if( p_buffer->i_dts <= 0 )
- p_buffer->i_dts= 0;
+ if( p_buffer->i_dts <= VLC_TS_INVALID )
+ p_buffer->i_dts = 0;
else
p_buffer->i_dts += p_sys->i_delay;
- if( p_buffer->i_pts <= 0 )
- p_buffer->i_pts= 0;
+ if( p_buffer->i_pts <= VLC_TS_INVALID )
+ p_buffer->i_pts = 0;
else
p_buffer->i_pts += p_sys->i_delay;
- input_DecoderDecode( id->p_dec, p_buffer );
+ input_DecoderDecode( (decoder_t *)id, p_buffer, false );
}
p_buffer = p_next;
projects / vlc / blobdiff