X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_es_out.h;h=b5853456fa8c95a3b97e36715d6104a50abcf53f;hb=90aa6fc5e9e425c6eb6f519224f2b7e868911d36;hp=8d6e16c9cd44b4f1de44f94e45599f1682d4f6fb;hpb=02c94f5640a01d2039e025f596208b391f35a4e4;p=vlc

diff --git a/include/vlc_es_out.h b/include/vlc_es_out.h
index 8d6e16c9cd..b5853456fa 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,7 +18,7 @@
  *
  * 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.
  *****************************************************************************/
 
 #ifndef _VLC_ES_OUT_H
@@ -33,33 +33,42 @@ enum es_out_mode_e
 {
     ES_OUT_MODE_NONE,   /* don't select anything */
     ES_OUT_MODE_ALL,    /* eg for stream output */
-    ES_OUT_MODE_AUTO,   /* best audio/video or for input follow audio-track, spu-track */
+    ES_OUT_MODE_AUTO,   /* best audio/video or for input follow audio-track, sub-track */
     ES_OUT_MODE_PARTIAL /* select programs given after --programs */
 };
 
 enum es_out_query_e
 {
-    /* activate apply of mode */
-    ES_OUT_SET_ACTIVE,  /* arg1= vlc_bool_t                     */
+    /* activate application of mode */
+    ES_OUT_SET_ACTIVE,  /* arg1= bool                     */
     /* see if mode is currently aplied or not */
-    ES_OUT_GET_ACTIVE,  /* arg1= vlc_bool_t*                    */
+    ES_OUT_GET_ACTIVE,  /* arg1= bool*                    */
 
     /* set/get mode */
     ES_OUT_SET_MODE,    /* arg1= int                            */
     ES_OUT_GET_MODE,    /* arg2= int*                           */
 
-    /* set es selected for the es category(audio/video/spu) */
+    /* set ES selected for the es category (audio/video/spu) */
     ES_OUT_SET_ES,      /* arg1= es_out_id_t*                   */
 
-    /* force selection/unselection of the ES (bypass current mode)*/
-    ES_OUT_SET_ES_STATE,/* arg1= es_out_id_t* arg2=vlc_bool_t   */
-    ES_OUT_GET_ES_STATE,/* arg1= es_out_id_t* arg2=vlc_bool_t*  */
+    /* set 'default' tag on ES (copied across from container) */
+    ES_OUT_SET_DEFAULT, /* arg1= es_out_id_t*                   */
+
+    /* force selection/unselection of the ES (bypass current mode) */
+    ES_OUT_SET_ES_STATE,/* arg1= es_out_id_t* arg2=bool   */
+    ES_OUT_GET_ES_STATE,/* arg1= es_out_id_t* arg2=bool*  */
 
     /* */
     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) are in charge of the pace control. They will wait
+     * to slow down the demuxer so that it reads 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,16 @@ 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 */
+    /* Set epg for group (dynamic) */
+    ES_OUT_SET_GROUP_EPG,   /* arg1=int i_group arg2=vlc_epg_t */
+    /* */
+    ES_OUT_DEL_GROUP        /* arg1=int i_group */
 };
 
 struct es_out_t
@@ -78,6 +96,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 );
+    bool      b_sout;
 
     es_out_sys_t    *p_sys;
 };