X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_es_out.h;h=667f8e14e525096fc55f6f08d16e766fa55fa071;hb=07b57983913ddb1547f66575b85c33db7ec2616d;hp=fe1f458c08fc97e98f7bfca15ca213ffb1b92498;hpb=bf12bbf66e7ed8a0762fd1e3227199b4e4255153;p=vlc diff --git a/include/vlc_es_out.h b/include/vlc_es_out.h index fe1f458c08..667f8e14e5 100644 --- a/include/vlc_es_out.h +++ b/include/vlc_es_out.h @@ -33,7 +33,7 @@ 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-channel, spu-channel */ + ES_OUT_MODE_AUTO, /* best audio/video or for input follow audio-track, sub-track */ ES_OUT_MODE_PARTIAL /* select programs given after --programs */ }; @@ -59,7 +59,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 +74,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