RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

cleanup: reindent stheader.h 

Also improve some comments and change two fields from int to bool.
This commit is contained in:
Uoti Urpala 2011-07-03 10:30:50 +03:00
parent c8b3088c18
commit eb61456065
1 changed files with 102 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
libmpdemux/stheader.h
View File

@ -34,18 +34,20 @@ struct demuxer;
struct codecs *codec; \ struct codecs *codec; \
unsigned int format; \ unsigned int format; \
int initialized; \ int initialized; \
float stream_delay; /* number of seconds stream should be delayed (according to dwStart or similar) */ \ /* number of seconds stream should be delayed \
* (according to dwStart or similar) */ \
float stream_delay; \
/* things needed for parsing */ \ /* things needed for parsing */ \
int needs_parsing; \ bool needs_parsing; \
struct AVCodecContext *avctx; \ struct AVCodecContext *avctx; \
struct AVCodecParserContext *parser; \ struct AVCodecParserContext *parser; \
/* audio: last known pts value in output from decoder \ /* audio: last known pts value in output from decoder \
* video: predicted/interpolated PTS of the current frame */ \ * video: predicted/interpolated PTS of the current frame */ \
double pts; \ double pts; \
/* codec-specific: */ \ /* decoder context */ \
void* context; /* codec-specific stuff (usually HANDLE or struct pointer) */ \ void *context; \
char* lang; /* track language */ \ char *lang; /* track language */ \
int default_track; \ bool default_track; \
typedef struct sh_common { typedef struct sh_common {
SH_COMMON SH_COMMON
@ -63,13 +65,13 @@ typedef struct sh_audio {
int o_bps; // == samplerate*samplesize*channels (uncompr. bytes/sec) int o_bps; // == samplerate*samplesize*channels (uncompr. bytes/sec)
int i_bps; // == bitrate (compressed bytes/sec) int i_bps; // == bitrate (compressed bytes/sec)
// in buffers: // in buffers:
int audio_in_minsize; // max. compressed packet size (== min. in buffer size) int audio_in_minsize; // initial size to allocate for a_in_buffer if any
char* a_in_buffer; char *a_in_buffer; // input buffer used by some decoders
int a_in_buffer_len; int a_in_buffer_len;
int a_in_buffer_size; int a_in_buffer_size;
// decoder buffers: // decoder buffers:
int audio_out_minsize; // max. uncompressed packet size (==min. out buffsize) int audio_out_minsize; // minimal output from decoder may be this much
char* a_buffer; char *a_buffer; // buffer for decoder output
int a_buffer_len; int a_buffer_len;
int a_buffer_size; int a_buffer_size;
struct af_stream *afilter; // the audio filter stream struct af_stream *afilter; // the audio filter stream
@ -79,9 +81,9 @@ typedef struct sh_audio {
#endif #endif
// win32-compatible codec parameters: // win32-compatible codec parameters:
AVIStreamHeader audio; AVIStreamHeader audio;
WAVEFORMATEX* wf; WAVEFORMATEX *wf;
// codec-specific: // note codec extradata may be either under "wf" or "codecdata"
unsigned char* codecdata; // extra header data passed from demuxer to codec unsigned char *codecdata;
int codecdata_len; int codecdata_len;
int pts_bytes; // bytes output by decoder after last known pts int pts_bytes; // bytes output by decoder after last known pts
} sh_audio_t; } sh_audio_t;
@ -93,8 +95,7 @@ typedef struct sh_video {
// frame counters: // frame counters:
float num_frames; // number of frames played float num_frames; // number of frames played
int num_frames_decoded; // number of frames decoded int num_frames_decoded; // number of frames decoded
// timing (mostly for mpeg): double i_pts; // PTS for the _next_ I/P frame (internal mpeg demuxing)
double i_pts; // PTS for the _next_ I/P frame
float next_frame_time; float next_frame_time;
double last_pts; double last_pts;
double buffered_pts[32]; double buffered_pts[32];
@ -110,51 +111,52 @@ typedef struct sh_video {
float fps; // frames per second (set only if constant fps) float fps; // frames per second (set only if constant fps)
float frametime; // 1/fps float frametime; // 1/fps
float aspect; // aspect ratio stored in the file (for prescaling) float aspect; // aspect ratio stored in the file (for prescaling)
float stream_aspect; // aspect ratio stored in the media headers (e.g. in DVD IFO files) float stream_aspect; // aspect ratio in media headers (DVD IFO files)
int i_bps; // == bitrate (compressed bytes/sec) int i_bps; // == bitrate (compressed bytes/sec)
int disp_w,disp_h; // display size (filled by fileformat parser) int disp_w, disp_h; // display size (filled by demuxer)
// output driver/filters: (set by libmpcodecs core) // output driver/filters: (set by libmpcodecs core)
unsigned int outfmt; unsigned int outfmt;
unsigned int outfmtidx; unsigned int outfmtidx;
struct vf_instance *vfilter; // the video filter chain, used for this video stream struct vf_instance *vfilter; // video filter chain
int output_flags; // query_format() results for output filters+vo int output_flags; // query_format() results for output filters+vo
const struct vd_functions *vd_driver; const struct vd_functions *vd_driver;
int vf_initialized; int vf_initialized; // -1 failed, 0 not done, 1 done
#ifdef CONFIG_DYNAMIC_PLUGINS #ifdef CONFIG_DYNAMIC_PLUGINS
void *dec_handle; void *dec_handle;
#endif #endif
// win32-compatible codec parameters: // win32-compatible codec parameters:
AVIStreamHeader video; AVIStreamHeader video;
BITMAPINFOHEADER* bih; BITMAPINFOHEADER *bih;
void* ImageDesc; // for quicktime codecs void *ImageDesc; // for quicktime codecs
} sh_video_t; } sh_video_t;
typedef struct sh_sub { typedef struct sh_sub {
SH_COMMON SH_COMMON
int sid; int sid;
char type; // t = text, v = VobSub, a = SSA/ASS char type; // t = text, v = VobSub, a = SSA/ASS, m, x, b, d, p
bool active; // after track switch decoder may stay initialized, not active bool active; // after track switch decoder may stay initialized, not active
unsigned char* extradata; // extra header data passed from demuxer unsigned char *extradata; // extra header data passed from demuxer
int extradata_len; int extradata_len;
const struct sd_functions *sd_driver; const struct sd_functions *sd_driver;
} sh_sub_t; } sh_sub_t;
// demuxer.c: // demuxer.c:
#define new_sh_audio(d, i) new_sh_audio_aid(d, i, i) #define new_sh_audio(d, i) new_sh_audio_aid(d, i, i)
sh_audio_t* new_sh_audio_aid(struct demuxer *demuxer,int id,int aid); struct sh_audio *new_sh_audio_aid(struct demuxer *demuxer, int id, int aid);
#define new_sh_video(d, i) new_sh_video_vid(d, i, i) #define new_sh_video(d, i) new_sh_video_vid(d, i, i)
sh_video_t* new_sh_video_vid(struct demuxer *demuxer,int id,int vid); struct sh_video *new_sh_video_vid(struct demuxer *demuxer, int id, int vid);
#define new_sh_sub(d, i) new_sh_sub_sid(d, i, i) #define new_sh_sub(d, i) new_sh_sub_sid(d, i, i)
sh_sub_t *new_sh_sub_sid(struct demuxer *demuxer, int id, int sid); struct sh_sub *new_sh_sub_sid(struct demuxer *demuxer, int id, int sid);
struct sh_sub *new_sh_sub_sid_lang(struct demuxer *demuxer, int id, int sid, struct sh_sub *new_sh_sub_sid_lang(struct demuxer *demuxer, int id, int sid,
const char *lang); const char *lang);
void free_sh_audio(struct demuxer *demuxer, int id); void free_sh_audio(struct demuxer *demuxer, int id);
void free_sh_video(sh_video_t *sh); void free_sh_video(struct sh_video *sh);
const char *sh_sub_type2str(int type); const char *sh_sub_type2str(int type);
// video.c: // video.c:
int video_read_properties(sh_video_t *sh_video); int video_read_properties(struct sh_video *sh_video);
int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char** start,int force_fps); int video_read_frame(struct sh_video *sh_video, float *frame_time_ptr,
unsigned char **start, int force_fps);
#endif /* MPLAYER_STHEADER_H */ #endif /* MPLAYER_STHEADER_H */