X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_es_out.h;h=03ea27a0f695f79d7633aa684176be3c4ba5de69;hb=35905d252b88615051062c93fea0986f65ee4346;hp=13dc518cc5407fc1679399ba728ebfdabb86e57f;hpb=37e87108a37856c3cdbfba1abd7fa69ea6e5894a;p=vlc

diff --git a/include/vlc_es_out.h b/include/vlc_es_out.h
index 13dc518cc5..03ea27a0f6 100644
--- a/include/vlc_es_out.h
+++ b/include/vlc_es_out.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
- * vlc_es_out.h
+ * vlc_es_out.h: es_out (demuxer output) descriptor, queries and methods
  *****************************************************************************
- * Copyright (C) 1999-2004 VideoLAN
+ * Copyright (C) 1999-2004 the VideoLAN team
  * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -18,9 +18,13 @@
  *
  * 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.
  *****************************************************************************/
 
+#if !defined( __LIBVLC__ )
+  #error You are not libvlc or one of its plugins. You cannot include this file
+#endif
+
 #ifndef _VLC_ES_OUT_H
 #define _VLC_ES_OUT_H 1
 
@@ -59,7 +63,12 @@ enum es_out_query_e
     ES_OUT_SET_GROUP,   /* arg1= int                            */
     ES_OUT_GET_GROUP,   /* arg1= int*                           */
 
-    /* PCR handling, dts/pts will be automatically computed using thoses PCR */
+    /* PCR handling, dts/pts will be automatically computed using thoses PCR
+     * XXX: SET_PCR(_GROUP) is in charge of the pace control. They will wait to slow
+     * down the demuxer to read at the right speed.
+     * XXX: if you want PREROLL just call RESET_PCR and ES_OUT_SET_NEXT_DISPLAY_TIME and send
+     * data to the decoder *without* calling SET_PCR until preroll is finished.
+     */
     ES_OUT_SET_PCR,             /* arg1=int64_t i_pcr(microsecond!) (using default group 0)*/
     ES_OUT_SET_GROUP_PCR,       /* arg1= int i_group, arg2=int64_t i_pcr(microsecond!)*/
     ES_OUT_RESET_PCR,           /* no arg */
@@ -69,7 +78,14 @@ enum es_out_query_e
     ES_OUT_GET_TS,             /* arg1=int64_t i_ts(microsecond!) (using default group 0), arg2=int64_t* converted i_ts */
 
     /* Try not to use this one as it is a bit hacky */
-    ES_OUT_SET_FMT      /* arg1= es_out_id_t* arg2=es_format_t* */
+    ES_OUT_SET_FMT,     /* arg1= es_out_id_t* arg2=es_format_t* */
+
+    /* Allow preroll of data (data with dts/pts < i_pts for one ES will be decoded but not displayed */
+    ES_OUT_SET_NEXT_DISPLAY_TIME,   /* arg1=es_out_id_t* arg2=int64_t i_pts(microsecond) */
+    /* Set meta data for group (dynamic) */
+    ES_OUT_SET_GROUP_META,  /* arg1=int i_group arg2=vlc_meta_t */
+    /* */
+    ES_OUT_DEL_GROUP        /* arg1=int i_group */
 };
 
 struct es_out_t
@@ -78,6 +94,7 @@ struct es_out_t
     int          (*pf_send)   ( es_out_t *, es_out_id_t *, block_t * );
     void         (*pf_del)    ( es_out_t *, es_out_id_t * );
     int          (*pf_control)( es_out_t *, int i_query, va_list );
+    vlc_bool_t      b_sout;
 
     es_out_sys_t    *p_sys;
 };