-#define GET_VLC(code, name, gb, table, bits, max_depth)\
-{\
- int n, index, nb_bits;\
-\
- index= SHOW_UBITS(name, gb, bits);\
- code = table[index][0];\
- n = table[index][1];\
-\
- if(max_depth > 1 && n < 0){\
- LAST_SKIP_BITS(name, gb, bits)\
- UPDATE_CACHE(name, gb)\
-\
- nb_bits = -n;\
-\
- index= SHOW_UBITS(name, gb, nb_bits) + code;\
- code = table[index][0];\
- n = table[index][1];\
- if(max_depth > 2 && n < 0){\
- LAST_SKIP_BITS(name, gb, nb_bits)\
- UPDATE_CACHE(name, gb)\
-\
- nb_bits = -n;\
-\
- index= SHOW_UBITS(name, gb, nb_bits) + code;\
- code = table[index][0];\
- n = table[index][1];\
- }\
- }\
- SKIP_BITS(name, gb, n)\
+static inline int get_vlc(struct getbit_context *gb, VLC_TYPE(*table)[2],
+ int bits, int max_depth)
+{
+ int n, idx, nb_bits, code;
+
+ OPEN_READER(re, gb)
+ UPDATE_CACHE(re, gb)
+ idx = SHOW_UBITS(re, gb, bits);
+ code = table[idx][0];
+ n = table[idx][1];
+ if (max_depth > 1 && n < 0) {
+ SKIP_COUNTER(re, gb, bits)
+ UPDATE_CACHE(re, gb)
+ nb_bits = -n;
+ idx = SHOW_UBITS(re, gb, nb_bits) + code;
+ code = table[idx][0];
+ n = table[idx][1];
+ if (max_depth > 2 && n < 0) {
+ SKIP_COUNTER(re, gb, nb_bits)
+ UPDATE_CACHE(re, gb)
+ nb_bits = -n;
+ idx = SHOW_UBITS(re, gb, nb_bits) + code;
+ code = table[idx][0];
+ n = table[idx][1];
+ }
+ }
+ SKIP_BITS(re, gb, n)
+ CLOSE_READER(re, gb)
+ return code;