libav*: create a new avcommon_compat.h file for backward compatibility

[vlc] / modules / stream_out / delay.c

diff --git a/modules/stream_out/delay.c b/modules/stream_out/delay.c
index 44c1c08bb93fcf560299672d179eda03a3b63d37..ba6f9ef23096ca029e43ece68f46801972c532ce 100644 (file)
--- a/modules/stream_out/delay.c
+++ b/modules/stream_out/delay.c
@@ -1,24 +1,24 @@
 /*****************************************************************************
  * delay.c: delay a stream
  *****************************************************************************
- * Copyright (C) 2011 VideoLAN
+ * Copyright © 2009-2011 VLC authors and 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
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 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.
+ * GNU Lesser 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.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -36,13 +36,14 @@
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-#define ID_TEXT N_("ID")
+#define ID_TEXT N_("Elementary Stream ID")
 #define ID_LONGTEXT N_( \
     "Specify an identifier integer for this elementary stream" )
 
-#define DELAY_TEXT N_("Delay")
+#define DELAY_TEXT N_("Delay of the ES (ms)")
 #define DELAY_LONGTEXT N_( \
-    "Specify a delay for this elementary stream (positive or negative)" )
+    "Specify a delay (in ms) for this elementary stream. " \
+    "Positive means delay and negative means advance." )
 
 static int  Open    ( vlc_object_t * );
 static void Close   ( vlc_object_t * );
@@ -50,10 +51,12 @@ static void Close   ( vlc_object_t * );
 #define SOUT_CFG_PREFIX "sout-delay-"
 
 vlc_module_begin()
-    set_shortname( _("delay"))
-    set_description( _("Delay a stream"))
+    set_shortname( N_("Delay"))
+    set_description( N_("Delay a stream"))
     set_capability( "sout stream", 50 )
     add_shortcut( "delay" )
+    set_category( CAT_SOUT )
+    set_subcategory( SUBCAT_SOUT_STREAM )
     set_callbacks( Open, Close )
     add_integer( SOUT_CFG_PREFIX "id", 0, ID_TEXT, ID_LONGTEXT,
                  false )
@@ -75,7 +78,6 @@ 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;
@@ -88,26 +90,23 @@ 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;
     }
 
+    p_sys = calloc( 1, sizeof( sout_stream_sys_t ) );
+    if( !p_sys )
+        return VLC_ENOMEM;
+
+
     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_sys->i_id = var_GetInteger( p_stream, SOUT_CFG_PREFIX "id" );
+    p_sys->i_delay = 1000 * var_GetInteger( p_stream, SOUT_CFG_PREFIX "delay" );
 
     p_stream->pf_add    = Add;
     p_stream->pf_del    = Del;
@@ -137,12 +136,11 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
     {
         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 );
+        p_sys->id = p_stream->p_next->pf_add( p_stream->p_next, p_fmt );
         return p_sys->id;
     }
 
-
-    return p_sys->p_out->pf_add( p_sys->p_out, p_fmt );
+    return p_stream->p_next->pf_add( p_stream->p_next, p_fmt );
 }
 
 static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
@@ -152,7 +150,7 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
     if ( id == p_sys->id )
         p_sys->id = NULL;
 
-    return p_sys->p_out->pf_del( p_sys->p_out, id );
+    return p_stream->p_next->pf_del( p_stream->p_next, id );
 }
 
 static int Send( sout_stream_t *p_stream, sout_stream_id_t *id,
@@ -173,5 +171,5 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_t *id,
         }
     }
 
-    return p_sys->p_out->pf_send( p_sys->p_out, id, p_buffer );
+    return p_stream->p_next->pf_send( p_stream->p_next, id, p_buffer );
 }