diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2009-03-19 03:04:21 +0000 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2009-03-19 03:04:21 +0000 |
| commit | 07d16e2ecfb7da976ef56829c4fd6f93ca94b00e (patch) | |
| tree | 7405a89ceefe40f86faf665063d2b8f0a02f1145 /libavcodec/flacdec.c | |
| parent | bb504ac45ec5cf3cb114895cf721950b5fcda34c (diff) | |
share some constants between the FLAC encoder and FLAC decoder
Originally committed as revision 18041 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/flacdec.c')
| -rw-r--r-- | libavcodec/flacdec.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c index cd746f224d..7f2542a301 100644 --- a/libavcodec/flacdec.c +++ b/libavcodec/flacdec.c @@ -46,9 +46,6 @@ #undef NDEBUG #include <assert.h> -#define MAX_CHANNELS 8 -#define MAX_BLOCKSIZE 65535 - enum decorrelation_type { INDEPENDENT, LEFT_SIDE, @@ -69,7 +66,7 @@ typedef struct FLACContext { enum decorrelation_type decorrelation; ///< channel decorrelation type in the current frame int got_streaminfo; ///< indicates if the STREAMINFO has been read - int32_t *decoded[MAX_CHANNELS]; ///< decoded samples + int32_t *decoded[FLAC_MAX_CHANNELS]; ///< decoded samples uint8_t *bitstream; unsigned int bitstream_size; unsigned int bitstream_index; @@ -190,7 +187,7 @@ void ff_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo *s, skip_bits(&gb, 16); /* skip min blocksize */ s->max_blocksize = get_bits(&gb, 16); - if (s->max_blocksize < 16) { + if (s->max_blocksize < FLAC_MIN_BLOCKSIZE) { av_log(avctx, AV_LOG_WARNING, "invalid max blocksize: %d\n", s->max_blocksize); s->max_blocksize = 16; @@ -510,9 +507,9 @@ static int decode_frame(FLACContext *s, int alloc_data_size) sample_rate_code = get_bits(&s->gb, 4); assignment = get_bits(&s->gb, 4); /* channel assignment */ - if (assignment < 8 && s->channels == assignment+1) + if (assignment < FLAC_MAX_CHANNELS && s->channels == assignment+1) decorrelation = INDEPENDENT; - else if (assignment >=8 && assignment < 11 && s->channels == 2) + else if (assignment >= FLAC_MAX_CHANNELS && assignment < 11 && s->channels == 2) decorrelation = LEFT_SIDE + assignment - 8; else { av_log(s->avctx, AV_LOG_ERROR, "unsupported channel assignment %d (channels=%d)\n", |