From 5c7ecad93a771d71a773cace996afd706bbef3d2 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 7 Sep 2018 22:26:48 +0200 Subject: demux: simplify API for returning cache status Instead of going through those weird DEMUXER_CTRLs, query this information directly. I'm not sure which kind of brain damage made me use CTRLs for these. Since there are no other DEMUXER_CTRLs that make sense for the frontend, remove the remaining infrastructure for them too. --- demux/demux.h | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'demux/demux.h') diff --git a/demux/demux.h b/demux/demux.h index 1bb8e2f7c8..495127f785 100644 --- a/demux/demux.h +++ b/demux/demux.h @@ -32,8 +32,6 @@ enum demux_ctrl { DEMUXER_CTRL_SWITCHED_TRACKS = 1, - DEMUXER_CTRL_GET_READER_STATE, - DEMUXER_CTRL_GET_BITRATE_STATS, // double[STREAM_TYPE_COUNT] DEMUXER_CTRL_REPLACE_STREAM, }; @@ -43,7 +41,7 @@ struct demux_seek_range { double start, end; }; -struct demux_ctrl_reader_state { +struct demux_reader_state { bool eof, underrun, idle; double ts_duration; double ts_reader; // approx. timerstamp of decoder position @@ -60,12 +58,6 @@ struct demux_ctrl_reader_state { struct demux_seek_range seek_ranges[MAX_SEEK_RANGES]; }; -struct demux_ctrl_stream_ctrl { - int ctrl; - void *arg; - int res; -}; - #define SEEK_FACTOR (1 << 1) // argument is in range [0,1] #define SEEK_FORWARD (1 << 2) // prefer later time if not exact // (if unset, prefer earlier time) @@ -289,7 +281,8 @@ void demux_flush(struct demuxer *demuxer); int demux_seek(struct demuxer *demuxer, double rel_seek_secs, int flags); void demux_set_ts_offset(struct demuxer *demuxer, double offset); -int demux_control(struct demuxer *demuxer, int cmd, void *arg); +void demux_get_bitrate_stats(struct demuxer *demuxer, double *rates); +void demux_get_reader_state(struct demuxer *demuxer, struct demux_reader_state *r); void demux_block_reading(struct demuxer *demuxer, bool block); -- cgit v1.2.3