diff options
| author | wm4 <wm4@nowhere> | 2014-07-05 16:57:56 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-07-05 17:07:15 +0200 |
| commit | 338004bcfc224727d1477d303aa1521bf3ac21be (patch) | |
| tree | 5066a689bb13f4c00a360d9b33a485d81eb17d72 /stream/stream.h | |
| parent | 4d2a4afdef24c343b98e71dddcb3382e85c09c96 (diff) | |
| download | mpv-338004bcfc224727d1477d303aa1521bf3ac21be.tar.bz2 mpv-338004bcfc224727d1477d303aa1521bf3ac21be.tar.xz | |
dvd, bluray, cdda: add demux_disc containing all related hacks
DVD and Bluray (and to some extent cdda) require awful hacks all over
the codebase to make them work. The main reason is that they act like
container, but are entirely implemented on the stream layer. The raw
mpeg data resulting from these streams must be "extended" with the
container-like metadata transported via STREAM_CTRLs. The result were
hacks all over demux.c and some higher-level parts.
Add a "disc" pseudo-demuxer, and move all these hacks and special-cases
to it.
Diffstat (limited to 'stream/stream.h')
| -rw-r--r-- | stream/stream.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/stream/stream.h b/stream/stream.h index 389a0a56e8..f2663f3435 100644 --- a/stream/stream.h +++ b/stream/stream.h @@ -39,6 +39,7 @@ enum streamtype { STREAMTYPE_MF, STREAMTYPE_EDL, STREAMTYPE_AVDEVICE, + STREAMTYPE_CDDA, }; #define STREAM_BUFFER_SIZE 2048 @@ -80,8 +81,6 @@ enum stream_ctrl { STREAM_CTRL_GET_CACHE_IDLE, STREAM_CTRL_RESUME_CACHE, STREAM_CTRL_RECONNECT, - // DVD/Bluray, signal general support for GET_CURRENT_TIME etc. - STREAM_CTRL_MANAGES_TIMELINE, STREAM_CTRL_GET_START_TIME, STREAM_CTRL_GET_CHAPTER_TIME, STREAM_CTRL_GET_DVD_INFO, @@ -243,8 +242,6 @@ stream_t *open_memory_stream(void *data, int len); bool stream_check_interrupt(struct stream *s); -bool stream_manages_timeline(stream_t *s); - void mp_url_unescape_inplace(char *buf); char *mp_url_escape(void *talloc_ctx, const char *s, const char *ok); |