Commit b8cbf90d authored by Christophe Massiot's avatar Christophe Massiot Committed by Jean-Baptiste Kempf

New stream out module delay to delay PTS/DTS

Signed-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent 203a2937
......@@ -80,6 +80,7 @@ Stream output:
dst=public_html/iphonestreamfile-###.ts}"
* RTP: support for Vorbis and Theora
* Major rework of VoD support
* New delay module
Services Discovery:
* Search API to be able to query distant search APIs from the interfaces
......
SUBDIRS = transcode
SOURCES_stream_out_dummy = dummy.c
SOURCES_stream_out_delay = delay.c
SOURCES_stream_out_description = description.c
SOURCES_stream_out_standard = standard.c
SOURCES_stream_out_duplicate = duplicate.c
......@@ -17,6 +18,7 @@ SOURCES_stream_out_smem = smem.c
libvlc_LTLIBRARIES += \
libstream_out_dummy_plugin.la \
libstream_out_delay_plugin.la \
libstream_out_description_plugin.la \
libstream_out_standard_plugin.la \
libstream_out_duplicate_plugin.la \
......
/*****************************************************************************
* delay.c: delay a stream
*****************************************************************************
* Copyright (C) 2011 VideoLAN
* $Id$
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* 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.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_sout.h>
#include <vlc_block.h>
/*****************************************************************************
* Module descriptor
*****************************************************************************/
#define ID_TEXT N_("ID")
#define ID_LONGTEXT N_( \
"Specify an identifier integer for this elementary stream" )
#define DELAY_TEXT N_("Delay")
#define DELAY_LONGTEXT N_( \
"Specify a delay for this elementary stream (positive or negative)" )
static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * );
#define SOUT_CFG_PREFIX "sout-delay-"
vlc_module_begin()
set_shortname( _("delay"))
set_description( _("Delay a stream"))
set_capability( "sout stream", 50 )
add_shortcut( "delay" )
set_callbacks( Open, Close )
add_integer( SOUT_CFG_PREFIX "id", 0, ID_TEXT, ID_LONGTEXT,
false )
add_integer( SOUT_CFG_PREFIX "delay", 0, DELAY_TEXT, DELAY_LONGTEXT,
false )
vlc_module_end()
/*****************************************************************************
* Local prototypes
*****************************************************************************/
static const char *ppsz_sout_options[] = {
"id", "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
{
sout_stream_t *p_out;
sout_stream_id_t *id;
int i_id;
mtime_t i_delay;
};
/*****************************************************************************
* Open:
*****************************************************************************/
static int Open( vlc_object_t *p_this )
{
sout_stream_t *p_stream = (sout_stream_t*)p_this;
sout_stream_sys_t *p_sys;
vlc_value_t val;
p_sys = calloc( 1, sizeof( sout_stream_sys_t ) );
if( !p_sys )
return VLC_ENOMEM;
if( !p_stream->p_next )
{
msg_Err( p_stream, "cannot create chain" );
free( p_sys );
return VLC_EGENERIC;
}
config_ChainParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options,
p_stream->p_cfg );
var_Get( p_stream, SOUT_CFG_PREFIX "id", &val );
p_sys->i_id = val.i_int;
var_Get( p_stream, SOUT_CFG_PREFIX "delay", &val );
p_sys->i_delay = val.i_int * 1000;
p_stream->pf_add = Add;
p_stream->pf_del = Del;
p_stream->pf_send = Send;
p_stream->p_sys = p_sys;
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 = (sout_stream_sys_t *)p_stream->p_sys;
free( p_sys );
}
static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
{
sout_stream_sys_t *p_sys = (sout_stream_sys_t *)p_stream->p_sys;
if ( p_fmt->i_id == p_sys->i_id )
{
msg_Dbg( p_stream, "delaying ID %d by %"PRId64,
p_sys->i_id, p_sys->i_delay );
p_sys->id = p_sys->p_out->pf_add( p_sys->p_out, p_fmt );
return p_sys->id;
}
return p_sys->p_out->pf_add( p_sys->p_out, p_fmt );
}
static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
{
sout_stream_sys_t *p_sys = (sout_stream_sys_t *)p_stream->p_sys;
if ( id == p_sys->id )
p_sys->id = NULL;
return p_sys->p_out->pf_del( p_sys->p_out, id );
}
static int Send( sout_stream_t *p_stream, sout_stream_id_t *id,
block_t *p_buffer )
{
sout_stream_sys_t *p_sys = (sout_stream_sys_t *)p_stream->p_sys;
if ( id == p_sys->id )
{
block_t *p_block = p_buffer;
while ( p_block != NULL )
{
if ( p_block->i_pts && p_block->i_pts != VLC_TS_INVALID )
p_block->i_pts += p_sys->i_delay;
if ( p_block->i_dts && p_block->i_dts != VLC_TS_INVALID )
p_block->i_dts += p_sys->i_delay;
p_block = p_block->p_next;
}
}
return p_sys->p_out->pf_send( p_sys->p_out, id, p_buffer );
}
......@@ -1015,6 +1015,7 @@ modules/stream_filter/decomp.c
modules/stream_filter/record.c
modules/stream_out/autodel.c
modules/stream_out/bridge.c
modules/stream_out/delay.c
modules/stream_out/description.c
modules/stream_out/display.c
modules/stream_out/dummy.c
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment