Mercurial > libavcodec.hg
diff flacdec.c @ 9188:f534d0cca450 libavcodec
share some constants between the FLAC encoder and FLAC decoder
author | jbr |
---|---|
date | Thu, 19 Mar 2009 03:04:21 +0000 |
parents | b980183eb831 |
children | 443f056ba7e7 |
line wrap: on
line diff
--- a/flacdec.c Wed Mar 18 20:10:09 2009 +0000 +++ b/flacdec.c Thu Mar 19 03:04:21 2009 +0000 @@ -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 @@ 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 @@ 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 @@ 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",