Skip to content

F
ffmpeg.wasm-core
Commit dbef8b1c authored by Vitor Sessak's avatar Vitor Sessak
Browse files
Options

The first table of decodetable[] is unrelated to the other. Rename it. 

Originally committed as revision 13159 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 2270b4b2
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 16 deletions
libavcodec/ra144.c
View file @ dbef8b1c
...@@ -456,9 +456,9 @@ static int ra144_decode_frame(AVCodecContext * avctx, ...@@ -456,9 +456,9 @@ static int ra144_decode_frame(AVCodecContext * avctx,
unpack_input(buf, glob->unpacked); unpack_input(buf, glob->unpacked);
glob->iptr = glob->unpacked; glob->iptr = glob->unpacked;
glob->val = decodetable[0][(*(glob->iptr++)) << 1]; glob->val = decodeval[(*(glob->iptr++)) << 1];
dptr = decodetable + 1; dptr = decodetable;
lptr = glob->swapbuf1; lptr = glob->swapbuf1;
while (lptr<glob->swapbuf1 + 10) while (lptr<glob->swapbuf1 + 10)
......
libavcodec/ra144.h
View file @ dbef8b1c
...@@ -2341,7 +2341,7 @@ static const unsigned long ftable2[128]={ ...@@ -2341,7 +2341,7 @@ static const unsigned long ftable2[128]={
0x2fec4,0x33a8a,0x34673,0x332c0,0x39279,0x380c9,0x36a4d,0x307a1, 0x2fec4,0x33a8a,0x34673,0x332c0,0x39279,0x380c9,0x36a4d,0x307a1,
0x2f157,0x33946,0x33ab9,0x3372e,0x3608d,0x3637b,0x3444d,0x2f8e9}; 0x2f157,0x33946,0x33ab9,0x3372e,0x3608d,0x3637b,0x3444d,0x2f8e9};
static const short decodetable1[63]={ static const short decodeval[63]={
0x0000,0x0006,0x0010,0x0012,0x0014,0x0017,0x0019,0x001d, 0x0000,0x0006,0x0010,0x0012,0x0014,0x0017,0x0019,0x001d,
0x0020,0x0024,0x0029,0x002e,0x0033,0x0039,0x0041,0x0049, 0x0020,0x0024,0x0029,0x002e,0x0033,0x0039,0x0041,0x0049,
0x0051,0x005b,0x0067,0x0073,0x0081,0x0091,0x00a3,0x00b7, 0x0051,0x005b,0x0067,0x0073,0x0081,0x0091,0x00a3,0x00b7,
...@@ -2351,7 +2351,7 @@ static const short decodetable1[63]={ ...@@ -2351,7 +2351,7 @@ static const short decodetable1[63]={
0x0cbd,0x0e4b,0x1009,0x11fe,0x1430,0x16a7,0x196b,0x1c85, 0x0cbd,0x0e4b,0x1009,0x11fe,0x1430,0x16a7,0x196b,0x1c85,
0x2000,0x23e7,0x2849,0x2d33,0x32b7,0x38e7,0x3fd9}; 0x2000,0x23e7,0x2849,0x2d33,0x32b7,0x38e7,0x3fd9};
static const short decodetable2[127]={ static const short decodetable1[127]={
0xf037,0xf043,0xf04e,0xf058,0xf062,0xf06c,0xf077,0xf082, 0xf037,0xf043,0xf04e,0xf058,0xf062,0xf06c,0xf077,0xf082,
0xf08e,0xf09a,0xf0a6,0xf0b2,0xf0be,0xf0cc,0xf0d9,0xf0e6, 0xf08e,0xf09a,0xf0a6,0xf0b2,0xf0be,0xf0cc,0xf0d9,0xf0e6,
0xf0f4,0xf101,0xf10f,0xf11e,0xf12d,0xf13d,0xf14c,0xf15c, 0xf0f4,0xf101,0xf10f,0xf11e,0xf12d,0xf13d,0xf14c,0xf15c,
...@@ -2369,7 +2369,7 @@ static const short decodetable2[127]={ ...@@ -2369,7 +2369,7 @@ static const short decodetable2[127]={
0x0852,0x08c2,0x0931,0x09aa,0x0a23,0x0aa4,0x0b25,0x0baa, 0x0852,0x08c2,0x0931,0x09aa,0x0a23,0x0aa4,0x0b25,0x0baa,
0x0c2e,0x0ca8,0x0d23,0x0d93,0x0e04,0x0e75,0x0ee6}; 0x0c2e,0x0ca8,0x0d23,0x0d93,0x0e04,0x0e75,0x0ee6};
static const short decodetable3[63]={ static const short decodetable2[63]={
0xf3ed,0xf54d,0xf6ae,0xf7af,0xf8b1,0xf990,0xfa6f,0xfb39, 0xf3ed,0xf54d,0xf6ae,0xf7af,0xf8b1,0xf990,0xfa6f,0xfb39,
0xfc03,0xfcbd,0xfd77,0xfe1d,0xfec4,0xff58,0xffec,0x007b, 0xfc03,0xfcbd,0xfd77,0xfe1d,0xfec4,0xff58,0xffec,0x007b,
0x010b,0x0196,0x0220,0x02a5,0x032a,0x03a9,0x0429,0x04a1, 0x010b,0x0196,0x0220,0x02a5,0x032a,0x03a9,0x0429,0x04a1,
...@@ -2379,7 +2379,7 @@ static const short decodetable3[63]={ ...@@ -2379,7 +2379,7 @@ static const short decodetable3[63]={
0x0d3a,0x0d72,0x0dab,0x0ddf,0x0e13,0x0e44,0x0e75,0x0ea1, 0x0d3a,0x0d72,0x0dab,0x0ddf,0x0e13,0x0e44,0x0e75,0x0ea1,
0x0ecd,0x0ef5,0x0f1e,0x0f44,0x0f6b,0x0f8f,0x0fb4}; 0x0ecd,0x0ef5,0x0f1e,0x0f44,0x0f6b,0x0f8f,0x0fb4};
static const short decodetable4[63]={ static const short decodetable3[63]={
0xf23b,0xf2ae,0xf321,0xf38c,0xf3f7,0xf457,0xf4b6,0xf517, 0xf23b,0xf2ae,0xf321,0xf38c,0xf3f7,0xf457,0xf4b6,0xf517,
0xf578,0xf5d5,0xf631,0xf68d,0xf6e8,0xf742,0xf79b,0xf7f0, 0xf578,0xf5d5,0xf631,0xf68d,0xf6e8,0xf742,0xf79b,0xf7f0,
0xf845,0xf896,0xf8e7,0xf937,0xf986,0xf9d6,0xfa26,0xfa74, 0xf845,0xf896,0xf8e7,0xf937,0xf986,0xf9d6,0xfa26,0xfa74,
...@@ -2389,40 +2389,39 @@ static const short decodetable4[63]={ ...@@ -2389,40 +2389,39 @@ static const short decodetable4[63]={
0x02ab,0x0315,0x037f,0x03f1,0x0463,0x04e0,0x055d,0x05e8, 0x02ab,0x0315,0x037f,0x03f1,0x0463,0x04e0,0x055d,0x05e8,
0x0673,0x0710,0x07ad,0x0872,0x0938,0x0a2f,0x0b26}; 0x0673,0x0710,0x07ad,0x0872,0x0938,0x0a2f,0x0b26};
static const short decodetable5[31]={ static const short decodetable4[31]={
0xf8cb,0xfa55,0xfbdf,0xfcea,0xfdf6,0xfed4,0xffb3,0x006f, 0xf8cb,0xfa55,0xfbdf,0xfcea,0xfdf6,0xfed4,0xffb3,0x006f,
0x012d,0x01da,0x0287,0x032b,0x03cf,0x046a,0x0505,0x059a, 0x012d,0x01da,0x0287,0x032b,0x03cf,0x046a,0x0505,0x059a,
0x062e,0x06bf,0x0751,0x07e2,0x0873,0x0904,0x0994,0x0a22, 0x062e,0x06bf,0x0751,0x07e2,0x0873,0x0904,0x0994,0x0a22,
0x0aaf,0x0b3c,0x0bc9,0x0c56,0x0ce3,0x0d6a,0x0df1}; 0x0aaf,0x0b3c,0x0bc9,0x0c56,0x0ce3,0x0d6a,0x0df1};
static const short decodetable6[31]={ static const short decodetable5[31]={
0xf57d,0xf679,0xf775,0xf83d,0xf904,0xf9b5,0xfa65,0xfb04, 0xf57d,0xf679,0xf775,0xf83d,0xf904,0xf9b5,0xfa65,0xfb04,
0xfba2,0xfc2f,0xfcbb,0xfd40,0xfdc5,0xfe44,0xfec4,0xff44, 0xfba2,0xfc2f,0xfcbb,0xfd40,0xfdc5,0xfe44,0xfec4,0xff44,
0xffc5,0x0047,0x00c9,0x0150,0x01d6,0x0266,0x02f7,0x0396, 0xffc5,0x0047,0x00c9,0x0150,0x01d6,0x0266,0x02f7,0x0396,
0x0435,0x04f3,0x05b1,0x0692,0x0774,0x0899,0x09bf}; 0x0435,0x04f3,0x05b1,0x0692,0x0774,0x0899,0x09bf};
static const short decodetable7[15]={ static const short decodetable6[15]={
0xfaa4,0xfc65,0xfe26,0xff56,0x0085,0x017f,0x0278,0x0362, 0xfaa4,0xfc65,0xfe26,0xff56,0x0085,0x017f,0x0278,0x0362,
0x044c,0x0537,0x0623,0x071f,0x081b,0x0946,0x0a70}; 0x044c,0x0537,0x0623,0x071f,0x081b,0x0946,0x0a70};
static const short decodetable8[15]={ static const short decodetable7[15]={
0xf6ab,0xf7d8,0xf905,0xfa1b,0xfb31,0xfc32,0xfd33,0xfe22, 0xf6ab,0xf7d8,0xf905,0xfa1b,0xfb31,0xfc32,0xfd33,0xfe22,
0xff11,0xfffe,0x00ea,0x01f6,0x0302,0x0462,0x05c2}; 0xff11,0xfffe,0x00ea,0x01f6,0x0302,0x0462,0x05c2};
static const short decodetable9[15]={ static const short decodetable8[15]={
0xf9df,0xfb3f,0xfca0,0xfdbc,0xfed8,0xffd1,0x00c8,0x01b3, 0xf9df,0xfb3f,0xfca0,0xfdbc,0xfed8,0xffd1,0x00c8,0x01b3,
0x029e,0x038f,0x047f,0x0596,0x06ad,0x07ff,0x0951}; 0x029e,0x038f,0x047f,0x0596,0x06ad,0x07ff,0x0951};
static const short decodetable10[15]={ static const short decodetable9[15]={
0xf768,0xf890,0xf9b8,0xfac9,0xfbda,0xfcd0,0xfdc7,0xfea8, 0xf768,0xf890,0xf9b8,0xfac9,0xfbda,0xfcd0,0xfdc7,0xfea8,
0xff88,0x006c,0x0152,0x0258,0x035f,0x04da,0x0655}; 0xff88,0x006c,0x0152,0x0258,0x035f,0x04da,0x0655};
static const short decodetable11[7]={ static const short decodetable10[7]={
0xfd97,0xff2b,0x00be,0x01f0,0x0322,0x0476,0x05cb}; 0xfd97,0xff2b,0x00be,0x01f0,0x0322,0x0476,0x05cb};
static const short *decodetable[11]={ static const short *decodetable[10]={
decodetable1,decodetable2,decodetable3,decodetable4,decodetable5, decodetable1,decodetable2,decodetable3,decodetable4,decodetable5,
decodetable6,decodetable7,decodetable8,decodetable9,decodetable10, decodetable6,decodetable7,decodetable8,decodetable9,decodetable10};
decodetable11};
#endif /* FFMPEG_RA144_H */ #endif /* FFMPEG_RA144_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment