From fcae305acbd8b20550699d6c9774e366dba0b4f1 Mon Sep 17 00:00:00 2001 From: "Matthias P. Braendli" Date: Wed, 17 Feb 2016 20:29:43 +0100 Subject: Remove unused code, cosmetics --- libtoolame-dab/bitstream.c | 98 ++++------------------------------------------ libtoolame-dab/toolame.c | 46 ++++++++++++---------- 2 files changed, 34 insertions(+), 110 deletions(-) diff --git a/libtoolame-dab/bitstream.c b/libtoolame-dab/bitstream.c index d426ffc..b426a4b 100644 --- a/libtoolame-dab/bitstream.c +++ b/libtoolame-dab/bitstream.c @@ -9,8 +9,10 @@ * * bit_stream.c package * Author: Jean-Georges Fritsch, C-Cube Microsystems + * Matthias P. Braendli, www.opendigitalradio.org * Changes * Apr 2000 - removed all the file input routines. MFC + * Feb 2016 - removed all sort of things to make Toolame a library. mpb *****************************************************************************/ /******************************************************************** @@ -26,17 +28,9 @@ /*close_bit_stream(); close the device containing the bit stream */ /*alloc_buffer(); open and initialize the buffer; */ /*desalloc_buffer(); empty and close the buffer */ -/*back_track_buffer(); goes back N bits in the buffer */ /*put1bit(); write 1 bit from the bit stream */ /*put1bit(); write 1 bit from the bit stream */ /*putbits(); write N bits from the bit stream */ -/*byte_ali_putbits(); write byte aligned the next N bits into the bit stream*/ -/*unsigned long sstell(); return the current bit stream length (in bits) */ -/*int end_bs(); return 1 if the end of bit stream reached otherwise 0 */ -/*int seek_sync(); return 1 if a sync word was found in the bit stream */ -/* otherwise returns 0 */ - -/* refill the buffer from the input device when the buffer becomes empty */ /* You must have one frame in memory if you are in DAB mode */ /* in conformity of the norme ETS 300 401 http://www.etsi.org */ @@ -47,9 +41,13 @@ int minimum = MINIMUM; void empty_buffer (Bit_stream_struc * bs, int minimum) { int j = 0; + if (bs->output_buffer_written != 0) { + fprintf(stderr, "ERROR: libtoolame output buffer was not emptied\n"); + } + for (int i = bs->buf_size - 1; i >= minimum; i--) { if (j >= bs->output_buffer_size) { - fprintf(stderr, "Warning: libtoolame output buffer too small (%d vs %d)!\n", + fprintf(stderr, "ERROR: libtoolame output buffer too small (%d vs %d)!\n", bs->output_buffer_size, bs->buf_size - minimum); break; } @@ -102,29 +100,7 @@ void desalloc_buffer (Bit_stream_struc * bs) free (bs->buf); } -int putmask[9] = { 0x0, 0x1, 0x3, 0x7, 0xf, 0x1f, 0x3f, 0x7f, 0xff }; -int clearmask[9] = { 0xff, 0xfe, 0xfc, 0xf8, 0xf0, 0xe0, 0xc0, 0x80, 0x0 }; - -void back_track_buffer (Bit_stream_struc * bs, int N) - /* goes back N bits in the buffer */ -{ - int tmp = N - (N / 8) * 8; - register int i; - - bs->totbit -= N; - for (i = bs->buf_byte_idx; i < bs->buf_byte_idx + N / 8 - 1; i++) - bs->buf[i] = 0; - bs->buf_byte_idx += N / 8; - if ((tmp + bs->buf_bit_idx) <= 8) { - bs->buf_bit_idx += tmp; - } else { - bs->buf_byte_idx++; - bs->buf_bit_idx += (tmp - 8); - } - bs->buf[bs->buf_byte_idx] &= clearmask[bs->buf_bit_idx]; -} - -int mask[8] = { 0x1, 0x2, 0x4, 0x8, 0x10, 0x20, 0x40, 0x80 }; +const int putmask[9] = { 0x0, 0x1, 0x3, 0x7, 0xf, 0x1f, 0x3f, 0x7f, 0xff }; /*write 1 bit from the bit stream */ void put1bit (Bit_stream_struc * bs, int bit) @@ -168,61 +144,3 @@ void putbits (Bit_stream_struc * bs, unsigned int val, int N) } } -/*write N bits byte aligned into the bit stream */ -void byte_ali_putbits (Bit_stream_struc * bs, unsigned int val, int N) -{ - unsigned long aligning; - - if (N > MAX_LENGTH) - fprintf (stderr, "Cannot read or write more than %d bits at a time.\n", - MAX_LENGTH); - aligning = sstell (bs) % 8; - if (aligning) - putbits (bs, (unsigned int) 0, (int) (8 - aligning)); - - putbits (bs, val, N); -} - -/*return the current bit stream length (in bits)*/ -unsigned long sstell (Bit_stream_struc * bs) -{ - return (bs->totbit); -} - -/*return the status of the bit stream*/ -/* returns 1 if end of bit stream was reached */ -/* returns 0 if end of bit stream was not reached */ -int end_bs (Bit_stream_struc * bs) -{ - return (bs->eobs); -} - -/***************************************************************************** - * - * End of bit_stream.c package - * - *****************************************************************************/ - -#define BUFSIZE 4096 -static unsigned long offset, totbit = 0; -static unsigned int buf[BUFSIZE]; - -/*return the current bit stream length (in bits)*/ -unsigned long hsstell () -{ - return (totbit); -} - -/* int putmask[9]={0x0, 0x1, 0x3, 0x7, 0xf, 0x1f, 0x3f, 0x7f, 0xff}; */ -//extern int putmask[9]; MFC Feb 2003 Redundant redeclaration - -/*write N bits into the bit stream */ -void hputbuf (unsigned int val, int N) -{ - if (N != 8) { - fprintf (stderr, "Not Supported yet!!\n"); - exit (-3); - } - buf[offset % BUFSIZE] = val; - offset++; -} diff --git a/libtoolame-dab/toolame.c b/libtoolame-dab/toolame.c index bea186c..9eed2f6 100644 --- a/libtoolame-dab/toolame.c +++ b/libtoolame-dab/toolame.c @@ -351,7 +351,8 @@ int toolame_encode_frame( for (int sb = 0; sb < SBLIMIT; sb++) smr[ch][sb] = smrdef[ch][sb]; } - } else { + } + else { /* calculate the psymodel */ switch (model) { case -1: @@ -446,19 +447,17 @@ int toolame_encode_frame( exit (0); } - if (glopts.quickmode == TRUE) + if (glopts.quickmode == TRUE) { /* copy the smr values and reuse them later */ for (int ch = 0; ch < nch; ch++) { for (int sb = 0; sb < SBLIMIT; sb++) smrdef[ch][sb] = smr[ch][sb]; } + } - if (glopts.verbosity > 4) + if (glopts.verbosity > 4) { smr_dump(smr, nch); - - - - + } } #ifdef NEWENCODE @@ -466,13 +465,15 @@ int toolame_encode_frame( main_bit_allocation_new (smr, scfsi, bit_alloc, &adb, &frame, &glopts); //main_bit_allocation (smr, scfsi, bit_alloc, &adb, &frame, &glopts); - if (error_protection) + if (error_protection) { CRC_calc (&frame, bit_alloc, scfsi, &crc); + } write_header (&frame, &bs); //encode_info (&frame, &bs); - if (error_protection) + if (error_protection) { putbits (&bs, crc, 16); + } write_bit_alloc (bit_alloc, &frame, &bs); //encode_bit_alloc (bit_alloc, &frame, &bs); write_scalefactors(bit_alloc, scfsi, scalar, &frame, &bs); @@ -486,11 +487,13 @@ int toolame_encode_frame( #else transmission_pattern (scalar, scfsi, &frame); main_bit_allocation (smr, scfsi, bit_alloc, &adb, &frame, &glopts); - if (error_protection) + if (error_protection) { CRC_calc (&frame, bit_alloc, scfsi, &crc); + } encode_info (&frame, &bs); - if (error_protection) + if (error_protection) { encode_CRC (crc, &bs); + } encode_bit_alloc (bit_alloc, &frame, &bs); encode_scale (bit_alloc, scfsi, scalar, &frame, &bs); subband_quantization (scalar, *sb_sample, j_scale, *j_sample, bit_alloc, @@ -538,16 +541,19 @@ int toolame_encode_frame( return bs.output_buffer_written; } -void smr_dump(double smr[2][SBLIMIT], int nch) { - int ch, sb; +// Dump function for psy model comparison +void smr_dump(double smr[2][SBLIMIT], int nch) +{ + fprintf(stdout, "SMR:"); - fprintf(stdout,"SMR:"); - for (ch = 0;ch