From b298140b07842bd3573866564ad30ddfef65638c Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 7 Sep 2018 21:58:46 +0200 Subject: demux: return stream file size differently, rip out stream ctrls The stream size return was the only thing that still required doing STREAM_CTRLs from frontend through the demuxer layer. This can be done much easier, so rip it out. Also rip out the now unused infrastructure for STREAM_CTRLs via demuxer layer. --- demux/demux.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'demux/demux.h') diff --git a/demux/demux.h b/demux/demux.h index b8d5cb5ee0..1bb8e2f7c8 100644 --- a/demux/demux.h +++ b/demux/demux.h @@ -32,8 +32,6 @@ enum demux_ctrl { DEMUXER_CTRL_SWITCHED_TRACKS = 1, - DEMUXER_CTRL_IDENTIFY_PROGRAM, - DEMUXER_CTRL_STREAM_CTRL, DEMUXER_CTRL_GET_READER_STATE, DEMUXER_CTRL_GET_BITRATE_STATS, // double[STREAM_TYPE_COUNT] DEMUXER_CTRL_REPLACE_STREAM, @@ -192,6 +190,7 @@ typedef struct demuxer { const demuxer_desc_t *desc; ///< Demuxer description structure const char *filetype; // format name when not identified by demuxer (libavformat) int64_t filepos; // input stream current pos. + int64_t filesize; char *filename; // same as stream->url bool seekable; bool partially_seekable; // true if _maybe_ seekable; implies seekable=true @@ -243,7 +242,6 @@ typedef struct demuxer { // Since the demuxer can run in its own thread, and the stream is not // thread-safe, only the demuxer is allowed to access the stream directly. - // You can freely use demux_stream_control() to send STREAM_CTRLs. // Also note that the stream can get replaced if fully_read is set. struct stream *stream; } demuxer_t; @@ -308,8 +306,6 @@ int demuxer_add_chapter(demuxer_t *demuxer, char *name, void demux_set_stream_tags(struct demuxer *demuxer, struct sh_stream *sh, struct mp_tags *tags); -int demux_stream_control(demuxer_t *demuxer, int ctrl, void *arg); - void demux_metadata_changed(demuxer_t *demuxer); void demux_update(demuxer_t *demuxer); -- cgit v1.2.3