Browse Source

vorbis: fallback to normal division instead of crashing

The use of ff_inverse speeds up slightly arches + compilers that
do not provide a division faster than the whole machinery, such
as ppc32 + gcc4.7, but has operational limits.

Drop the always-enable assert and provide a fallback.
tags/n2.0
Luca Barbato 12 years ago
parent
commit
db347280eb
1 changed files with 14 additions and 9 deletions
  1. +14
    -9
      libavcodec/vorbisdec.c

+ 14
- 9
libavcodec/vorbisdec.c View File

@@ -42,9 +42,6 @@
#define V_MAX_VLCS (1 << 16)
#define V_MAX_PARTITIONS (1 << 20)

#undef NDEBUG
#include <assert.h>

typedef struct {
uint8_t dimensions;
uint8_t lookup_type;
@@ -1319,14 +1316,22 @@ static av_always_inline int setup_classifs(vorbis_context *vc,

av_dlog(NULL, "Classword: %u\n", temp);

assert(vr->classifications > 1 && temp <= 65536); //needed for inverse[]
if (temp <= 65536) {
for (i = partition_count + c_p_c - 1; i >= partition_count; i--) {
temp2 = (((uint64_t)temp) * inverse_class) >> 32;

for (i = partition_count + c_p_c - 1; i >= partition_count; i--) {
temp2 = (((uint64_t)temp) * inverse_class) >> 32;
if (i < vr->ptns_to_read)
vr->classifs[p + i] = temp - temp2 * vr->classifications;
temp = temp2;
}
} else {
for (i = partition_count + c_p_c - 1; i >= partition_count; i--) {
temp2 = temp / vr->classifications;

if (i < vr->ptns_to_read)
vr->classifs[p + i] = temp - temp2 * vr->classifications;
temp = temp2;
if (i < vr->ptns_to_read)
vr->classifs[p + i] = temp - temp2 * vr->classifications;
temp = temp2;
}
}
}
p += vr->ptns_to_read;


Loading…
Cancel
Save