path: root/demux
diff options
authorwm4 <wm4@nowhere>2013-11-23 21:22:17 +0100
committerwm4 <wm4@nowhere>2013-11-23 21:22:17 +0100
commit0f5ec05d8f4ae02262dc79a895bce3b465b376f2 (patch)
treeba5fc3f640eeefa44a28695f8cd3f63ba2eec2c9 /demux
parent705a7310e6c823a72c961720f8ae416962f1398a (diff)
audio: move decoder context from sh_audio into new struct
Move all state that basically changes during decoding or is needed in order to manage decoding itself into a new struct (dec_audio). sh_audio (defined in stheader.h) is supposed to be the audio stream header. This should reflect the file headers for the stream. Putting the decoder context there is strange design, to say the least.
Diffstat (limited to 'demux')
1 files changed, 0 insertions, 5 deletions
diff --git a/demux/stheader.h b/demux/stheader.h
index c88ed0b0f7..ab190cca83 100644
--- a/demux/stheader.h
+++ b/demux/stheader.h
@@ -92,16 +92,11 @@ typedef struct sh_audio {
int samplerate;
struct mp_chmap channels;
int i_bps; // == bitrate (compressed bytes/sec)
- // decoder state:
- struct mp_audio_buffer *decode_buffer;
- struct af_stream *afilter; // the audio filter stream
- const struct ad_functions *ad_driver;
// win32-compatible codec parameters:
// note codec extradata may be either under "wf" or "codecdata"
unsigned char *codecdata;
int codecdata_len;
- int pts_offset; // number of samples output by decoder after last known pts
} sh_audio_t;
typedef struct sh_video {