aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-10-12 07:45:23 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-10-12 22:38:40 +0200
commitd7a503ecf9f42561b4a6e2207812a97074f43687 (patch)
tree83d56c32339b3f348803dddfdfac9f2a47d22c64 /libavcodec
parent3977aeb78cb88575171bbbb515520cb01e9bbe15 (diff)
downloadffmpeg-d7a503ecf9f42561b4a6e2207812a97074f43687.tar.gz
avcodec/ivi: Avoid reversing BE VLC codes for LE bitstream reader
Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/ivi.c22
1 files changed, 2 insertions, 20 deletions
diff --git a/libavcodec/ivi.c b/libavcodec/ivi.c
index c10984e83e..5e1180a5f0 100644
--- a/libavcodec/ivi.c
+++ b/libavcodec/ivi.c
@@ -35,7 +35,6 @@
#include "avcodec.h"
#include "get_bits.h"
#include "internal.h"
-#include "mathops.h"
#include "ivi.h"
#include "ivi_dsp.h"
@@ -115,23 +114,6 @@ static int ivi_mc(const IVIBandDesc *band, ivi_mc_func mc, ivi_mc_avg_func mc_av
return 0;
}
-/**
- * Reverse "nbits" bits of the value "val" and return the result
- * in the least significant bits.
- */
-static uint16_t inv_bits(uint16_t val, int nbits)
-{
- uint16_t res;
-
- if (nbits <= 8) {
- res = ff_reverse[val] >> (8 - nbits);
- } else
- res = ((ff_reverse[val & 0xFF] << 8) +
- (ff_reverse[val >> 8])) >> (16 - nbits);
-
- return res;
-}
-
/*
* Generate a huffman codebook from the given descriptor
* and convert it into the FFmpeg VLC table.
@@ -162,7 +144,7 @@ static int ivi_create_huff_from_desc(const IVIHuffDesc *cb, VLC *vlc, int flag)
if (bits[pos] > IVI_VLC_BITS)
return AVERROR_INVALIDDATA; /* invalid descriptor */
- codewords[pos] = inv_bits((prefix | j), bits[pos]);
+ codewords[pos] = prefix | j;
if (!bits[pos])
bits[pos] = 1;
@@ -172,7 +154,7 @@ static int ivi_create_huff_from_desc(const IVIHuffDesc *cb, VLC *vlc, int flag)
/* number of codewords = pos */
return init_vlc(vlc, IVI_VLC_BITS, pos, bits, 1, 1, codewords, 2, 2,
- (flag ? INIT_VLC_USE_NEW_STATIC : 0) | INIT_VLC_LE);
+ (flag ? INIT_VLC_USE_NEW_STATIC : 0) | INIT_VLC_OUTPUT_LE);
}
av_cold void ff_ivi_init_static_vlc(void)