Mercurial > libavcodec.hg
diff flac.h @ 9254:8d570fb097f8 libavcodec
flacdec: split frame header decoding and validation into a separate
function
author | jbr |
---|---|
date | Tue, 24 Mar 2009 01:17:55 +0000 |
parents | e150ca8d7f91 |
children | 7dd2a45249a9 |
line wrap: on
line diff
--- a/flac.h Mon Mar 23 22:09:13 2009 +0000 +++ b/flac.h Tue Mar 24 01:17:55 2009 +0000 @@ -57,22 +57,31 @@ FLAC_EXTRADATA_FORMAT_FULL_HEADER = 1 }; +#define FLACCOMMONINFO \ + int samplerate; /**< sample rate */\ + int channels; /**< number of channels */\ + int bps; /**< bits-per-sample */\ + /** * Data needed from the Streaminfo header for use by the raw FLAC demuxer * and/or the FLAC decoder. */ #define FLACSTREAMINFO \ + FLACCOMMONINFO \ int max_blocksize; /**< maximum block size, in samples */\ int max_framesize; /**< maximum frame size, in bytes */\ - int samplerate; /**< sample rate */\ - int channels; /**< number of channels */\ - int bps; /**< bits-per-sample */\ int64_t samples; /**< total number of samples */\ typedef struct FLACStreaminfo { FLACSTREAMINFO } FLACStreaminfo; +typedef struct FLACFrameInfo { + FLACCOMMONINFO + int blocksize; /**< block size of the frame */ + int ch_mode; /**< channel decorrelation mode */ +} FLACFrameInfo; + /** * Parse the Streaminfo metadata block * @param[out] avctx codec context to set basic stream parameters