[FFmpeg-cvslog] vorbis: Kill some pointless debug code
Diego Biurrun
git at videolan.org
Wed Jun 29 11:44:01 CEST 2016
ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Sat Jun 4 08:41:15 2016 +0200| [6d8fd614ff957af242efcd8a6a0619874382f3a4] | committer: Diego Biurrun
vorbis: Kill some pointless debug code
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6d8fd614ff957af242efcd8a6a0619874382f3a4
---
libavcodec/vorbis.c | 26 ++------------------------
1 file changed, 2 insertions(+), 24 deletions(-)
diff --git a/libavcodec/vorbis.c b/libavcodec/vorbis.c
index d29769c..2c54320 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)
More information about the ffmpeg-cvslog
mailing list