diff options
Diffstat (limited to 'libmpdemux/stheader.h')
-rw-r--r-- | libmpdemux/stheader.h | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/libmpdemux/stheader.h b/libmpdemux/stheader.h index a64e65fb73..f80cd2cf6a 100644 --- a/libmpdemux/stheader.h +++ b/libmpdemux/stheader.h @@ -19,16 +19,18 @@ #ifndef MPLAYER_STHEADER_H #define MPLAYER_STHEADER_H -#include "demuxer.h" #include "aviheader.h" #include "ms_hdr.h" +struct MPOpts; +struct demuxer; // Stream headers: -typedef struct { +typedef struct sh_audio { + struct MPOpts *opts; int aid; - demux_stream_t *ds; - struct codecs_st *codec; + struct demux_stream *ds; + struct codecs *codec; unsigned int format; int initialized; float stream_delay; // number of seconds stream should be delayed (according to dwStart or similar) @@ -54,8 +56,8 @@ typedef struct { int a_out_buffer_len; int a_out_buffer_size; // void* audio_out; // the audio_out handle, used for this audio stream - struct af_stream_s *afilter; // the audio filter stream - struct ad_functions_s* ad_driver; + struct af_stream *afilter; // the audio filter stream + struct ad_functions *ad_driver; #ifdef CONFIG_DYNAMIC_PLUGINS void *dec_handle; #endif @@ -72,10 +74,11 @@ typedef struct { int default_track; } sh_audio_t; -typedef struct { +typedef struct sh_video { + struct MPOpts *opts; int vid; - demux_stream_t *ds; - struct codecs_st *codec; + struct demux_stream *ds; + struct codecs *codec; unsigned int format; int initialized; float timer; // absolute time in video stream, since last start/seek @@ -99,7 +102,9 @@ typedef struct { int disp_w,disp_h; // display size (filled by fileformat parser) // output driver/filters: (set by libmpcodecs core) unsigned int outfmtidx; - struct vf_instance_s *vfilter; // the video filter chain, used for this video stream + struct vf_instance *vfilter; // the video filter chain, used for this video stream + int output_flags; // query_format() results for output filters+vo + const struct vd_functions *vd_driver; int vf_initialized; #ifdef CONFIG_DYNAMIC_PLUGINS void *dec_handle; @@ -112,26 +117,25 @@ typedef struct { void* context; // codec-specific stuff (usually HANDLE or struct pointer) } sh_video_t; -typedef struct { +typedef struct sh_sub { + struct MPOpts *opts; int sid; char type; // t = text, v = VobSub, a = SSA/ASS unsigned char* extradata; // extra header data passed from demuxer int extradata_len; -#ifdef CONFIG_ASS - ass_track_t* ass_track; // for SSA/ASS streams (type == 'a') -#endif + struct ass_track_s *ass_track; // for SSA/ASS streams (type == 'a') char* lang; // track language int default_track; } sh_sub_t; // demuxer.c: #define new_sh_audio(d, i) new_sh_audio_aid(d, i, i) -sh_audio_t* new_sh_audio_aid(demuxer_t *demuxer,int id,int aid); +sh_audio_t* new_sh_audio_aid(struct demuxer *demuxer,int id,int aid); #define new_sh_video(d, i) new_sh_video_vid(d, i, i) -sh_video_t* new_sh_video_vid(demuxer_t *demuxer,int id,int vid); +sh_video_t* new_sh_video_vid(struct demuxer *demuxer,int id,int vid); #define new_sh_sub(d, i) new_sh_sub_sid(d, i, i) -sh_sub_t *new_sh_sub_sid(demuxer_t *demuxer, int id, int sid); -void free_sh_audio(demuxer_t *demuxer, int id); +sh_sub_t *new_sh_sub_sid(struct demuxer *demuxer, int id, int sid); +void free_sh_audio(struct demuxer *demuxer, int id); void free_sh_video(sh_video_t *sh); // video.c: |