annotate libmpdemux/stheader.h @ 20489:4419e00b54df

Support new flac-in-ogg, fixes bug #229
author reimar
date Sun, 29 Oct 2006 11:05:49 +0000
parents 70a5e89ea4cd
children 8f0c616d7425
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4933
429994672d8c 're-include' possibility
nick
parents: 4875
diff changeset
1 #ifndef __ST_HEADER_H
429994672d8c 're-include' possibility
nick
parents: 4875
diff changeset
2 #define __ST_HEADER_H 1
429994672d8c 're-include' possibility
nick
parents: 4875
diff changeset
3
12341
0db4a3a5b01d removed loader/ dependancy, imported some files from g2, also used patches from Dominik Mierzejewski
alex
parents: 8965
diff changeset
4 #include "aviheader.h"
0db4a3a5b01d removed loader/ dependancy, imported some files from g2, also used patches from Dominik Mierzejewski
alex
parents: 8965
diff changeset
5 #include "ms_hdr.h"
7471
5e56ce70b551 wine headers cleanup
arpi
parents: 7467
diff changeset
6
5e56ce70b551 wine headers cleanup
arpi
parents: 7467
diff changeset
7 // Stream headers:
4196
b75f3bb25261 image field added. 10*10l....
arpi
parents: 3642
diff changeset
8
291
da98e96499bb sh_audio/sh_video added, general codec cleanup
arpi_esp
parents:
diff changeset
9 typedef struct {
19540
70a5e89ea4cd Get rid of demux_aid_vid_mismatch mess.
reimar
parents: 18917
diff changeset
10 int aid;
291
da98e96499bb sh_audio/sh_video added, general codec cleanup
arpi_esp
parents:
diff changeset
11 demux_stream_t *ds;
7467
3a22c16fea46 - cosmetics, reorder
arpi
parents: 7232
diff changeset
12 struct codecs_st *codec;
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
13 unsigned int format;
1656
cd77b8e28f82 new field: inited
arpi
parents: 1546
diff changeset
14 int inited;
18309
87161f96fa66 Change common pts variables from floats to doubles. Individual demuxers
uau
parents: 18242
diff changeset
15 double delay; // relative (to sh_video->timer) time in audio stream
17643
cea08919336b dwStart support for mplayer.
corey
parents: 14819
diff changeset
16 float stream_delay; // number of seconds stream should be delayed (according to dwStart or similar)
291
da98e96499bb sh_audio/sh_video added, general codec cleanup
arpi_esp
parents:
diff changeset
17 // output format:
7467
3a22c16fea46 - cosmetics, reorder
arpi
parents: 7232
diff changeset
18 int sample_format;
291
da98e96499bb sh_audio/sh_video added, general codec cleanup
arpi_esp
parents:
diff changeset
19 int samplerate;
da98e96499bb sh_audio/sh_video added, general codec cleanup
arpi_esp
parents:
diff changeset
20 int samplesize;
da98e96499bb sh_audio/sh_video added, general codec cleanup
arpi_esp
parents:
diff changeset
21 int channels;
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 587
diff changeset
22 int o_bps; // == samplerate*samplesize*channels (uncompr. bytes/sec)
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 587
diff changeset
23 int i_bps; // == bitrate (compressed bytes/sec)
296
c3d7a28a0d1a audio init moved to dec_audio.c
arpi_esp
parents: 291
diff changeset
24 // in buffers:
7604
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7471
diff changeset
25 int audio_in_minsize; // max. compressed packet size (== min. in buffer size)
291
da98e96499bb sh_audio/sh_video added, general codec cleanup
arpi_esp
parents:
diff changeset
26 char* a_in_buffer;
da98e96499bb sh_audio/sh_video added, general codec cleanup
arpi_esp
parents:
diff changeset
27 int a_in_buffer_len;
da98e96499bb sh_audio/sh_video added, general codec cleanup
arpi_esp
parents:
diff changeset
28 int a_in_buffer_size;
7604
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7471
diff changeset
29 // decoder buffers:
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7471
diff changeset
30 int audio_out_minsize; // max. uncompressed packet size (==min. out buffsize)
296
c3d7a28a0d1a audio init moved to dec_audio.c
arpi_esp
parents: 291
diff changeset
31 char* a_buffer;
c3d7a28a0d1a audio init moved to dec_audio.c
arpi_esp
parents: 291
diff changeset
32 int a_buffer_len;
c3d7a28a0d1a audio init moved to dec_audio.c
arpi_esp
parents: 291
diff changeset
33 int a_buffer_size;
7604
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7471
diff changeset
34 // output buffers:
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7471
diff changeset
35 char* a_out_buffer;
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7471
diff changeset
36 int a_out_buffer_len;
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7471
diff changeset
37 int a_out_buffer_size;
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7471
diff changeset
38 // void* audio_out; // the audio_out handle, used for this audio stream
32efb806436e aufio filter layer (libaf) integration to libmpcodecs, mplayer and mencoder
arpi
parents: 7471
diff changeset
39 void* afilter; // the audio filter stream
14819
601e2c8a2922 Remove file-global mpadec, add ad_driver member to sh_audio_t instead.
hzoli
parents: 12341
diff changeset
40 struct ad_functions_s* ad_driver;
8152
4b02f73cb4b9 dlopen() support for ad and vd
alex
parents: 8057
diff changeset
41 #ifdef DYNAMIC_PLUGINS
4b02f73cb4b9 dlopen() support for ad and vd
alex
parents: 8057
diff changeset
42 void *dec_handle;
4b02f73cb4b9 dlopen() support for ad and vd
alex
parents: 8057
diff changeset
43 #endif
7467
3a22c16fea46 - cosmetics, reorder
arpi
parents: 7232
diff changeset
44 // win32-compatible codec parameters:
291
da98e96499bb sh_audio/sh_video added, general codec cleanup
arpi_esp
parents:
diff changeset
45 AVIStreamHeader audio;
7467
3a22c16fea46 - cosmetics, reorder
arpi
parents: 7232
diff changeset
46 WAVEFORMATEX* wf;
3a22c16fea46 - cosmetics, reorder
arpi
parents: 7232
diff changeset
47 // codec-specific:
3642
2cef9d562af0 void* context added - it should keep the codec-specific stuff (struct ptr or HANDLE)
arpi
parents: 2567
diff changeset
48 void* context; // codec-specific stuff (usually HANDLE or struct pointer)
7467
3a22c16fea46 - cosmetics, reorder
arpi
parents: 7232
diff changeset
49 unsigned char* codecdata; // extra header data passed from demuxer to codec
5301
d72c3169a343 Improved MP4 parsing (finally)
atmos4
parents: 5084
diff changeset
50 int codecdata_len;
18242
caac2ca98168 4 - Implement a better way to calculate current audio pts and use it for
rtognimp
parents: 17643
diff changeset
51 double pts; // last known pts value in output from decoder
caac2ca98168 4 - Implement a better way to calculate current audio pts and use it for
rtognimp
parents: 17643
diff changeset
52 int pts_bytes; // bytes output by decoder after last known pts
291
da98e96499bb sh_audio/sh_video added, general codec cleanup
arpi_esp
parents:
diff changeset
53 } sh_audio_t;
da98e96499bb sh_audio/sh_video added, general codec cleanup
arpi_esp
parents:
diff changeset
54
da98e96499bb sh_audio/sh_video added, general codec cleanup
arpi_esp
parents:
diff changeset
55 typedef struct {
19540
70a5e89ea4cd Get rid of demux_aid_vid_mismatch mess.
reimar
parents: 18917
diff changeset
56 int vid;
291
da98e96499bb sh_audio/sh_video added, general codec cleanup
arpi_esp
parents:
diff changeset
57 demux_stream_t *ds;
7467
3a22c16fea46 - cosmetics, reorder
arpi
parents: 7232
diff changeset
58 struct codecs_st *codec;
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
59 unsigned int format;
1656
cd77b8e28f82 new field: inited
arpi
parents: 1546
diff changeset
60 int inited;
8057
10698ce4b2a4 fixed comment - noticed by Alex
arpi
parents: 8056
diff changeset
61 float timer; // absolute time in video stream, since last start/seek
17643
cea08919336b dwStart support for mplayer.
corey
parents: 14819
diff changeset
62 float stream_delay; // number of seconds stream should be delayed (according to dwStart or similar)
7467
3a22c16fea46 - cosmetics, reorder
arpi
parents: 7232
diff changeset
63 // frame counters:
3a22c16fea46 - cosmetics, reorder
arpi
parents: 7232
diff changeset
64 float num_frames; // number of frames played
3a22c16fea46 - cosmetics, reorder
arpi
parents: 7232
diff changeset
65 int num_frames_decoded; // number of frames decoded
8965
14fa6a121a47 fixed the well-known DVD/DVB audio delay bug :)
arpi
parents: 8158
diff changeset
66 // timing (mostly for mpeg):
18309
87161f96fa66 Change common pts variables from floats to doubles. Individual demuxers
uau
parents: 18242
diff changeset
67 double pts; // predicted/interpolated PTS of the current frame
87161f96fa66 Change common pts variables from floats to doubles. Individual demuxers
uau
parents: 18242
diff changeset
68 double i_pts; // PTS for the _next_ I/P frame
18917
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18708
diff changeset
69 double buffered_pts[20];
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18708
diff changeset
70 int num_buffered_pts;
7467
3a22c16fea46 - cosmetics, reorder
arpi
parents: 7232
diff changeset
71 // output format: (set by demuxer)
3a22c16fea46 - cosmetics, reorder
arpi
parents: 7232
diff changeset
72 float fps; // frames per second (set only if constant fps)
3a22c16fea46 - cosmetics, reorder
arpi
parents: 7232
diff changeset
73 float frametime; // 1/fps
3a22c16fea46 - cosmetics, reorder
arpi
parents: 7232
diff changeset
74 float aspect; // aspect ratio stored in the file (for prescaling)
3a22c16fea46 - cosmetics, reorder
arpi
parents: 7232
diff changeset
75 int i_bps; // == bitrate (compressed bytes/sec)
3a22c16fea46 - cosmetics, reorder
arpi
parents: 7232
diff changeset
76 int disp_w,disp_h; // display size (filled by fileformat parser)
3a22c16fea46 - cosmetics, reorder
arpi
parents: 7232
diff changeset
77 // output driver/filters: (set by libmpcodecs core)
303
828ec81e0d64 codecs.conf support
arpi_esp
parents: 296
diff changeset
78 unsigned int outfmtidx;
7467
3a22c16fea46 - cosmetics, reorder
arpi
parents: 7232
diff changeset
79 void* video_out; // the video_out handle, used for this video stream
3a22c16fea46 - cosmetics, reorder
arpi
parents: 7232
diff changeset
80 void* vfilter; // the video filter chain, used for this video stream
3a22c16fea46 - cosmetics, reorder
arpi
parents: 7232
diff changeset
81 int vf_inited;
8152
4b02f73cb4b9 dlopen() support for ad and vd
alex
parents: 8057
diff changeset
82 #ifdef DYNAMIC_PLUGINS
4b02f73cb4b9 dlopen() support for ad and vd
alex
parents: 8057
diff changeset
83 void *dec_handle;
4b02f73cb4b9 dlopen() support for ad and vd
alex
parents: 8057
diff changeset
84 #endif
7467
3a22c16fea46 - cosmetics, reorder
arpi
parents: 7232
diff changeset
85 // win32-compatible codec parameters:
291
da98e96499bb sh_audio/sh_video added, general codec cleanup
arpi_esp
parents:
diff changeset
86 AVIStreamHeader video;
7467
3a22c16fea46 - cosmetics, reorder
arpi
parents: 7232
diff changeset
87 BITMAPINFOHEADER* bih;
8158
bffdd162d034 export imagedescription for qt video codecs
arpi
parents: 8152
diff changeset
88 void* ImageDesc; // for quicktime codecs
7467
3a22c16fea46 - cosmetics, reorder
arpi
parents: 7232
diff changeset
89 // codec-specific:
3a22c16fea46 - cosmetics, reorder
arpi
parents: 7232
diff changeset
90 void* context; // codec-specific stuff (usually HANDLE or struct pointer)
291
da98e96499bb sh_audio/sh_video added, general codec cleanup
arpi_esp
parents:
diff changeset
91 } sh_video_t;
da98e96499bb sh_audio/sh_video added, general codec cleanup
arpi_esp
parents:
diff changeset
92
7467
3a22c16fea46 - cosmetics, reorder
arpi
parents: 7232
diff changeset
93 // demuxer.c:
19540
70a5e89ea4cd Get rid of demux_aid_vid_mismatch mess.
reimar
parents: 18917
diff changeset
94 #define new_sh_audio(d, i) new_sh_audio_aid(d, i, i)
70a5e89ea4cd Get rid of demux_aid_vid_mismatch mess.
reimar
parents: 18917
diff changeset
95 sh_audio_t* new_sh_audio_aid(demuxer_t *demuxer,int id,int aid);
70a5e89ea4cd Get rid of demux_aid_vid_mismatch mess.
reimar
parents: 18917
diff changeset
96 #define new_sh_video(d, i) new_sh_video_vid(d, i, i)
70a5e89ea4cd Get rid of demux_aid_vid_mismatch mess.
reimar
parents: 18917
diff changeset
97 sh_video_t* new_sh_video_vid(demuxer_t *demuxer,int id,int vid);
18708
9e2b300db17b Change free_sh_audio() to take demuxer and stream id as parameters
uau
parents: 18309
diff changeset
98 void free_sh_audio(demuxer_t *demuxer, int id);
5084
2fd327bf64fc added get_sh_video/audio and realmedia seeking
alex
parents: 4973
diff changeset
99 void free_sh_video(sh_video_t *sh);
426
26e513f392b2 new stream selection code
arpi_esp
parents: 399
diff changeset
100
7467
3a22c16fea46 - cosmetics, reorder
arpi
parents: 7232
diff changeset
101 // video.c:
2567
ea6158be8103 video frame reading cleanup
arpi
parents: 2341
diff changeset
102 int video_read_properties(sh_video_t *sh_video);
ea6158be8103 video frame reading cleanup
arpi
parents: 2341
diff changeset
103 int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char** start,int force_fps);
4933
429994672d8c 're-include' possibility
nick
parents: 4875
diff changeset
104
429994672d8c 're-include' possibility
nick
parents: 4875
diff changeset
105 #endif