diff options
| author | Diego Biurrun <diego@biurrun.de> | 2016-06-04 08:41:15 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2016-06-07 13:09:57 +0200 |
| commit | 6d8fd614ff957af242efcd8a6a0619874382f3a4 (patch) | |
| tree | 98b4ce25080a12793e59275ed268a688706332ac /libavcodec/vorbis.c | |
| parent | 59c6509d9f0236acbc317198eab76dab8320bced (diff) | |
| download | ffmpeg-6d8fd614ff957af242efcd8a6a0619874382f3a4.tar.gz | |
vorbis: Kill some pointless debug code
Diffstat (limited to 'libavcodec/vorbis.c')
| -rw-r--r-- | libavcodec/vorbis.c | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/libavcodec/vorbis.c b/libavcodec/vorbis.c index d29769cead..2c543208fa 100644 --- a/libavcodec/vorbis.c +++ b/libavcodec/vorbis.c @@ -22,9 +22,9 @@ * @author Denes Balatoni ( dbalatoni programozo hu ) */ -#define BITSTREAM_READER_LE +#include "libavutil/common.h" + #include "avcodec.h" -#include "get_bits.h" #include "vorbis.h" @@ -52,13 +52,8 @@ unsigned int ff_vorbis_nth_root(unsigned int x, unsigned int n) int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, unsigned num) { uint32_t exit_at_level[33] = { 404 }; - unsigned i, j, p, code; -#ifdef DEBUG - GetBitContext gb; -#endif - for (p = 0; (bits[p] == 0) && (p < num); ++p) ; if (p == num) @@ -70,14 +65,6 @@ int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, unsigned num) for (i = 0; i < bits[p]; ++i) exit_at_level[i+1] = 1 << i; -#ifdef DEBUG - av_log(NULL, AV_LOG_INFO, " %u. of %u code len %d code %d - ", p, num, bits[p], codes[p]); - init_get_bits(&gb, (uint8_t *)&codes[p], bits[p]); - for (i = 0; i < bits[p]; ++i) - av_log(NULL, AV_LOG_INFO, "%s", get_bits1(&gb) ? "1" : "0"); - av_log(NULL, AV_LOG_INFO, "\n"); -#endif - ++p; for (; p < num; ++p) { @@ -97,15 +84,6 @@ int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, unsigned num) for (j = i + 1 ;j <= bits[p]; ++j) exit_at_level[j] = code + (1 << (j - 1)); codes[p] = code; - -#ifdef DEBUG - av_log(NULL, AV_LOG_INFO, " %d. code len %d code %d - ", p, bits[p], codes[p]); - init_get_bits(&gb, (uint8_t *)&codes[p], bits[p]); - for (i = 0; i < bits[p]; ++i) - av_log(NULL, AV_LOG_INFO, "%s", get_bits1(&gb) ? "1" : "0"); - av_log(NULL, AV_LOG_INFO, "\n"); -#endif - } //no exits should be left (underspecified tree - ie. unused valid vlcs - not allowed by SPEC) |