SVQ1: 4-byte-align codebook tables

These tables are accessed as uint32 so they must be suitably aligned.

Originally committed as revision 21488 to svn://svn.ffmpeg.org/ffmpeg/trunk
release/0.6
Måns Rullgård 15 years ago
parent 7e2ef1b9e1
commit e3d8807315
  1. 18
      libavcodec/svq1_cb.h

@ -34,8 +34,10 @@
#include <stdint.h>
#include <stdlib.h>
#include "libavutil/mem.h"
/* 6x16-entry codebook for inter-coded 4x2 vectors */
static const int8_t svq1_inter_codebook_4x2[768] = {
DECLARE_ALIGNED(4, static const int8_t, svq1_inter_codebook_4x2)[768] = {
7, 2, -6, -7, 7, 3, -3, -4, -7, -2, 7, 8, -8, -4, 3, 4,
19, 17, 9, 3,-14,-16,-12, -8,-18,-16, -8, -3, 11, 14, 12, 8,
7,-16,-10, 20, 7,-17,-10, 20, -6, 18, 8,-21, -7, 18, 9,-20,
@ -87,7 +89,7 @@ static const int8_t svq1_inter_codebook_4x2[768] = {
};
/* 6x16-entry codebook for inter-coded 4x4 vectors */
static const int8_t svq1_inter_codebook_4x4[1536] = {
DECLARE_ALIGNED(4, static const int8_t, svq1_inter_codebook_4x4)[1536] = {
4, 0, -6, -7, -4, -8,-13, -9, -8, -8, -1, 6, -2, 5, 22, 27,
-16, -7, 11, 10,-18, -7, 13, 10,-15, -4, 12, 8, -9, -1, 9, 5,
-2, 2, 15,-16, -3, 2, 19,-19, -3, 2, 19,-19, -2, 3, 15,-14,
@ -187,7 +189,7 @@ static const int8_t svq1_inter_codebook_4x4[1536] = {
};
/* 6x16-entry codebook for inter-coded 8x4 vectors */
static const int8_t svq1_inter_codebook_8x4[3072] = {
DECLARE_ALIGNED(4, static const int8_t, svq1_inter_codebook_8x4)[3072] = {
9, 8, 4, 0, -3, -4, -4, -3, 9, 8, 4, -1, -4, -5, -5, -3,
8, 7, 3, -2, -5, -5, -5, -4, 6, 4, 1, -2, -4, -5, -4, -3,
-12,-14,-11, -4, 1, 5, 6, 6, -8,-10, -7, -5, -2, 1, 1, 1,
@ -383,7 +385,7 @@ static const int8_t svq1_inter_codebook_8x4[3072] = {
};
/* 6x16-entry codebook for inter-coded 8x8 vectors */
static const int8_t svq1_inter_codebook_8x8[6144] = {
DECLARE_ALIGNED(4, static const int8_t, svq1_inter_codebook_8x8)[6144] = {
-4, -3, 4, 5, 2, 1, 1, 0, -5, -3, 5, 5, 2, 1, 0, 0,
-6, -4, 5, 5, 2, 1, 0, 0, -7, -4, 4, 5, 2, 1, 0, 0,
-8, -5, 3, 4, 2, 1, 0, 0, -8, -6, 3, 4, 1, 1, 1, 0,
@ -778,7 +780,7 @@ const int8_t* const ff_svq1_inter_codebooks[6] = {
};
/* 6x16-entry codebook for intra-coded 4x2 vectors */
static const int8_t svq1_intra_codebook_4x2[768] = {
DECLARE_ALIGNED(4, static const int8_t, svq1_intra_codebook_4x2)[768] = {
12, 13, 13, 11, -7,-10,-15,-17,-16,-15,-12,-10, 11, 15, 15, 12,
2, 17, 20, 15,-45,-24, 2, 13, 21, 20, -6,-36, 12, 16, -1,-27,
-18,-21, 10, 45,-11,-20, -7, 21, 43, -8,-28, 0, 33,-16,-28, 3,
@ -830,7 +832,7 @@ static const int8_t svq1_intra_codebook_4x2[768] = {
};
/* 6x16-entry codebook for intra-coded 4x4 vectors */
static const int8_t svq1_intra_codebook_4x4[1536] = {
DECLARE_ALIGNED(4, static const int8_t, svq1_intra_codebook_4x4)[1536] = {
-11, -3, 3, 6,-10, -1, 5, 7, -9, -1, 6, 7, -9, -1, 4, 6,
5, 7, 0,-14, 6, 9, 2,-15, 6, 9, 2,-15, 4, 6, 0,-14,
16, 3, -5, -6, 16, 1, -8, -8, 14, -1, -9, -9, 12, 0, -8, -8,
@ -930,7 +932,7 @@ static const int8_t svq1_intra_codebook_4x4[1536] = {
};
/* 6x16-entry codebook for intra-coded 8x4 vectors */
static const int8_t svq1_intra_codebook_8x4[3072] = {
DECLARE_ALIGNED(4, static const int8_t, svq1_intra_codebook_8x4)[3072] = {
5, 6, 6, 6, 7, 7, 8, 8, 0, 0, 0, 0, 0, 1, 2, 3,
-3, -4, -4, -5, -5, -4, -3, -2, -4, -4, -4, -5, -4, -4, -3, -3,
1, 2, 2, 2, 2, 3, 3, 3, 2, 3, 3, 4, 4, 5, 5, 5,
@ -1126,7 +1128,7 @@ static const int8_t svq1_intra_codebook_8x4[3072] = {
};
/* 6x16-entry codebook for intra-coded 8x8 vectors */
static const int8_t svq1_intra_codebook_8x8[6144] = {
DECLARE_ALIGNED(4, static const int8_t, svq1_intra_codebook_8x8)[6144] = {
4, 4, 3, 2, 2, 1, 0, -1, 4, 3, 3, 2, 1, 0, -1, -1,
3, 3, 2, 2, 1, 0, -1, -2, 3, 2, 2, 1, 0, -1, -2, -3,
2, 2, 1, 0, -1, -1, -2, -3, 2, 1, 0, 0, -1, -2, -3, -4,

Loading…
Cancel
Save