aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Gisquet <christophe.gisquet@gmail.com>2014-10-14 02:02:36 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-10-28 12:22:03 +0100
commit4fa772acbbac6467165de1ea67a7f303a029cb1d (patch)
treee5f8547810970ac57f12b5ada6f2d1510815fbd5
parent280da99a8fdd0533a1507643f24ee070a65785d3 (diff)
downloadffmpeg-4fa772acbbac6467165de1ea67a7f303a029cb1d.tar.gz
dv: increase VLC reading bits to 10
This also requires a bump in the table size of bit patterns to 1664. From 356 to 348 cycles. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/dv.c4
-rw-r--r--libavcodec/dv.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/dv.c b/libavcodec/dv.c
index 6cd8a89f8b..2bc7fc5ab1 100644
--- a/libavcodec/dv.c
+++ b/libavcodec/dv.c
@@ -50,7 +50,7 @@
#include "simple_idct.h"
/* XXX: also include quantization */
-RL_VLC_ELEM ff_dv_rl_vlc[1184];
+RL_VLC_ELEM ff_dv_rl_vlc[1664];
static inline void dv_calc_mb_coordinates(const AVDVProfile *d, int chan,
int seq, int slot, uint16_t *tbl)
@@ -243,7 +243,7 @@ av_cold int ff_dvvideo_init(AVCodecContext *avctx)
* to accelerate the parsing of partial codes */
init_vlc(&dv_vlc, TEX_VLC_BITS, j, new_dv_vlc_len,
1, 1, new_dv_vlc_bits, 2, 2, 0);
- av_assert1(dv_vlc.table_size == 1184);
+ av_assert1(dv_vlc.table_size == 1664);
for (i = 0; i < dv_vlc.table_size; i++) {
int code = dv_vlc.table[i][0];
diff --git a/libavcodec/dv.h b/libavcodec/dv.h
index e68d7b02d5..5d282633dd 100644
--- a/libavcodec/dv.h
+++ b/libavcodec/dv.h
@@ -90,9 +90,9 @@ enum dv_pack_type {
*/
#define DV_MAX_BPM 8
-#define TEX_VLC_BITS 9
+#define TEX_VLC_BITS 10
-extern RL_VLC_ELEM ff_dv_rl_vlc[1184];
+extern RL_VLC_ELEM ff_dv_rl_vlc[1664];
int ff_dv_init_dynamic_tables(DVVideoContext *s, const AVDVProfile *d);