comparison flac.c @ 6728:56c5bbd0996f libavcodec

split out some decoder context params to a shared macro
author jbr
date Fri, 02 May 2008 21:33:14 +0000
parents 706dd1afb389
children 071888974d8a
comparison
equal deleted inserted replaced
6727:706dd1afb389 6728:56c5bbd0996f
38 #define ALT_BITSTREAM_READER 38 #define ALT_BITSTREAM_READER
39 #include "avcodec.h" 39 #include "avcodec.h"
40 #include "bitstream.h" 40 #include "bitstream.h"
41 #include "golomb.h" 41 #include "golomb.h"
42 #include "crc.h" 42 #include "crc.h"
43 #include "flac.h"
43 44
44 #undef NDEBUG 45 #undef NDEBUG
45 #include <assert.h> 46 #include <assert.h>
46 47
47 #define MAX_CHANNELS 8 48 #define MAX_CHANNELS 8
54 RIGHT_SIDE, 55 RIGHT_SIDE,
55 MID_SIDE, 56 MID_SIDE,
56 }; 57 };
57 58
58 typedef struct FLACContext { 59 typedef struct FLACContext {
60 FLACSTREAMINFO
61
59 AVCodecContext *avctx; 62 AVCodecContext *avctx;
60 GetBitContext gb; 63 GetBitContext gb;
61 64
62 int min_blocksize, max_blocksize;
63 int max_framesize;
64 int samplerate, channels;
65 int blocksize/*, last_blocksize*/; 65 int blocksize/*, last_blocksize*/;
66 int bps, curr_bps; 66 int curr_bps;
67 enum decorrelation_type decorrelation; 67 enum decorrelation_type decorrelation;
68 68
69 int32_t *decoded[MAX_CHANNELS]; 69 int32_t *decoded[MAX_CHANNELS];
70 uint8_t *bitstream; 70 uint8_t *bitstream;
71 int bitstream_size; 71 int bitstream_size;