/*****************************************************************************
- * display.c
+ * display.c: display stream output module
*****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
- * $Id: display.c,v 1.11 2003/12/10 23:51:05 gbazin Exp $
+ * Copyright (C) 2001-2011 the VideoLAN team
*
* 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>
-#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include <vlc/sout.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
-#include "codecs.h"
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_input.h>
+#include <vlc_sout.h>
+#include <vlc_block.h>
/*****************************************************************************
- * Exported prototypes
+ * Module descriptor
*****************************************************************************/
-static int Open ( vlc_object_t * );
-static void Close ( vlc_object_t * );
+#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 (ms)")
+#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( 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 ()
-static sout_stream_id_t *Add ( sout_stream_t *, es_format_t * );
-static int Del ( sout_stream_t *, sout_stream_id_t * );
-static int Send( sout_stream_t *, sout_stream_id_t *, sout_buffer_t* );
/*****************************************************************************
- * Module descriptor
+ * Exported prototypes
*****************************************************************************/
-vlc_module_begin();
- set_description( _("Display stream") );
- set_capability( "sout stream", 50 );
- add_shortcut( "display" );
- set_callbacks( Open, Close );
-vlc_module_end();
+static const char *const ppsz_sout_options[] = {
+ "audio", "video", "delay", NULL
+};
+
+static sout_stream_id_t *Add ( sout_stream_t *, es_format_t * );
+static int Del ( sout_stream_t *, sout_stream_id_t * );
+static int Send( sout_stream_t *, sout_stream_id_t *, block_t* );
struct sout_stream_sys_t
{
- input_thread_t *p_input;
-
- 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;
};
/*****************************************************************************
{
sout_stream_t *p_stream = (sout_stream_t*)p_this;
sout_stream_sys_t *p_sys;
- char *val;
- 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 )
+
+ p_sys = malloc( sizeof( sout_stream_sys_t ) );
+ if( p_sys == NULL )
+ return VLC_ENOMEM;
+
+ p_sys->p_resource = input_resource_New( p_this );
+ if( unlikely(p_sys->p_resource == NULL) )
{
- msg_Err( p_stream, "cannot find p_input" );
free( p_sys );
- return VLC_EGENERIC;
+ return VLC_ENOMEM;
}
- p_sys->b_audio = VLC_TRUE;
- p_sys->b_video = VLC_TRUE;
- p_sys->i_delay = 100*1000;
- if( sout_cfg_find( p_stream->p_cfg, "noaudio" ) )
- {
- p_sys->b_audio = VLC_FALSE;
- }
- if( sout_cfg_find( p_stream->p_cfg, "novideo" ) )
- {
- p_sys->b_video = VLC_FALSE;
- }
- if( ( val = sout_cfg_find_value( p_stream->p_cfg, "delay" ) ) )
- {
- p_sys->i_delay = (mtime_t)atoi( val ) * (mtime_t)1000;
- }
+ config_ChainParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options,
+ p_stream->p_cfg );
+
+ 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 = p_sys->i_delay * CLOCK_FREQ / 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 */
+ p_stream->p_sout->i_out_pace_nocontrol++;
+
return VLC_SUCCESS;
}
/*****************************************************************************
* Close:
*****************************************************************************/
-
static void Close( vlc_object_t * p_this )
{
sout_stream_t *p_stream = (sout_stream_t*)p_this;
sout_stream_sys_t *p_sys = p_stream->p_sys;
- vlc_object_release( p_sys->p_input );
+ /* 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
-{
- es_descriptor_t *p_es;
-};
-
-
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 ) );
-
- vlc_mutex_lock( &p_sys->p_input->stream.stream_lock );
- id->p_es = input_AddES( p_sys->p_input,
- NULL, /* no program */
- 12, /* es_id */
- p_fmt->i_cat, /* es category */
- NULL, /* description */
- 0 ); /* no extra data */
-
- if( !id->p_es )
+ decoder_t *p_dec = input_DecoderCreate( VLC_OBJECT(p_stream), p_fmt,
+ p_sys->p_resource );
+ if( p_dec == NULL )
{
- vlc_mutex_unlock( &p_sys->p_input->stream.stream_lock );
-
- msg_Err( p_stream, "cannot create es" );
- free( id );
+ msg_Err( p_stream, "cannot create decoder for fcc=`%4.4s'",
+ (char*)&p_fmt->i_codec );
return NULL;
}
- id->p_es->i_stream_id = 1;
- 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( input_SelectES( p_sys->p_input, id->p_es ) )
- {
- input_DelES( p_sys->p_input, id->p_es );
- vlc_mutex_unlock( &p_sys->p_input->stream.stream_lock );
-
- msg_Err( p_stream, "cannot select es" );
- free( id );
- return NULL;
- }
- vlc_mutex_unlock( &p_sys->p_input->stream.stream_lock );
-
- return id;
+ return (sout_stream_id_t *)p_dec;
}
static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
{
- sout_stream_sys_t *p_sys = p_stream->p_sys;
-
- input_DelES( p_sys->p_input, id->p_es );
-
- free( id );
-
+ (void) p_stream;
+ input_DecoderDelete( (decoder_t *)id );
return VLC_SUCCESS;
}
static int Send( sout_stream_t *p_stream, sout_stream_id_t *id,
- sout_buffer_t *p_buffer )
+ block_t *p_buffer )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
while( p_buffer )
{
- sout_buffer_t *p_next;
- block_t *p_block;
+ block_t *p_next = p_buffer->p_next;
+
+ p_buffer->p_next = NULL;
- vlc_mutex_lock( &p_sys->p_input->stream.stream_lock );
- if( id->p_es->p_dec && p_buffer->i_size > 0 &&
- (p_block = block_New( p_stream, p_buffer->i_size )) )
+ if( id != NULL && p_buffer->i_buffer > 0 )
{
- p_block->i_dts = p_buffer->i_dts <= 0 ? 0 :
- p_buffer->i_dts + p_sys->i_delay;
- p_block->i_pts = p_buffer->i_pts <= 0 ? 0 :
- p_buffer->i_pts + p_sys->i_delay;
+ if( p_buffer->i_dts <= VLC_TS_INVALID )
+ p_buffer->i_dts = 0;
+ else
+ p_buffer->i_dts += p_sys->i_delay;
- p_stream->p_vlc->pf_memcpy( p_block->p_buffer,
- p_buffer->p_buffer, p_buffer->i_size );
+ if( p_buffer->i_pts <= VLC_TS_INVALID )
+ p_buffer->i_pts = 0;
+ else
+ p_buffer->i_pts += p_sys->i_delay;
- input_DecodeBlock( id->p_es->p_dec, p_block );
+ input_DecoderDecode( (decoder_t *)id, p_buffer, false );
}
- vlc_mutex_unlock( &p_sys->p_input->stream.stream_lock );
- /* *** go to next buffer *** */
- p_next = p_buffer->p_next;
- sout_BufferDelete( p_stream->p_sout, p_buffer );
p_buffer = p_next;
}