/** \file bitstream.c Bitstream API for the wma decoder. */
-#include <stdlib.h>
-#include <inttypes.h>
-#include <stdio.h>
-#include <string.h>
#include <regex.h>
#include "para.h"
#include "wma.h"
#include "bitstream.h"
-/** Read an 8, 16, or 32 bit entity from a VLC table. */
-#define GET_DATA(v, table, i, size) \
-{\
- const uint8_t *ptr = (const uint8_t *)table + i * size; \
- switch (size) { \
- case 1: \
- v = *(const uint8_t *)ptr; \
- break; \
- case 2: \
- v = *(const uint16_t *)ptr; \
- break; \
- default: \
- v = *(const uint32_t *)ptr; \
- break; \
- } \
+static inline uint32_t get_data(const void *table, int i, int size)
+{
+ const uint8_t *ptr = (const uint8_t *)table + i * size;
+ uint32_t v;
+
+ switch (size) {
+ case 1:
+ v = *(const uint8_t *)ptr;
+ break;
+ case 2:
+ v = *(const uint16_t *)ptr;
+ break;
+ default:
+ v = *(const uint32_t *)ptr;
+ break;
+ }
+ return v;
}
static void alloc_table(struct vlc *vlc, int size)
/* map codes and compute auxiliary table sizes */
for (i = 0; i < nb_codes; i++) {
- GET_DATA(n, bits, i, 1);
+ n = get_data(bits, i, 1);
/* we accept tables with holes */
n -= n_prefix;
if (n <= 0)
continue;
- GET_DATA(code, codes, i, codes_size);
+ code = get_data(codes, i, codes_size);
/* if code matches the prefix, it is in the table */
if ((code >> n) != code_prefix)
continue;
* \param gbc The getbit context structure.
* \param table The vlc tables to use.
* \param bits The number of bits which will be read at once.
- * \param max_depth The number of times \a bits bits must be read to completely
- * read the longest vlc code = (max_vlc_length + bits - 1) / bits.
*
* The \a bits parameter must be identical to the \a nb_bits value supplied to
* \ref init_vlc().
*
* \return The vlc code.
*/
-int get_vlc(struct getbit_context *gbc, VLC_TYPE(*table)[2], int bits,
- int max_depth)
+int get_vlc(struct getbit_context *gbc, VLC_TYPE(*table)[2], int bits)
{
int n, idx, nb_bits, code;
idx = show_bits(gbc, bits);
code = table[idx][0];
n = table[idx][1];
- if (max_depth > 1 && n < 0) {
+ if (n < 0) {
skip_bits(gbc, bits);
nb_bits = -n;
idx = show_bits(gbc, nb_bits) + code;
code = table[idx][0];
n = table[idx][1];
- if (max_depth > 2 && n < 0) {
+ if (n < 0) {
skip_bits(gbc, nb_bits);
nb_bits = -n;
idx = show_bits(gbc, nb_bits) + code;