X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Fes_out.h;h=89ece06ae337c42c1ab4c04576d493352e0fc5e1;hb=291ea8c16b4345c2dc4a2a5254c9f03b64b293d6;hp=f254317975a71707c0199b39d5516931a9d9cedb;hpb=c2f9cc4472c2db298c263a35176cede8aca42d71;p=vlc

diff --git a/src/input/es_out.h b/src/input/es_out.h
index f254317975..89ece06ae3 100644
--- a/src/input/es_out.h
+++ b/src/input/es_out.h
@@ -31,13 +31,62 @@
 
 #include <vlc_common.h>
 
+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, sub-track */
+    ES_OUT_MODE_PARTIAL,/* select programs given after --programs */
+    ES_OUT_MODE_END     /* mark the es_out as dead */
+};
+
 enum es_out_query_private_e
 {
+    /* set/get mode */
+    ES_OUT_SET_MODE = ES_OUT_PRIVATE_START,         /* arg1= int                            */
+
     /* Get date to wait before demuxing more data */
-    ES_OUT_GET_WAKE_UP = ES_OUT_PRIVATE_START,   /* arg1=mtime_t*            res=cannot fail */
+    ES_OUT_GET_WAKE_UP,                             /* arg1=mtime_t*            res=cannot fail */
+
+    /* Wrapper for some ES command to work with id */
+    ES_OUT_SET_ES_BY_ID,
+    ES_OUT_RESTART_ES_BY_ID,
+    ES_OUT_SET_ES_DEFAULT_BY_ID,
+    ES_OUT_GET_ES_OBJECTS_BY_ID,                    /* arg1=int id, vlc_object_t **dec, vout_thread_t **, aout_instance_t ** res=can fail*/
+
+    /* Get buffering state */
+    ES_OUT_GET_BUFFERING,                           /* arg1=bool*               res=cannot fail */
+
+    /* Set delay for a ES category */
+    ES_OUT_SET_DELAY,                               /* arg1=es_category_e,      res=cannot fail */
+
+    /* Set record state */
+    ES_OUT_SET_RECORD_STATE,                        /* arg1=bool                res=can fail */
+
+    /* Set pause state */
+    ES_OUT_SET_PAUSE_STATE,                         /* arg1=bool b_source_paused, bool b_paused arg2=mtime_t   res=can fail */
+
+    /* Set rate */
+    ES_OUT_SET_RATE,                                /* arg1=int i_source_rate arg2=int i_rate                  res=can fail */
+
+    /* Set a new time */
+    ES_OUT_SET_TIME,                                /* arg1=mtime_t             res=can fail */
+
+    /* Set next frame */
+    ES_OUT_SET_FRAME_NEXT,                          /*                          res=can fail */
 
+    /* Set position/time/length */
+    ES_OUT_SET_TIMES,                               /* arg1=double f_position arg2=mtime_t i_time arg3=mtime_t i_length res=cannot fail */
+
+    /* Set jitter */
+    ES_OUT_SET_JITTER,                              /* arg1=mtime_t i_pts_delay arg2= mtime_t i_pts_jitter, arg2=int i_cr_average res=cannot fail */
 };
 
+static inline void es_out_SetMode( es_out_t *p_out, int i_mode )
+{
+    int i_ret = es_out_Control( p_out, ES_OUT_SET_MODE, i_mode );
+    assert( !i_ret );
+}
 static inline mtime_t es_out_GetWakeup( es_out_t *p_out )
 {
     mtime_t i_wu;
@@ -46,20 +95,65 @@ static inline mtime_t es_out_GetWakeup( es_out_t *p_out )
     assert( !i_ret );
     return i_wu;
 }
+static inline bool es_out_GetBuffering( es_out_t *p_out )
+{
+    bool b;
+    int i_ret = es_out_Control( p_out, ES_OUT_GET_BUFFERING, &b );
 
-es_out_t  *input_EsOutNew( input_thread_t *, int i_rate );
+    assert( !i_ret );
+    return b;
+}
+static inline bool es_out_GetEmpty( es_out_t *p_out )
+{
+    bool b;
+    int i_ret = es_out_Control( p_out, ES_OUT_GET_EMPTY, &b );
+
+    assert( !i_ret );
+    return b;
+}
+static inline void es_out_SetDelay( es_out_t *p_out, int i_cat, mtime_t i_delay )
+{
+    int i_ret = es_out_Control( p_out, ES_OUT_SET_DELAY, i_cat, i_delay );
+    assert( !i_ret );
+}
+static inline int es_out_SetRecordState( es_out_t *p_out, bool b_record )
+{
+    return es_out_Control( p_out, ES_OUT_SET_RECORD_STATE, b_record );
+}
+static inline int es_out_SetPauseState( es_out_t *p_out, bool b_source_paused, bool b_paused, mtime_t i_date )
+{
+    return es_out_Control( p_out, ES_OUT_SET_PAUSE_STATE, b_source_paused, b_paused, i_date );
+}
+static inline int es_out_SetRate( es_out_t *p_out, int i_source_rate, int i_rate )
+{
+    return es_out_Control( p_out, ES_OUT_SET_RATE, i_source_rate, i_rate );
+}
+static inline int es_out_SetTime( es_out_t *p_out, mtime_t i_date )
+{
+    return es_out_Control( p_out, ES_OUT_SET_TIME, i_date );
+}
+static inline int es_out_SetFrameNext( es_out_t *p_out )
+{
+    return es_out_Control( p_out, ES_OUT_SET_FRAME_NEXT );
+}
+static inline void es_out_SetTimes( es_out_t *p_out, double f_position, mtime_t i_time, mtime_t i_length )
+{
+    int i_ret = es_out_Control( p_out, ES_OUT_SET_TIMES, f_position, i_time, i_length );
+    assert( !i_ret );
+}
+static inline void es_out_SetJitter( es_out_t *p_out,
+                                     mtime_t i_pts_delay, mtime_t i_pts_jitter, int i_cr_average )
+{
+    int i_ret = es_out_Control( p_out, ES_OUT_SET_JITTER,
+                                i_pts_delay, i_pts_jitter, i_cr_average );
+    assert( !i_ret );
+}
+static inline int es_out_GetEsObjects( es_out_t *p_out, int i_id,
+                                       vlc_object_t **pp_decoder, vout_thread_t **pp_vout, aout_instance_t **pp_aout )
+{
+    return es_out_Control( p_out, ES_OUT_GET_ES_OBJECTS_BY_ID, i_id, pp_decoder, pp_vout, pp_aout );
+}
 
-es_out_id_t *input_EsOutGetFromID( es_out_t *, int i_id );
-void       input_EsOutSetDelay( es_out_t *, int i_cat, int64_t );
-int        input_EsOutSetRecord( es_out_t *, bool b_record );
-void       input_EsOutChangeRate( es_out_t *, int );
-void       input_EsOutChangePause( es_out_t *, bool b_paused, mtime_t i_date );
-void       input_EsOutChangePosition( es_out_t * );
-bool       input_EsOutDecodersIsEmpty( es_out_t * );
-bool       input_EsOutIsBuffering( es_out_t * );
-void       input_EsOutFrameNext( es_out_t * );
-
-void       input_EsOutLock( es_out_t * );
-void       input_EsOutUnlock( es_out_t * );
+es_out_t  *input_EsOutNew( input_thread_t *, int i_rate );
 
 #endif