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.
---
libavcodec/vorbisdec.c | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c
index 39c88e6..25c5958 100644
--- a/libavcodec/vorbisdec.c
+++ b/libavcodec/vorbisdec.c
@@ -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;
--
1.8.2.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
