X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Fes_out.h;h=d0b8111929044767c4a52ec1cda91b0d65995221;hb=830905f60a7db37ab87c5043d09b50ae9ad81594;hp=4fb3026b0c711ee1e5e66cfefbc0f7da6f6402b5;hpb=57882e0f55c854615251b67e9a8ae90faa86fa55;p=vlc

diff --git a/src/input/es_out.h b/src/input/es_out.h
index 4fb3026b0c..d0b8111929 100644
--- a/src/input/es_out.h
+++ b/src/input/es_out.h
@@ -58,7 +58,7 @@ enum es_out_query_private_e
     ES_OUT_GET_BUFFERING,                           /* arg1=bool*               res=cannot fail */
 
     /* Set delay for a ES category */
-    ES_OUT_SET_DELAY,                               /* arg1=es_category_e,      res=can fail */
+    ES_OUT_SET_DELAY,                               /* arg1=es_category_e,      res=cannot fail */
 
     /* Set record state */
     ES_OUT_SET_RECORD_STATE,                        /* arg1=bool                res=can fail */
@@ -79,7 +79,10 @@ enum es_out_query_private_e
     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=int i_cr_average res=cannot fail */
+    ES_OUT_SET_JITTER,                              /* arg1=mtime_t i_pts_delay arg2= mtime_t i_pts_jitter, arg2=int i_cr_average res=cannot fail */
+
+    /* Get forced group */
+    ES_OUT_GET_GROUP_FORCED,                        /* arg1=int * res=cannot fail */
 };
 
 static inline void es_out_SetMode( es_out_t *p_out, int i_mode )
@@ -111,9 +114,10 @@ static inline bool es_out_GetEmpty( es_out_t *p_out )
     assert( !i_ret );
     return b;
 }
-static inline int es_out_SetDelay( es_out_t *p_out, int i_cat, mtime_t i_delay )
+static inline void es_out_SetDelay( es_out_t *p_out, int i_cat, mtime_t i_delay )
 {
-    return es_out_Control( p_out, ES_OUT_SET_DELAY, i_cat, 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 )
 {
@@ -140,9 +144,11 @@ static inline void es_out_SetTimes( es_out_t *p_out, double f_position, mtime_t
     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, int i_cr_average )
+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_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,
@@ -150,6 +156,13 @@ static inline int es_out_GetEsObjects( es_out_t *p_out, int i_id,
 {
     return es_out_Control( p_out, ES_OUT_GET_ES_OBJECTS_BY_ID, i_id, pp_decoder, pp_vout, pp_aout );
 }
+static inline int es_out_GetGroupForced( es_out_t *p_out )
+{
+    int i_group;
+    int i_ret = es_out_Control( p_out, ES_OUT_GET_GROUP_FORCED, &i_group );
+    assert( !i_ret );
+    return i_group;
+}
 
 es_out_t  *input_EsOutNew( input_thread_t *, int i_rate );