mirror of https://github.com/mpv-player/mpv
fixed FOX61 ADPCM; still working on FOX62
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3940 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
melanson
parent
0c060333b3
commit
986074157a
225
adpcm.c
225
adpcm.c
|
|
@ -32,46 +32,12 @@ static int adpcm_step[89] =
|
|||
15289, 16818, 18500, 20350, 22385, 24623, 27086, 29794, 32767
|
||||
};
|
||||
|
||||
//static int fox62_step[89] =
|
||||
static int fox62_step[] =
|
||||
{
|
||||
0x7, 0x8, 0x9, 0xa,
|
||||
0xb, 0xc, 0xd, 0xf,
|
||||
0x10, 0x12, 0x13, 0x15,
|
||||
0x17, 0x1a, 0x1c, 0x1f,
|
||||
0x22, 0x26, 0x29, 0x2e,
|
||||
0x32, 0x37, 0x3d, 0x43,
|
||||
0x4a, 0x51, 0x59, 0x62,
|
||||
0x6c, 0x76, 0x82, 0x8f,
|
||||
0x9e, 0xad, 0xbf, 0xd2,
|
||||
0xe7, 0xfe, 0x117, 0x133,
|
||||
0x152, 0x174, 0x199, 0x1c2,
|
||||
0x1ef, 0x220, 0x256, 0x292,
|
||||
0x2d4, 0x31d, 0x36c, 0x3c4,
|
||||
0x424, 0x48e, 0x503, 0x583,
|
||||
0x610, 0x6ac, 0x756, 0x812,
|
||||
0x8e1, 0x9c4, 0xabe, 0x8d1,
|
||||
0xcff, 0xe4c, 0xfba, 0x114d,
|
||||
0x1308, 0x14ef, 0x1707, 0x1954,
|
||||
0x1bdd, 0x1ea6, 0x21b7, 0x2516,
|
||||
0x28cb, 0x2cdf, 0x315c, 0x364c,
|
||||
0x3bba, 0x41b2, 0x4844, 0x4f7e,
|
||||
0x5771, 0x6030, 0x69ce, 0x7463,
|
||||
0x7FFF
|
||||
};
|
||||
|
||||
static int adpcm_index[16] =
|
||||
{
|
||||
-1, -1, -1, -1, 2, 4, 6, 8,
|
||||
-1, -1, -1, -1, 2, 4, 6, 8
|
||||
};
|
||||
|
||||
static int fox62_extra_table[16] =
|
||||
{
|
||||
1, 3, 5, 7, 9, 11, 13, 15,
|
||||
-1, -3, -5, -7, -9, -11, -13, -15
|
||||
};
|
||||
|
||||
static int ms_adapt_table[] =
|
||||
{
|
||||
230, 230, 230, 230, 307, 409, 512, 614,
|
||||
|
|
@ -101,7 +67,8 @@ static int ms_adapt_coeff2[] =
|
|||
// sign extend a 4-bit value
|
||||
#define SE_4BIT(x) if (x & 0x8) x -= 0x10;
|
||||
|
||||
void ima_dvi_decode_nibbles(unsigned short *output, int channels,
|
||||
void decode_nibbles(unsigned short *output,
|
||||
int output_size, int channels,
|
||||
int predictor_l, int index_l,
|
||||
int predictor_r, int index_r)
|
||||
{
|
||||
|
|
@ -121,7 +88,7 @@ void ima_dvi_decode_nibbles(unsigned short *output, int channels,
|
|||
index[0] = index_l;
|
||||
index[1] = index_r;
|
||||
|
||||
for (i = 0; i < IMA_ADPCM_SAMPLES_PER_BLOCK * channels; i++)
|
||||
for (i = 0; i < output_size; i++)
|
||||
{
|
||||
delta = output[i];
|
||||
|
||||
|
|
@ -147,6 +114,7 @@ void ima_dvi_decode_nibbles(unsigned short *output, int channels,
|
|||
|
||||
// toggle channel
|
||||
channel_number ^= channels - 1;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -203,7 +171,8 @@ int ima_adpcm_decode_block(unsigned short *output, unsigned char *input,
|
|||
output[i * 4 + 3] = input[2 + IMA_ADPCM_BLOCK_SIZE + i] >> 4;
|
||||
}
|
||||
|
||||
ima_dvi_decode_nibbles(output, channels,
|
||||
decode_nibbles(output,
|
||||
IMA_ADPCM_SAMPLES_PER_BLOCK * channels, channels,
|
||||
initial_predictor_l, initial_index_l,
|
||||
initial_predictor_r, initial_index_r);
|
||||
|
||||
|
|
@ -303,63 +272,28 @@ int ms_adpcm_decode_block(unsigned short *output, unsigned char *input,
|
|||
int fox61_adpcm_decode_block(unsigned short *output, unsigned char *input)
|
||||
{
|
||||
int i;
|
||||
int out_ptr = 0;
|
||||
|
||||
int predictor;
|
||||
int index;
|
||||
int nibble;
|
||||
int sign;
|
||||
int delta;
|
||||
int diff;
|
||||
int step;
|
||||
|
||||
predictor = output[out_ptr++] = LE_16(&input[0]);
|
||||
// the first predictor value goes straight to the output
|
||||
predictor = output[0] = LE_16(&input[0]);
|
||||
SE_16BIT(predictor);
|
||||
index = input[2];
|
||||
|
||||
// iterate through and decode the rest of the bytes
|
||||
// unpack the nibbles
|
||||
for (i = 4; i < FOX61_ADPCM_BLOCK_SIZE; i++)
|
||||
{
|
||||
nibble = (input[i] >> 4) & 0x0F;
|
||||
|
||||
step = adpcm_step[index];
|
||||
sign = nibble & 8;
|
||||
delta = nibble & 7;
|
||||
diff = step >> 3;
|
||||
if (delta & 4) diff += step;
|
||||
if (delta & 2) diff += step >> 1;
|
||||
if (delta & 1) diff += step >> 2;
|
||||
if (sign)
|
||||
predictor -= diff;
|
||||
else
|
||||
predictor += diff;
|
||||
CLAMP_S16(predictor);
|
||||
output[out_ptr++] = predictor;
|
||||
index += adpcm_index[nibble];
|
||||
CLAMP_0_TO_88(index);
|
||||
|
||||
nibble = input[i] & 0x0F;
|
||||
|
||||
step = adpcm_step[index];
|
||||
sign = nibble & 8;
|
||||
delta = nibble & 7;
|
||||
diff = step >> 3;
|
||||
if (delta & 4) diff += step;
|
||||
if (delta & 2) diff += step >> 1;
|
||||
if (delta & 1) diff += step >> 2;
|
||||
if (sign)
|
||||
predictor -= diff;
|
||||
else
|
||||
predictor += diff;
|
||||
CLAMP_S16(predictor);
|
||||
output[out_ptr++] = predictor;
|
||||
index += adpcm_index[nibble];
|
||||
CLAMP_0_TO_88(index);
|
||||
output[1 + (i - 4) * 2 + 0] = (input[i] >> 4) & 0x0F;
|
||||
output[1 + (i - 4) * 2 + 1] = input[i] & 0x0F;
|
||||
}
|
||||
|
||||
decode_nibbles(&output[1], FOX61_ADPCM_SAMPLES_PER_BLOCK - 1, 1,
|
||||
predictor, index,
|
||||
0, 0);
|
||||
|
||||
return FOX61_ADPCM_SAMPLES_PER_BLOCK;
|
||||
}
|
||||
|
||||
|
||||
// note: This decoder assumes the format 0x62 data always comes in
|
||||
// stereo flavor
|
||||
int fox62_adpcm_decode_block(unsigned short *output, unsigned char *input,
|
||||
|
|
@ -369,16 +303,13 @@ int fox62_adpcm_decode_block(unsigned short *output, unsigned char *input,
|
|||
int predictor_r;
|
||||
int index_l;
|
||||
int index_r;
|
||||
int code_l;
|
||||
int code_r;
|
||||
int i;
|
||||
int out_ptr = 0;
|
||||
int adjustment;
|
||||
|
||||
int temp1, temp2, edi, eax, edx;
|
||||
static int counter = 0;
|
||||
|
||||
predictor_l = LE_16(&input[10]);
|
||||
edi = predictor_r = LE_16(&input[12]);
|
||||
predictor_r = LE_16(&input[12]);
|
||||
SE_16BIT(predictor_l);
|
||||
SE_16BIT(predictor_r);
|
||||
index_l = input[14];
|
||||
|
|
@ -386,100 +317,34 @@ static int counter = 0;
|
|||
|
||||
for (i = 16; i < FOX62_ADPCM_BLOCK_SIZE; i++)
|
||||
{
|
||||
code_l = input[i] & 0x0F;
|
||||
code_r = input[i] >> 4;
|
||||
if (counter == 0)
|
||||
printf ("code_l = %02X, predictor_l = %04X, index_l = %02X\n",
|
||||
code_l, predictor_l, index_l);
|
||||
if (counter == 0)
|
||||
printf ("code_r = %02X, predictor_r = %04X, index_r = %02X\n",
|
||||
code_r, predictor_r, index_r);
|
||||
|
||||
// left side
|
||||
if (counter == 0)
|
||||
printf ("step = %04X, extra = %02X\n", fox62_step[index_l], fox62_extra_table[code_l]);
|
||||
temp1 = fox62_step[index_l] * fox62_extra_table[code_l];
|
||||
if (counter == 0)
|
||||
printf ("temp1 (before) = %04X\n", temp1);
|
||||
if (temp1 < 0)
|
||||
temp1 += 7;
|
||||
if (counter == 0)
|
||||
printf ("temp1 (after) = %04X\n", temp1);
|
||||
|
||||
temp2 = predictor_l;
|
||||
temp1 /= 8;
|
||||
if (counter == 0)
|
||||
printf ("temp1 (after div) = %04X\n", temp1);
|
||||
temp2 += temp1;
|
||||
if (counter == 0)
|
||||
printf ("temp2 (predictor_l before clamp) = %04X\n", temp2);
|
||||
CLAMP_S16(temp2);
|
||||
if (counter == 0)
|
||||
printf ("temp2 (predictor_l after clamp) = %04X\n", temp2);
|
||||
predictor_l = temp2;
|
||||
|
||||
index_l += adpcm_index[code_l];
|
||||
if (counter == 0)
|
||||
printf ("adjusted index_l = %02X\n", index_l);
|
||||
CLAMP_0_TO_88(index_l);
|
||||
|
||||
// right side
|
||||
if (counter == 0)
|
||||
printf ("step = %04X, extra = %02X\n", fox62_step[index_r], fox62_extra_table[code_r]);
|
||||
temp1 = fox62_step[index_r] * fox62_extra_table[code_r];
|
||||
if (counter == 0)
|
||||
printf ("temp1 (before) = %04X\n", temp1);
|
||||
if (temp1 < 0)
|
||||
temp1 += 7;
|
||||
if (counter == 0)
|
||||
printf ("temp1 (after) = %04X\n", temp1);
|
||||
|
||||
temp2 = predictor_r;
|
||||
temp1 /= 8;
|
||||
if (counter == 0)
|
||||
printf ("temp1 (after div) = %04X\n", temp1);
|
||||
temp2 += temp1;
|
||||
if (counter == 0)
|
||||
printf ("temp2 (predictor_r before clamp) = %04X\n", temp2);
|
||||
CLAMP_S16(temp2);
|
||||
if (counter == 0)
|
||||
printf ("temp2 (predictor_r after clamp) = %04X\n", temp2);
|
||||
predictor_r = temp2;
|
||||
|
||||
index_r += adpcm_index[code_r];
|
||||
if (counter == 0)
|
||||
printf ("adjusted index_r = %02X\n", index_r);
|
||||
CLAMP_0_TO_88(index_r);
|
||||
|
||||
// do the weird final output process
|
||||
edi += predictor_r;
|
||||
edi /= 2;
|
||||
eax = predictor_l + edi;
|
||||
edx = edi * 2;
|
||||
if (counter == 0)
|
||||
printf ("eax = %08X, edx = %08X, edi = %08X\n", eax, edx, edi);
|
||||
output[out_ptr++] = eax;
|
||||
|
||||
predictor_l = eax;
|
||||
eax -= edx;
|
||||
if (counter == 0)
|
||||
printf ("eax = %08X, edx = %08X, edi = %08X\n", eax, edx, edi);
|
||||
// x24 += 4
|
||||
output[out_ptr++] = eax;
|
||||
predictor_l = eax;
|
||||
eax += edi;
|
||||
if (counter == 0)
|
||||
printf ("eax = %08X, edx = %08X, edi = %08X\n", eax, edx, edi);
|
||||
edi = predictor_r;
|
||||
if (counter == 0)
|
||||
printf ("eax = %08X, edx = %08X, edi = %08X\n", eax, edx, edi);
|
||||
predictor_l = eax;
|
||||
|
||||
if (counter == 0)
|
||||
printf ("L-sample = %04X, R-sample = %04X\n",
|
||||
output[out_ptr-2], output[out_ptr-1]);
|
||||
counter++;
|
||||
output[(i - 16) * 2 + 0] = input[i] & 0x0F;
|
||||
output[(i - 16) * 2 + 1] = (input[i] >> 4) & 0x0F;
|
||||
}
|
||||
|
||||
decode_nibbles(output, FOX62_ADPCM_SAMPLES_PER_BLOCK * channels, channels,
|
||||
predictor_l, index_l,
|
||||
predictor_r, index_r);
|
||||
|
||||
|
||||
for (i = 0; i < FOX62_ADPCM_SAMPLES_PER_BLOCK / 2; i += 2)
|
||||
{
|
||||
adjustment = (predictor_r + output[i + 1]) / 2;
|
||||
if (counter < 20)
|
||||
{
|
||||
printf ("(L, R) = %04X, %04X, prev_r = %04X, adjustment = %04X\n",
|
||||
output[i], output[i+1], predictor_r, adjustment);
|
||||
counter++;
|
||||
}
|
||||
predictor_r = output[i + 1];
|
||||
output[i + 1] = output[i] - adjustment;
|
||||
output[i] += adjustment;
|
||||
}
|
||||
|
||||
if (counter++ == 20)
|
||||
{
|
||||
printf (" after:\n");
|
||||
for (i = 0; i < 20; i++)
|
||||
printf ("%04X\n", output[i]);
|
||||
}
|
||||
return FOX62_ADPCM_SAMPLES_PER_BLOCK * channels;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue