mirror of
https://github.com/vgmstream/vgmstream.git
synced 2024-12-03 02:27:18 +01:00
Add .xpcm VQ + LZ/deflate codec [Eternal Fantasy (PC)]
This commit is contained in:
parent
34b701693f
commit
a125d9c0fa
@ -1,8 +1,88 @@
|
||||
#include "coding.h"
|
||||
#include "circus_decoder_lib.h"
|
||||
|
||||
|
||||
|
||||
struct circus_codec_data {
|
||||
STREAMFILE* sf;
|
||||
int16_t* buf;
|
||||
int buf_samples_all;
|
||||
circus_handle_t* handle;
|
||||
};
|
||||
|
||||
|
||||
circus_codec_data* init_circus_vq(STREAMFILE* sf, off_t start, uint8_t codec, uint8_t flags) {
|
||||
circus_codec_data* data = NULL;
|
||||
|
||||
data = calloc(1, sizeof(circus_codec_data));
|
||||
if (!data) goto fail;
|
||||
|
||||
data->sf = reopen_streamfile(sf, 0);
|
||||
data->handle = circus_init(start, codec, flags);
|
||||
if (!data->handle) goto fail;
|
||||
|
||||
return data;
|
||||
fail:
|
||||
free_circus_vq(data);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void decode_circus_vq(circus_codec_data* data, sample_t* outbuf, int32_t samples_to_do, int channels) {
|
||||
int ok, i, samples_to_get;
|
||||
|
||||
while (samples_to_do > 0) {
|
||||
if (data->buf_samples_all == 0) {
|
||||
ok = circus_decode_frame(data->handle, data->sf, &data->buf, &data->buf_samples_all);
|
||||
if (!ok) goto decode_fail;
|
||||
}
|
||||
|
||||
samples_to_get = data->buf_samples_all / channels;
|
||||
if (samples_to_get > samples_to_do)
|
||||
samples_to_get = samples_to_do;
|
||||
|
||||
for (i = 0; i < samples_to_get * channels; i++) {
|
||||
outbuf[i] = data->buf[i];
|
||||
}
|
||||
|
||||
data->buf += samples_to_get * channels;
|
||||
data->buf_samples_all -= samples_to_get * channels;
|
||||
outbuf += samples_to_get * channels;
|
||||
samples_to_do -= samples_to_get;
|
||||
}
|
||||
|
||||
return;
|
||||
|
||||
decode_fail:
|
||||
VGM_LOG("CIRCUS: decode error\n");
|
||||
memset(outbuf, 0, samples_to_do * channels * sizeof(sample_t));
|
||||
}
|
||||
|
||||
void reset_circus_vq(circus_codec_data* data) {
|
||||
if (!data) return;
|
||||
|
||||
circus_reset(data->handle);
|
||||
data->buf_samples_all = 0;
|
||||
}
|
||||
|
||||
void seek_circus_vq(circus_codec_data* data, int32_t num_sample) {
|
||||
if (!data) return;
|
||||
|
||||
reset_circus_vq(data);
|
||||
//data->samples_discard = num_sample; //todo (xpcm don't have loop points tho)
|
||||
}
|
||||
|
||||
void free_circus_vq(circus_codec_data* data) {
|
||||
if (!data) return;
|
||||
|
||||
close_streamfile(data->sf);
|
||||
circus_free(data->handle);
|
||||
free(data);
|
||||
}
|
||||
|
||||
/* ************************************************************************* */
|
||||
|
||||
/* Circus XPCM mode 2 decoding, verified vs EF.exe (info from foo_adpcm/libpcm and https://github.com/lioncash/ExtractData) */
|
||||
void decode_circus_adpcm(VGMSTREAMCHANNEL * stream, sample * outbuf, int channelspacing, int32_t first_sample, int32_t samples_to_do) {
|
||||
void decode_circus_adpcm(VGMSTREAMCHANNEL* stream, sample_t* outbuf, int channelspacing, int32_t first_sample, int32_t samples_to_do) {
|
||||
int i, sample_pos = 0;
|
||||
int32_t hist = stream->adpcm_history1_32;
|
||||
int scale = stream->adpcm_scale;
|
||||
|
492
src/coding/circus_decoder_lib.c
Normal file
492
src/coding/circus_decoder_lib.c
Normal file
@ -0,0 +1,492 @@
|
||||
#include <stdio.h>
|
||||
#include <stdint.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
/* Decodes Circus's audio codec, reverse engineered from various .exe.
|
||||
*
|
||||
* Some sources identify this codec as VQ (vector quantization), though vector(?)
|
||||
* data isn't actually bitpacked and just compressed using custom LZ or standard zlib.
|
||||
* Channels aren't divided either so decoding results in N-ch interleaved PCM.
|
||||
* It does seem to be using LPC/speech stuff from VQ codecs though.
|
||||
*
|
||||
* Some info from Japanese libpcm.c found in foo_adpcm
|
||||
* https://bitbucket.org/losnoco/foo_adpcm/src/master/foo_oki/source/libpcm/libpcm.cpp
|
||||
*/
|
||||
|
||||
#include "circus_decoder_lib.h"
|
||||
#include "circus_decoder_lib_data.h"
|
||||
|
||||
#include "circus_decoder_lzxpcm.h"
|
||||
|
||||
/* use miniz (API-compatible) to avoid adding external zlib just for this codec
|
||||
* - https://github.com/richgel999/miniz */
|
||||
#include "circus_decoder_miniz.h"
|
||||
//#include "zlib.h"
|
||||
|
||||
|
||||
//#define XPCM_CODEC_PCM 0
|
||||
#define XPCM_CODEC_VQ_LZXPCM 1
|
||||
//#define XPCM_CODEC_ADPCM 2
|
||||
#define XPCM_CODEC_VQ_DEFLATE 3
|
||||
|
||||
/* frame encodes 4096 PCM samples (all channels) = 4096*2 = 0x2000 bytes, re-interleaved then compressed */
|
||||
#define XPCM_FRAME_SIZE (4096 * 2)
|
||||
#define XPCM_FRAME_CODES 4096
|
||||
#define XPCM_FRAME_SAMPLES_ALL 4064
|
||||
#define XPCM_FRAME_OVERLAP_ALL 32
|
||||
#define XPCM_INPUT_SIZE 0x8000
|
||||
|
||||
/* ************************************************************************* */
|
||||
/* DECODE */
|
||||
/* ************************************************************************* */
|
||||
|
||||
struct circus_handle_t {
|
||||
/* config */
|
||||
off_t start;
|
||||
uint8_t codec;
|
||||
uint8_t flags;
|
||||
const int* scales;
|
||||
|
||||
/* temp buffers */
|
||||
uint8_t srcbuf[XPCM_INPUT_SIZE]; /* compressed input data (arbitrary size) */
|
||||
uint8_t decbuf[XPCM_FRAME_SIZE]; /* single decompressed frame */
|
||||
uint8_t intbuf[XPCM_FRAME_SIZE]; /* re-interleaved frame */
|
||||
int32_t invbuf[XPCM_FRAME_CODES]; /* main LPC data (may need less) */
|
||||
int32_t tmpbuf[XPCM_FRAME_CODES]; /* temp LPC data (may need less) */
|
||||
|
||||
/* output samples (original code reuses decbuf though) */
|
||||
int16_t pcmbuf[XPCM_FRAME_SAMPLES_ALL + XPCM_FRAME_OVERLAP_ALL]; /* final output samples and extra overlap samples */
|
||||
|
||||
/* sample filter state */
|
||||
int hist1;
|
||||
int hist2;
|
||||
int frame;
|
||||
|
||||
/* lz/deflate decompression state */
|
||||
lzxpcm_stream_t lstrm;
|
||||
z_stream dstrm;
|
||||
off_t offset;
|
||||
};
|
||||
|
||||
|
||||
static void convert(uint8_t flags, int32_t* invbuf, int16_t* pcmbuf, int* p_hist1, int* p_hist2, int frame) {
|
||||
int i;
|
||||
int sample, hist1, hist2;
|
||||
|
||||
hist1 = *p_hist1;
|
||||
hist2 = *p_hist2;
|
||||
|
||||
/* some ops below would use SHRs (>>), but there is some rounding in the
|
||||
* original ASM that decompiles and I think corresponds do DIVs
|
||||
* (right shift and divs of negative values isn't equivalent) */
|
||||
|
||||
/* do final filtering and conversion to PCM */
|
||||
for (i = 0; i < XPCM_FRAME_SAMPLES_ALL + XPCM_FRAME_OVERLAP_ALL; i++) {
|
||||
sample = *invbuf++;
|
||||
if (flags & 0x10)
|
||||
sample = 3 * sample / 2; // (3 * sample) >> 2
|
||||
sample /= 1024; //sample >>= 10;
|
||||
|
||||
sample = ((3 * sample + 8 * 3 * sample + 4 * hist1 + hist2) << 11);
|
||||
sample /= 65536; // sample >>= 16;
|
||||
|
||||
hist2 = hist1;
|
||||
hist1 = sample;
|
||||
|
||||
/* last 32 decoded samples aren't output, but are used next frame to overlap
|
||||
* with beginning samples (filters(?) windowing, not too noticeable though) */
|
||||
if (i < XPCM_FRAME_OVERLAP_ALL && frame > 0) {
|
||||
sample = (i * sample) + ((XPCM_FRAME_OVERLAP_ALL - i) * pcmbuf[XPCM_FRAME_SAMPLES_ALL + i]);
|
||||
sample /= 32; //sample >>= 5
|
||||
}
|
||||
|
||||
if (sample > 32767)
|
||||
sample = 32767;
|
||||
else if (sample < -32768)
|
||||
sample = -32768;
|
||||
|
||||
pcmbuf[i] = sample;
|
||||
}
|
||||
|
||||
*p_hist1 = hist1;
|
||||
*p_hist2 = hist2;
|
||||
}
|
||||
|
||||
static void transform(int32_t* invbuf, int32_t* tmpbuf) {
|
||||
int lpc1, lpc2, lpc3, lpc4;
|
||||
int step1, step2, step3;
|
||||
int sc1, sc2;
|
||||
|
||||
/* bits were originally configurable (passed arg), but actually called with const 12,
|
||||
* and removed in later games along with superfluous ifs (coefs > 0, bits >= 3, etc) */
|
||||
//const int frame_bits = 12;
|
||||
|
||||
step1 = 4096; /* 1 << 12 */
|
||||
step2 = step1 >> 1;
|
||||
step3 = step2 >> 1;
|
||||
sc1 = 1;
|
||||
|
||||
/* inverse transform of LPC(?) coefs */
|
||||
for (lpc1 = 0; lpc1 < 12 - 2; lpc1++) {
|
||||
int sub1, sub2;
|
||||
int i1, i2, i3, i4;
|
||||
int64_t cos1, sin1, cos2, sin2; /* needs i64 to force 64b ops (avoid overflows) */
|
||||
|
||||
cos1 = (int64_t)sincos_table[sc1 + 1024];
|
||||
sin1 = (int64_t)sincos_table[sc1 + 0];
|
||||
|
||||
i1 = 0;
|
||||
i2 = step2;
|
||||
i3 = step3;
|
||||
i4 = step2 + step3;
|
||||
|
||||
for (lpc2 = 0; lpc2 < 4096; lpc2 += step1) {
|
||||
sub1 = invbuf[i1 + 0] - invbuf[i2 + 0];
|
||||
sub2 = tmpbuf[i1 + 0] - tmpbuf[i2 + 0];
|
||||
invbuf[i1 + 0] += invbuf[i2 + 0];
|
||||
tmpbuf[i1 + 0] += tmpbuf[i2 + 0];
|
||||
invbuf[i2 + 0] = sub1;
|
||||
tmpbuf[i2 + 0] = sub2;
|
||||
|
||||
sub1 = invbuf[i1 + 1] - invbuf[i2 + 1];
|
||||
sub2 = tmpbuf[i1 + 1] - tmpbuf[i2 + 1];
|
||||
invbuf[i1 + 1] += invbuf[i2 + 1];
|
||||
tmpbuf[i1 + 1] += tmpbuf[i2 + 1];
|
||||
invbuf[i2 + 1] = ((sub1 * cos1) >> 12) + ((sub2 * sin1) >> 12);
|
||||
tmpbuf[i2 + 1] = ((sub2 * cos1) >> 12) - ((sub1 * sin1) >> 12);
|
||||
|
||||
sub1 = invbuf[i3 + 0] - invbuf[i4 + 0];
|
||||
sub2 = tmpbuf[i3 + 0] - tmpbuf[i4 + 0];
|
||||
invbuf[i3 + 0] += invbuf[i4 + 0];
|
||||
tmpbuf[i3 + 0] += tmpbuf[i4 + 0];
|
||||
invbuf[i4 + 0] = sub2;
|
||||
tmpbuf[i4 + 0] = -sub1;
|
||||
|
||||
sub1 = invbuf[i3 + 1] - invbuf[i4 + 1];
|
||||
sub2 = tmpbuf[i3 + 1] - tmpbuf[i4 + 1];
|
||||
invbuf[i3 + 1] += invbuf[i4 + 1];
|
||||
tmpbuf[i3 + 1] += tmpbuf[i4 + 1];
|
||||
invbuf[i4 + 1] = ((sub2 * cos1) >> 12) - ((sub1 * sin1) >> 12);
|
||||
tmpbuf[i4 + 1] = -(((sub1 * cos1) >> 12) + ((sub2 * sin1) >> 12));
|
||||
|
||||
i1 += step1;
|
||||
i2 += step1;
|
||||
i3 += step1;
|
||||
i4 += step1;
|
||||
}
|
||||
|
||||
if (step3 > 2) {
|
||||
sc2 = sc1 * 2;
|
||||
|
||||
for (lpc3 = 2; lpc3 < step3; lpc3++) {
|
||||
cos2 = (int64_t)sincos_table[sc2 + 1024];
|
||||
sin2 = (int64_t)sincos_table[sc2 + 0];
|
||||
sc2 += sc1;
|
||||
|
||||
i1 = 0 + lpc3;
|
||||
i2 = step2 + lpc3;
|
||||
i3 = step3 + lpc3;
|
||||
i4 = step2 + step3 + lpc3;
|
||||
|
||||
for (lpc4 = 0; lpc4 < 4096; lpc4 += step1) {
|
||||
sub1 = invbuf[i1] - invbuf[i2];
|
||||
sub2 = tmpbuf[i1] - tmpbuf[i2];
|
||||
invbuf[i1] += invbuf[i2];
|
||||
tmpbuf[i1] += tmpbuf[i2];
|
||||
invbuf[i2] = ((sub1 * cos2) >> 12) + ((sub2 * sin2) >> 12);
|
||||
tmpbuf[i2] = ((sub2 * cos2) >> 12) - ((sub1 * sin2) >> 12);
|
||||
|
||||
sub1 = invbuf[i3] - invbuf[i4];
|
||||
sub2 = tmpbuf[i3] - tmpbuf[i4];
|
||||
invbuf[i3] += invbuf[i4];
|
||||
tmpbuf[i3] += tmpbuf[i4];
|
||||
invbuf[i4] = ((sub2 * cos2) >> 12) - ((sub1 * sin2) >> 12);
|
||||
tmpbuf[i4] = -(((sub1 * cos2) >> 12) + ((sub2 * sin2) >> 12));
|
||||
|
||||
i1 += step1;
|
||||
i2 += step1;
|
||||
i3 += step1;
|
||||
i4 += step1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
step1 = step2; // step1 >>= 1;
|
||||
step2 = step3; // step2 >>= 1;
|
||||
step3 >>= 1;
|
||||
sc1 *= 2;
|
||||
}
|
||||
|
||||
{
|
||||
int i, j;
|
||||
int sub1, sub2, pow;
|
||||
|
||||
for (i = 0; i < 4096; i += 4) {
|
||||
sub1 = invbuf[i + 0] - invbuf[i + 2];
|
||||
invbuf[i + 0] += invbuf[i + 2];
|
||||
invbuf[i + 2] = sub1;
|
||||
|
||||
sub2 = tmpbuf[i + 0] - tmpbuf[i + 2];
|
||||
tmpbuf[i + 0] += tmpbuf[i + 2];
|
||||
tmpbuf[i + 2] = sub2;
|
||||
|
||||
sub1 = invbuf[i + 3] - invbuf[i + 1];
|
||||
sub2 = tmpbuf[i + 1] - tmpbuf[i + 3];
|
||||
invbuf[i + 1] += invbuf[i + 3];
|
||||
invbuf[i + 3] = sub2;
|
||||
tmpbuf[i + 1] += tmpbuf[i + 3];
|
||||
tmpbuf[i + 3] = sub1;
|
||||
}
|
||||
|
||||
for (i = 0; i < 4096; i += 2) {
|
||||
sub1 = invbuf[i + 0] - invbuf[i + 1];
|
||||
invbuf[i + 0] += invbuf[i + 1];
|
||||
invbuf[i + 1] = sub1;
|
||||
|
||||
sub2 = tmpbuf[i + 0] - tmpbuf[i + 1];
|
||||
tmpbuf[i + 0] += tmpbuf[i + 1];
|
||||
tmpbuf[i + 1] = sub2;
|
||||
}
|
||||
|
||||
for (i = 1, j = 0; i < 4096 - 1; i++) {
|
||||
for (pow = 4096 / 2; pow <= j; pow /= 2) {
|
||||
j -= pow;
|
||||
}
|
||||
j += pow;
|
||||
|
||||
if (i < j) {
|
||||
sub1 = invbuf[j];
|
||||
invbuf[j] = invbuf[i];
|
||||
invbuf[i] = sub1;
|
||||
|
||||
sub2 = tmpbuf[j];
|
||||
tmpbuf[j] = tmpbuf[i];
|
||||
tmpbuf[i] = sub2;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void scale(const uint8_t* intbuf, const int* scales, int32_t* invbuf, int32_t* tmpbuf) {
|
||||
int i, j;
|
||||
|
||||
/* reinterleave and scale intbuf into invbuf and tmpbuf */
|
||||
for (i = 0, j = 0; i < 4096 / 2; i++, j += 16) {
|
||||
int scale, qv1, qv2;
|
||||
|
||||
scale = scales[j / 4096];
|
||||
|
||||
qv1 = (intbuf[i*4 + 0] << 0) | (intbuf[i*4 + 1] << 8); /* get_u16le */
|
||||
qv2 = (intbuf[i*4 + 2] << 0) | (intbuf[i*4 + 3] << 8); /* get_u16le */
|
||||
|
||||
/* lowest bit is short of "positive" flag, or rather: even=0..-32767, odd=1..32768
|
||||
* (originally done through a LUT init at runtime with all 65536 indexes) */
|
||||
qv1 = (qv1 & 1) ? (qv1 >> 1) + 1 : -(qv1 >> 1);
|
||||
qv2 = (qv2 & 1) ? (qv2 >> 1) + 1 : -(qv2 >> 1);
|
||||
|
||||
invbuf[i] = scale * qv1;
|
||||
tmpbuf[i] = scale * qv2;
|
||||
}
|
||||
|
||||
/* reset rest of invbuf/tmpbuf */
|
||||
for (i = 4096 / 2; i < 4096; i++) {
|
||||
invbuf[i] = 0;
|
||||
tmpbuf[i] = 0;
|
||||
}
|
||||
}
|
||||
|
||||
static void interleave(const uint8_t* decbuf, uint8_t* intbuf) {
|
||||
int i, j;
|
||||
|
||||
/* reorder odd decbuf bytes into intbuf */
|
||||
for (i = 0, j = 1; i < 0x1000; i++, j += 2) {
|
||||
intbuf[j] = decbuf[i];
|
||||
}
|
||||
|
||||
/* reorder even decbuf bytes into intbuf */
|
||||
for (i = 0x1000, j = 0; i < 0x1800; i++, j += 4) {
|
||||
uint8_t lo = decbuf[i + 0x800];
|
||||
uint8_t hi = decbuf[i];
|
||||
|
||||
intbuf[j + 0] = (hi & 0xF0) | (lo >> 4);
|
||||
intbuf[j + 2] = (hi << 4) | (lo & 0x0F);
|
||||
}
|
||||
}
|
||||
|
||||
/* ************************************************************ */
|
||||
/* API */
|
||||
/* ************************************************************ */
|
||||
|
||||
circus_handle_t* circus_init(off_t start, uint8_t codec, uint8_t flags) {
|
||||
circus_handle_t* handle = NULL;
|
||||
int scale_index, err;
|
||||
|
||||
handle = malloc(sizeof(circus_handle_t));
|
||||
if (!handle) goto fail;
|
||||
|
||||
handle->start = start;
|
||||
handle->codec = codec; //(config >> 0) & 0xFF;
|
||||
handle->flags = flags; //(config >> 8) & 0xFF;
|
||||
|
||||
scale_index = (handle->flags & 0xF);
|
||||
if (scale_index > 5) goto fail;
|
||||
handle->scales = scale_table[scale_index];
|
||||
|
||||
if (handle->codec == XPCM_CODEC_VQ_DEFLATE) {
|
||||
memset(&handle->dstrm, 0, sizeof(z_stream));
|
||||
err = inflateInit(&handle->dstrm);
|
||||
if (err < 0) goto fail;
|
||||
}
|
||||
|
||||
circus_reset(handle);
|
||||
|
||||
return handle;
|
||||
fail:
|
||||
circus_free(handle);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void circus_free(circus_handle_t* handle) {
|
||||
if (!handle)
|
||||
return;
|
||||
|
||||
if (handle->codec == XPCM_CODEC_VQ_DEFLATE) {
|
||||
inflateEnd(&handle->dstrm);
|
||||
}
|
||||
|
||||
free(handle);
|
||||
}
|
||||
|
||||
void circus_reset(circus_handle_t* handle) {
|
||||
if (!handle)
|
||||
return;
|
||||
handle->hist1 = 0;
|
||||
handle->hist2 = 0;
|
||||
handle->frame = 0;
|
||||
|
||||
if (handle->codec == XPCM_CODEC_VQ_LZXPCM) {
|
||||
lzxpcm_reset(&handle->lstrm);
|
||||
} else if (handle->codec == XPCM_CODEC_VQ_DEFLATE) {
|
||||
inflateReset(&handle->dstrm);
|
||||
}
|
||||
handle->offset = handle->start;
|
||||
}
|
||||
|
||||
static int decompress_frame_lzxpcm(circus_handle_t* handle, STREAMFILE* sf) {
|
||||
int res;
|
||||
|
||||
handle->lstrm.next_out = handle->decbuf;
|
||||
handle->lstrm.avail_out = sizeof(handle->decbuf);
|
||||
handle->lstrm.total_out = 0;
|
||||
do {
|
||||
if (handle->lstrm.avail_in == 0) {
|
||||
handle->lstrm.next_in = handle->srcbuf;
|
||||
handle->lstrm.avail_in = read_streamfile(handle->srcbuf, handle->offset, sizeof(handle->srcbuf), sf);
|
||||
handle->offset += handle->lstrm.avail_in;
|
||||
|
||||
/* EOF (game reserves some extra buf so memset'ing is probably equivalent) */
|
||||
if (handle->lstrm.avail_in == 0) {
|
||||
memset(handle->decbuf + handle->lstrm.total_out, 0, sizeof(handle->decbuf) - handle->dstrm.total_out);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
res = lzxpcm_decompress(&handle->lstrm);
|
||||
if (res != LZXPCM_OK)
|
||||
goto fail;
|
||||
}
|
||||
while(handle->lstrm.avail_out != 0);
|
||||
|
||||
return 1;
|
||||
fail:
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int decompress_frame_deflate(circus_handle_t* handle, STREAMFILE* sf) {
|
||||
int res;
|
||||
|
||||
handle->dstrm.next_out = handle->decbuf;
|
||||
handle->dstrm.avail_out = sizeof(handle->decbuf);
|
||||
handle->dstrm.total_out = 0;
|
||||
do {
|
||||
if (handle->dstrm.avail_in == 0) {
|
||||
handle->dstrm.next_in = handle->srcbuf;
|
||||
handle->dstrm.avail_in = read_streamfile(handle->srcbuf, handle->offset, sizeof(handle->srcbuf), sf);
|
||||
handle->offset += handle->dstrm.avail_in;
|
||||
|
||||
/* EOF (game reserves some extra buf so memset'ing is probably equivalent) */
|
||||
if (handle->dstrm.avail_in == 0) {
|
||||
memset(handle->decbuf + handle->dstrm.total_out, 0, sizeof(handle->decbuf) - handle->dstrm.total_out);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
res = inflate(&handle->dstrm, Z_NO_FLUSH);
|
||||
if (res != Z_OK && res != Z_STREAM_END)
|
||||
goto fail;
|
||||
}
|
||||
while(handle->dstrm.avail_out != 0);
|
||||
|
||||
return 1;
|
||||
fail:
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef XPCM_ALT
|
||||
/* original code uses zlib 1.2.1 to decompress the full stream into memory */
|
||||
static int deflate_decompress_full(uint8_t* dst, size_t dst_size, const uint8_t* src, size_t src_size) {
|
||||
int err;
|
||||
z_stream strm = {0};
|
||||
strm.next_in = src;
|
||||
strm.avail_in = src_size;
|
||||
strm.next_out = dst;
|
||||
strm.avail_out = dst_size;
|
||||
|
||||
err = inflateInit(&strm);
|
||||
if (err < 0) {
|
||||
//printf("inflateInit error: %i\n", err);
|
||||
return 0;
|
||||
}
|
||||
|
||||
err = inflate(&strm, Z_FINISH);
|
||||
if (err < 0) {
|
||||
//printf("inflate error: %i\n", err);
|
||||
//return 0;
|
||||
}
|
||||
|
||||
err = inflateEnd(&strm);
|
||||
if (err < 0) {
|
||||
//printf("inflateEnd error: %i\n", err);
|
||||
return 0;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
int circus_decode_frame(circus_handle_t* handle, STREAMFILE* sf, int16_t** p_buf, int* p_buf_samples_all) {
|
||||
int ok;
|
||||
|
||||
if (handle->codec == XPCM_CODEC_VQ_LZXPCM) {
|
||||
ok = decompress_frame_lzxpcm(handle, sf);
|
||||
} else if (handle->codec == XPCM_CODEC_VQ_DEFLATE) {
|
||||
ok = decompress_frame_deflate(handle, sf);
|
||||
} else {
|
||||
ok = 0;
|
||||
}
|
||||
if (!ok)
|
||||
goto fail;
|
||||
|
||||
interleave(handle->decbuf, handle->intbuf);
|
||||
scale(handle->intbuf, handle->scales, handle->invbuf, handle->tmpbuf);
|
||||
transform(handle->invbuf, handle->tmpbuf);
|
||||
convert(handle->flags, handle->invbuf, handle->pcmbuf, &handle->hist1, &handle->hist2, handle->frame);
|
||||
handle->frame++;
|
||||
|
||||
*p_buf = handle->pcmbuf;
|
||||
*p_buf_samples_all = XPCM_FRAME_SAMPLES_ALL;
|
||||
return 1;
|
||||
fail:
|
||||
return 0;
|
||||
}
|
16
src/coding/circus_decoder_lib.h
Normal file
16
src/coding/circus_decoder_lib.h
Normal file
@ -0,0 +1,16 @@
|
||||
#ifndef _CIRCUS_DECODER_LIB_H_
|
||||
#define _CIRCUS_DECODER_LIB_H_
|
||||
|
||||
#include "../streamfile.h"
|
||||
|
||||
typedef struct circus_handle_t circus_handle_t;
|
||||
|
||||
circus_handle_t* circus_init(off_t start, uint8_t codec, uint8_t flags);
|
||||
|
||||
void circus_free(circus_handle_t* handle);
|
||||
|
||||
void circus_reset(circus_handle_t* handle);
|
||||
|
||||
int circus_decode_frame(circus_handle_t* handle, STREAMFILE* sf, int16_t** p_buf, int* p_buf_samples_all);
|
||||
|
||||
#endif
|
347
src/coding/circus_decoder_lib_data.h
Normal file
347
src/coding/circus_decoder_lib_data.h
Normal file
@ -0,0 +1,347 @@
|
||||
#ifndef _CIRCUS_DECODER_LIB_DATA_H_
|
||||
#define _CIRCUS_DECODER_LIB_DATA_H_
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
|
||||
/* sin-cosine LUT, seems generated with: */
|
||||
/* table[i] = round( sin(2.0 * PI * i / 1024.0) * 1000.0 ) */
|
||||
static const int sincos_table[1024*5 + 1] = {
|
||||
0, 6, 12, 18, 25, 31, 37, 43, 50, 56, 62, 69, 75, 81, 87, 94,
|
||||
100, 106, 113, 119, 125, 131, 138, 144, 150, 157, 163, 169, 175, 182, 188, 194,
|
||||
200, 207, 213, 219, 226, 232, 238, 244, 251, 257, 263, 269, 276, 282, 288, 295,
|
||||
301, 307, 313, 320, 326, 332, 338, 345, 351, 357, 363, 370, 376, 382, 388, 395,
|
||||
401, 407, 413, 420, 426, 432, 438, 445, 451, 457, 463, 470, 476, 482, 488, 495,
|
||||
501, 507, 513, 520, 526, 532, 538, 545, 551, 557, 563, 569, 576, 582, 588, 594,
|
||||
601, 607, 613, 619, 625, 632, 638, 644, 650, 656, 663, 669, 675, 681, 687, 694,
|
||||
700, 706, 712, 718, 725, 731, 737, 743, 749, 755, 762, 768, 774, 780, 786, 792,
|
||||
799, 805, 811, 817, 823, 829, 836, 842, 848, 854, 860, 866, 872, 879, 885, 891,
|
||||
897, 903, 909, 915, 921, 928, 934, 940, 946, 952, 958, 964, 970, 976, 983, 989,
|
||||
995, 1001, 1007, 1013, 1019, 1025, 1031, 1037, 1043, 1050, 1056, 1062, 1068, 1074, 1080, 1086,
|
||||
1092, 1098, 1104, 1110, 1116, 1122, 1128, 1134, 1140, 1146, 1152, 1158, 1164, 1170, 1176, 1182,
|
||||
1189, 1195, 1201, 1207, 1213, 1219, 1225, 1231, 1237, 1243, 1248, 1254, 1260, 1266, 1272, 1278,
|
||||
1284, 1290, 1296, 1302, 1308, 1314, 1320, 1326, 1332, 1338, 1344, 1350, 1356, 1362, 1368, 1373,
|
||||
1379, 1385, 1391, 1397, 1403, 1409, 1415, 1421, 1427, 1433, 1438, 1444, 1450, 1456, 1462, 1468,
|
||||
1474, 1479, 1485, 1491, 1497, 1503, 1509, 1515, 1520, 1526, 1532, 1538, 1544, 1550, 1555, 1561,
|
||||
1567, 1573, 1579, 1584, 1590, 1596, 1602, 1608, 1613, 1619, 1625, 1631, 1636, 1642, 1648, 1654,
|
||||
1659, 1665, 1671, 1677, 1682, 1688, 1694, 1699, 1705, 1711, 1717, 1722, 1728, 1734, 1739, 1745,
|
||||
1751, 1756, 1762, 1768, 1773, 1779, 1785, 1790, 1796, 1802, 1807, 1813, 1819, 1824, 1830, 1835,
|
||||
1841, 1847, 1852, 1858, 1864, 1869, 1875, 1880, 1886, 1891, 1897, 1903, 1908, 1914, 1919, 1925,
|
||||
1930, 1936, 1941, 1947, 1952, 1958, 1964, 1969, 1975, 1980, 1986, 1991, 1997, 2002, 2007, 2013,
|
||||
2018, 2024, 2029, 2035, 2040, 2046, 2051, 2057, 2062, 2067, 2073, 2078, 2084, 2089, 2094, 2100,
|
||||
2105, 2111, 2116, 2121, 2127, 2132, 2138, 2143, 2148, 2154, 2159, 2164, 2170, 2175, 2180, 2186,
|
||||
2191, 2196, 2201, 2207, 2212, 2217, 2223, 2228, 2233, 2238, 2244, 2249, 2254, 2259, 2265, 2270,
|
||||
2275, 2280, 2286, 2291, 2296, 2301, 2306, 2312, 2317, 2322, 2327, 2332, 2337, 2343, 2348, 2353,
|
||||
2358, 2363, 2368, 2373, 2379, 2384, 2389, 2394, 2399, 2404, 2409, 2414, 2419, 2424, 2429, 2434,
|
||||
2439, 2445, 2450, 2455, 2460, 2465, 2470, 2475, 2480, 2485, 2490, 2495, 2500, 2505, 2510, 2515,
|
||||
2519, 2524, 2529, 2534, 2539, 2544, 2549, 2554, 2559, 2564, 2569, 2574, 2578, 2583, 2588, 2593,
|
||||
2598, 2603, 2608, 2613, 2617, 2622, 2627, 2632, 2637, 2641, 2646, 2651, 2656, 2661, 2665, 2670,
|
||||
2675, 2680, 2684, 2689, 2694, 2699, 2703, 2708, 2713, 2717, 2722, 2727, 2732, 2736, 2741, 2746,
|
||||
2750, 2755, 2760, 2764, 2769, 2773, 2778, 2783, 2787, 2792, 2796, 2801, 2806, 2810, 2815, 2819,
|
||||
2824, 2828, 2833, 2837, 2842, 2847, 2851, 2856, 2860, 2865, 2869, 2874, 2878, 2882, 2887, 2891,
|
||||
2896, 2900, 2905, 2909, 2914, 2918, 2922, 2927, 2931, 2936, 2940, 2944, 2949, 2953, 2957, 2962,
|
||||
2966, 2970, 2975, 2979, 2983, 2988, 2992, 2996, 3000, 3005, 3009, 3013, 3018, 3022, 3026, 3030,
|
||||
3034, 3039, 3043, 3047, 3051, 3055, 3060, 3064, 3068, 3072, 3076, 3080, 3085, 3089, 3093, 3097,
|
||||
3101, 3105, 3109, 3113, 3117, 3121, 3126, 3130, 3134, 3138, 3142, 3146, 3150, 3154, 3158, 3162,
|
||||
3166, 3170, 3174, 3178, 3182, 3186, 3190, 3193, 3197, 3201, 3205, 3209, 3213, 3217, 3221, 3225,
|
||||
3229, 3232, 3236, 3240, 3244, 3248, 3252, 3255, 3259, 3263, 3267, 3271, 3274, 3278, 3282, 3286,
|
||||
3289, 3293, 3297, 3301, 3304, 3308, 3312, 3315, 3319, 3323, 3326, 3330, 3334, 3337, 3341, 3345,
|
||||
3348, 3352, 3356, 3359, 3363, 3366, 3370, 3373, 3377, 3381, 3384, 3388, 3391, 3395, 3398, 3402,
|
||||
3405, 3409, 3412, 3416, 3419, 3423, 3426, 3429, 3433, 3436, 3440, 3443, 3447, 3450, 3453, 3457,
|
||||
3460, 3463, 3467, 3470, 3473, 3477, 3480, 3483, 3487, 3490, 3493, 3497, 3500, 3503, 3506, 3510,
|
||||
3513, 3516, 3519, 3522, 3526, 3529, 3532, 3535, 3538, 3541, 3545, 3548, 3551, 3554, 3557, 3560,
|
||||
3563, 3566, 3570, 3573, 3576, 3579, 3582, 3585, 3588, 3591, 3594, 3597, 3600, 3603, 3606, 3609,
|
||||
3612, 3615, 3618, 3621, 3624, 3627, 3629, 3632, 3635, 3638, 3641, 3644, 3647, 3650, 3652, 3655,
|
||||
3658, 3661, 3664, 3667, 3669, 3672, 3675, 3678, 3680, 3683, 3686, 3689, 3691, 3694, 3697, 3700,
|
||||
3702, 3705, 3708, 3710, 3713, 3716, 3718, 3721, 3723, 3726, 3729, 3731, 3734, 3736, 3739, 3742,
|
||||
3744, 3747, 3749, 3752, 3754, 3757, 3759, 3762, 3764, 3767, 3769, 3772, 3774, 3776, 3779, 3781,
|
||||
3784, 3786, 3789, 3791, 3793, 3796, 3798, 3800, 3803, 3805, 3807, 3810, 3812, 3814, 3816, 3819,
|
||||
3821, 3823, 3826, 3828, 3830, 3832, 3834, 3837, 3839, 3841, 3843, 3845, 3848, 3850, 3852, 3854,
|
||||
3856, 3858, 3860, 3862, 3864, 3867, 3869, 3871, 3873, 3875, 3877, 3879, 3881, 3883, 3885, 3887,
|
||||
3889, 3891, 3893, 3895, 3897, 3899, 3900, 3902, 3904, 3906, 3908, 3910, 3912, 3914, 3915, 3917,
|
||||
3919, 3921, 3923, 3925, 3926, 3928, 3930, 3932, 3933, 3935, 3937, 3939, 3940, 3942, 3944, 3945,
|
||||
3947, 3949, 3950, 3952, 3954, 3955, 3957, 3959, 3960, 3962, 3963, 3965, 3967, 3968, 3970, 3971,
|
||||
3973, 3974, 3976, 3977, 3979, 3980, 3982, 3983, 3985, 3986, 3988, 3989, 3990, 3992, 3993, 3995,
|
||||
3996, 3997, 3999, 4000, 4001, 4003, 4004, 4005, 4007, 4008, 4009, 4011, 4012, 4013, 4014, 4016,
|
||||
4017, 4018, 4019, 4020, 4022, 4023, 4024, 4025, 4026, 4027, 4029, 4030, 4031, 4032, 4033, 4034,
|
||||
4035, 4036, 4037, 4038, 4039, 4040, 4041, 4042, 4043, 4044, 4045, 4046, 4047, 4048, 4049, 4050,
|
||||
4051, 4052, 4053, 4054, 4055, 4056, 4057, 4057, 4058, 4059, 4060, 4061, 4062, 4062, 4063, 4064,
|
||||
4065, 4065, 4066, 4067, 4068, 4068, 4069, 4070, 4071, 4071, 4072, 4073, 4073, 4074, 4075, 4075,
|
||||
4076, 4076, 4077, 4078, 4078, 4079, 4079, 4080, 4080, 4081, 4081, 4082, 4082, 4083, 4083, 4084,
|
||||
4084, 4085, 4085, 4086, 4086, 4087, 4087, 4087, 4088, 4088, 4089, 4089, 4089, 4090, 4090, 4090,
|
||||
4091, 4091, 4091, 4091, 4092, 4092, 4092, 4092, 4093, 4093, 4093, 4093, 4094, 4094, 4094, 4094,
|
||||
4094, 4094, 4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
|
||||
|
||||
4096, 4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095, 4094,
|
||||
4094, 4094, 4094, 4094, 4094, 4093, 4093, 4093, 4093, 4092, 4092, 4092, 4092, 4091, 4091, 4091,
|
||||
4091, 4090, 4090, 4090, 4089, 4089, 4089, 4088, 4088, 4087, 4087, 4087, 4086, 4086, 4085, 4085,
|
||||
4084, 4084, 4083, 4083, 4082, 4082, 4081, 4081, 4080, 4080, 4079, 4079, 4078, 4078, 4077, 4076,
|
||||
4076, 4075, 4075, 4074, 4073, 4073, 4072, 4071, 4071, 4070, 4069, 4068, 4068, 4067, 4066, 4065,
|
||||
4065, 4064, 4063, 4062, 4062, 4061, 4060, 4059, 4058, 4057, 4057, 4056, 4055, 4054, 4053, 4052,
|
||||
4051, 4050, 4049, 4048, 4047, 4046, 4045, 4044, 4043, 4042, 4041, 4040, 4039, 4038, 4037, 4036,
|
||||
4035, 4034, 4033, 4032, 4031, 4030, 4029, 4027, 4026, 4025, 4024, 4023, 4022, 4020, 4019, 4018,
|
||||
4017, 4016, 4014, 4013, 4012, 4011, 4009, 4008, 4007, 4005, 4004, 4003, 4001, 4000, 3999, 3997,
|
||||
3996, 3995, 3993, 3992, 3990, 3989, 3988, 3986, 3985, 3983, 3982, 3980, 3979, 3977, 3976, 3974,
|
||||
3973, 3971, 3970, 3968, 3967, 3965, 3963, 3962, 3960, 3959, 3957, 3955, 3954, 3952, 3950, 3949,
|
||||
3947, 3945, 3944, 3942, 3940, 3939, 3937, 3935, 3933, 3932, 3930, 3928, 3926, 3925, 3923, 3921,
|
||||
3919, 3917, 3915, 3914, 3912, 3910, 3908, 3906, 3904, 3902, 3900, 3899, 3897, 3895, 3893, 3891,
|
||||
3889, 3887, 3885, 3883, 3881, 3879, 3877, 3875, 3873, 3871, 3869, 3867, 3864, 3862, 3860, 3858,
|
||||
3856, 3854, 3852, 3850, 3848, 3845, 3843, 3841, 3839, 3837, 3834, 3832, 3830, 3828, 3826, 3823,
|
||||
3821, 3819, 3816, 3814, 3812, 3810, 3807, 3805, 3803, 3800, 3798, 3796, 3793, 3791, 3789, 3786,
|
||||
3784, 3781, 3779, 3776, 3774, 3772, 3769, 3767, 3764, 3762, 3759, 3757, 3754, 3752, 3749, 3747,
|
||||
3744, 3742, 3739, 3736, 3734, 3731, 3729, 3726, 3723, 3721, 3718, 3716, 3713, 3710, 3708, 3705,
|
||||
3702, 3700, 3697, 3694, 3691, 3689, 3686, 3683, 3680, 3678, 3675, 3672, 3669, 3667, 3664, 3661,
|
||||
3658, 3655, 3652, 3650, 3647, 3644, 3641, 3638, 3635, 3632, 3629, 3627, 3624, 3621, 3618, 3615,
|
||||
3612, 3609, 3606, 3603, 3600, 3597, 3594, 3591, 3588, 3585, 3582, 3579, 3576, 3573, 3570, 3566,
|
||||
3563, 3560, 3557, 3554, 3551, 3548, 3545, 3541, 3538, 3535, 3532, 3529, 3526, 3522, 3519, 3516,
|
||||
3513, 3510, 3506, 3503, 3500, 3497, 3493, 3490, 3487, 3483, 3480, 3477, 3473, 3470, 3467, 3463,
|
||||
3460, 3457, 3453, 3450, 3447, 3443, 3440, 3436, 3433, 3429, 3426, 3423, 3419, 3416, 3412, 3409,
|
||||
3405, 3402, 3398, 3395, 3391, 3388, 3384, 3381, 3377, 3373, 3370, 3366, 3363, 3359, 3356, 3352,
|
||||
3348, 3345, 3341, 3337, 3334, 3330, 3326, 3323, 3319, 3315, 3312, 3308, 3304, 3301, 3297, 3293,
|
||||
3289, 3286, 3282, 3278, 3274, 3271, 3267, 3263, 3259, 3255, 3252, 3248, 3244, 3240, 3236, 3232,
|
||||
3229, 3225, 3221, 3217, 3213, 3209, 3205, 3201, 3197, 3193, 3190, 3186, 3182, 3178, 3174, 3170,
|
||||
3166, 3162, 3158, 3154, 3150, 3146, 3142, 3138, 3134, 3130, 3126, 3121, 3117, 3113, 3109, 3105,
|
||||
3101, 3097, 3093, 3089, 3085, 3080, 3076, 3072, 3068, 3064, 3060, 3055, 3051, 3047, 3043, 3039,
|
||||
3034, 3030, 3026, 3022, 3018, 3013, 3009, 3005, 3000, 2996, 2992, 2988, 2983, 2979, 2975, 2970,
|
||||
2966, 2962, 2957, 2953, 2949, 2944, 2940, 2936, 2931, 2927, 2922, 2918, 2914, 2909, 2905, 2900,
|
||||
2896, 2891, 2887, 2882, 2878, 2874, 2869, 2865, 2860, 2856, 2851, 2847, 2842, 2837, 2833, 2828,
|
||||
2824, 2819, 2815, 2810, 2806, 2801, 2796, 2792, 2787, 2783, 2778, 2773, 2769, 2764, 2760, 2755,
|
||||
2750, 2746, 2741, 2736, 2732, 2727, 2722, 2717, 2713, 2708, 2703, 2699, 2694, 2689, 2684, 2680,
|
||||
2675, 2670, 2665, 2661, 2656, 2651, 2646, 2641, 2637, 2632, 2627, 2622, 2617, 2613, 2608, 2603,
|
||||
2598, 2593, 2588, 2583, 2578, 2574, 2569, 2564, 2559, 2554, 2549, 2544, 2539, 2534, 2529, 2524,
|
||||
2519, 2515, 2510, 2505, 2500, 2495, 2490, 2485, 2480, 2475, 2470, 2465, 2460, 2455, 2450, 2445,
|
||||
2439, 2434, 2429, 2424, 2419, 2414, 2409, 2404, 2399, 2394, 2389, 2384, 2379, 2373, 2368, 2363,
|
||||
2358, 2353, 2348, 2343, 2337, 2332, 2327, 2322, 2317, 2312, 2306, 2301, 2296, 2291, 2286, 2280,
|
||||
2275, 2270, 2265, 2259, 2254, 2249, 2244, 2238, 2233, 2228, 2223, 2217, 2212, 2207, 2201, 2196,
|
||||
2191, 2186, 2180, 2175, 2170, 2164, 2159, 2154, 2148, 2143, 2138, 2132, 2127, 2121, 2116, 2111,
|
||||
2105, 2100, 2094, 2089, 2084, 2078, 2073, 2067, 2062, 2057, 2051, 2046, 2040, 2035, 2029, 2024,
|
||||
2018, 2013, 2007, 2002, 1997, 1991, 1986, 1980, 1975, 1969, 1964, 1958, 1952, 1947, 1941, 1936,
|
||||
1930, 1925, 1919, 1914, 1908, 1903, 1897, 1891, 1886, 1880, 1875, 1869, 1864, 1858, 1852, 1847,
|
||||
1841, 1835, 1830, 1824, 1819, 1813, 1807, 1802, 1796, 1790, 1785, 1779, 1773, 1768, 1762, 1756,
|
||||
1751, 1745, 1739, 1734, 1728, 1722, 1717, 1711, 1705, 1699, 1694, 1688, 1682, 1677, 1671, 1665,
|
||||
1659, 1654, 1648, 1642, 1636, 1631, 1625, 1619, 1613, 1608, 1602, 1596, 1590, 1584, 1579, 1573,
|
||||
1567, 1561, 1555, 1550, 1544, 1538, 1532, 1526, 1520, 1515, 1509, 1503, 1497, 1491, 1485, 1479,
|
||||
1474, 1468, 1462, 1456, 1450, 1444, 1438, 1433, 1427, 1421, 1415, 1409, 1403, 1397, 1391, 1385,
|
||||
1379, 1373, 1368, 1362, 1356, 1350, 1344, 1338, 1332, 1326, 1320, 1314, 1308, 1302, 1296, 1290,
|
||||
1284, 1278, 1272, 1266, 1260, 1254, 1248, 1243, 1237, 1231, 1225, 1219, 1213, 1207, 1201, 1195,
|
||||
1189, 1182, 1176, 1170, 1164, 1158, 1152, 1146, 1140, 1134, 1128, 1122, 1116, 1110, 1104, 1098,
|
||||
1092, 1086, 1080, 1074, 1068, 1062, 1056, 1050, 1043, 1037, 1031, 1025, 1019, 1013, 1007, 1001,
|
||||
995, 989, 983, 976, 970, 964, 958, 952, 946, 940, 934, 928, 921, 915, 909, 903,
|
||||
897, 891, 885, 879, 872, 866, 860, 854, 848, 842, 836, 829, 823, 817, 811, 805,
|
||||
799, 792, 786, 780, 774, 768, 762, 755, 749, 743, 737, 731, 725, 718, 712, 706,
|
||||
700, 694, 687, 681, 675, 669, 663, 656, 650, 644, 638, 632, 625, 619, 613, 607,
|
||||
601, 594, 588, 582, 576, 569, 563, 557, 551, 545, 538, 532, 526, 520, 513, 507,
|
||||
501, 495, 488, 482, 476, 470, 463, 457, 451, 445, 438, 432, 426, 420, 413, 407,
|
||||
401, 395, 388, 382, 376, 370, 363, 357, 351, 345, 338, 332, 326, 320, 313, 307,
|
||||
301, 295, 288, 282, 276, 269, 263, 257, 251, 244, 238, 232, 226, 219, 213, 207,
|
||||
200, 194, 188, 182, 175, 169, 163, 157, 150, 144, 138, 131, 125, 119, 113, 106,
|
||||
100, 94, 87, 81, 75, 69, 62, 56, 50, 43, 37, 31, 25, 18, 12, 6,
|
||||
|
||||
0, -6, -12, -18, -25, -31, -37, -43, -50, -56, -62, -69, -75, -81, -87, -94,
|
||||
-100, -106, -113, -119, -125, -131, -138, -144, -150, -157, -163, -169, -175, -182, -188, -194,
|
||||
-200, -207, -213, -219, -226, -232, -238, -244, -251, -257, -263, -269, -276, -282, -288, -295,
|
||||
-301, -307, -313, -320, -326, -332, -338, -345, -351, -357, -363, -370, -376, -382, -388, -395,
|
||||
-401, -407, -413, -420, -426, -432, -438, -445, -451, -457, -463, -470, -476, -482, -488, -495,
|
||||
-501, -507, -513, -520, -526, -532, -538, -545, -551, -557, -563, -569, -576, -582, -588, -594,
|
||||
-601, -607, -613, -619, -625, -632, -638, -644, -650, -656, -663, -669, -675, -681, -687, -694,
|
||||
-700, -706, -712, -718, -725, -731, -737, -743, -749, -755, -762, -768, -774, -780, -786, -792,
|
||||
-799, -805, -811, -817, -823, -829, -836, -842, -848, -854, -860, -866, -872, -879, -885, -891,
|
||||
-897, -903, -909, -915, -921, -928, -934, -940, -946, -952, -958, -964, -970, -976, -983, -989,
|
||||
-995,-1001,-1007,-1013,-1019,-1025,-1031,-1037,-1043,-1050,-1056,-1062,-1068,-1074,-1080,-1086,
|
||||
-1092,-1098,-1104,-1110,-1116,-1122,-1128,-1134,-1140,-1146,-1152,-1158,-1164,-1170,-1176,-1182,
|
||||
-1189,-1195,-1201,-1207,-1213,-1219,-1225,-1231,-1237,-1243,-1248,-1254,-1260,-1266,-1272,-1278,
|
||||
-1284,-1290,-1296,-1302,-1308,-1314,-1320,-1326,-1332,-1338,-1344,-1350,-1356,-1362,-1368,-1373,
|
||||
-1379,-1385,-1391,-1397,-1403,-1409,-1415,-1421,-1427,-1433,-1438,-1444,-1450,-1456,-1462,-1468,
|
||||
-1474,-1479,-1485,-1491,-1497,-1503,-1509,-1515,-1520,-1526,-1532,-1538,-1544,-1550,-1555,-1561,
|
||||
-1567,-1573,-1579,-1584,-1590,-1596,-1602,-1608,-1613,-1619,-1625,-1631,-1636,-1642,-1648,-1654,
|
||||
-1659,-1665,-1671,-1677,-1682,-1688,-1694,-1699,-1705,-1711,-1717,-1722,-1728,-1734,-1739,-1745,
|
||||
-1751,-1756,-1762,-1768,-1773,-1779,-1785,-1790,-1796,-1802,-1807,-1813,-1819,-1824,-1830,-1835,
|
||||
-1841,-1847,-1852,-1858,-1864,-1869,-1875,-1880,-1886,-1891,-1897,-1903,-1908,-1914,-1919,-1925,
|
||||
-1930,-1936,-1941,-1947,-1952,-1958,-1964,-1969,-1975,-1980,-1986,-1991,-1997,-2002,-2007,-2013,
|
||||
-2018,-2024,-2029,-2035,-2040,-2046,-2051,-2057,-2062,-2067,-2073,-2078,-2084,-2089,-2094,-2100,
|
||||
-2105,-2111,-2116,-2121,-2127,-2132,-2138,-2143,-2148,-2154,-2159,-2164,-2170,-2175,-2180,-2186,
|
||||
-2191,-2196,-2201,-2207,-2212,-2217,-2223,-2228,-2233,-2238,-2244,-2249,-2254,-2259,-2265,-2270,
|
||||
-2275,-2280,-2286,-2291,-2296,-2301,-2306,-2312,-2317,-2322,-2327,-2332,-2337,-2343,-2348,-2353,
|
||||
-2358,-2363,-2368,-2373,-2379,-2384,-2389,-2394,-2399,-2404,-2409,-2414,-2419,-2424,-2429,-2434,
|
||||
-2439,-2445,-2450,-2455,-2460,-2465,-2470,-2475,-2480,-2485,-2490,-2495,-2500,-2505,-2510,-2515,
|
||||
-2519,-2524,-2529,-2534,-2539,-2544,-2549,-2554,-2559,-2564,-2569,-2574,-2578,-2583,-2588,-2593,
|
||||
-2598,-2603,-2608,-2613,-2617,-2622,-2627,-2632,-2637,-2641,-2646,-2651,-2656,-2661,-2665,-2670,
|
||||
-2675,-2680,-2684,-2689,-2694,-2699,-2703,-2708,-2713,-2717,-2722,-2727,-2732,-2736,-2741,-2746,
|
||||
-2750,-2755,-2760,-2764,-2769,-2773,-2778,-2783,-2787,-2792,-2796,-2801,-2806,-2810,-2815,-2819,
|
||||
-2824,-2828,-2833,-2837,-2842,-2847,-2851,-2856,-2860,-2865,-2869,-2874,-2878,-2882,-2887,-2891,
|
||||
-2896,-2900,-2905,-2909,-2914,-2918,-2922,-2927,-2931,-2936,-2940,-2944,-2949,-2953,-2957,-2962,
|
||||
-2966,-2970,-2975,-2979,-2983,-2988,-2992,-2996,-3000,-3005,-3009,-3013,-3018,-3022,-3026,-3030,
|
||||
-3034,-3039,-3043,-3047,-3051,-3055,-3060,-3064,-3068,-3072,-3076,-3080,-3085,-3089,-3093,-3097,
|
||||
-3101,-3105,-3109,-3113,-3117,-3121,-3126,-3130,-3134,-3138,-3142,-3146,-3150,-3154,-3158,-3162,
|
||||
-3166,-3170,-3174,-3178,-3182,-3186,-3190,-3193,-3197,-3201,-3205,-3209,-3213,-3217,-3221,-3225,
|
||||
-3229,-3232,-3236,-3240,-3244,-3248,-3252,-3255,-3259,-3263,-3267,-3271,-3274,-3278,-3282,-3286,
|
||||
-3289,-3293,-3297,-3301,-3304,-3308,-3312,-3315,-3319,-3323,-3326,-3330,-3334,-3337,-3341,-3345,
|
||||
-3348,-3352,-3356,-3359,-3363,-3366,-3370,-3373,-3377,-3381,-3384,-3388,-3391,-3395,-3398,-3402,
|
||||
-3405,-3409,-3412,-3416,-3419,-3423,-3426,-3429,-3433,-3436,-3440,-3443,-3447,-3450,-3453,-3457,
|
||||
-3460,-3463,-3467,-3470,-3473,-3477,-3480,-3483,-3487,-3490,-3493,-3497,-3500,-3503,-3506,-3510,
|
||||
-3513,-3516,-3519,-3522,-3526,-3529,-3532,-3535,-3538,-3541,-3545,-3548,-3551,-3554,-3557,-3560,
|
||||
-3563,-3566,-3570,-3573,-3576,-3579,-3582,-3585,-3588,-3591,-3594,-3597,-3600,-3603,-3606,-3609,
|
||||
-3612,-3615,-3618,-3621,-3624,-3627,-3629,-3632,-3635,-3638,-3641,-3644,-3647,-3650,-3652,-3655,
|
||||
-3658,-3661,-3664,-3667,-3669,-3672,-3675,-3678,-3680,-3683,-3686,-3689,-3691,-3694,-3697,-3700,
|
||||
-3702,-3705,-3708,-3710,-3713,-3716,-3718,-3721,-3723,-3726,-3729,-3731,-3734,-3736,-3739,-3742,
|
||||
-3744,-3747,-3749,-3752,-3754,-3757,-3759,-3762,-3764,-3767,-3769,-3772,-3774,-3776,-3779,-3781,
|
||||
-3784,-3786,-3789,-3791,-3793,-3796,-3798,-3800,-3803,-3805,-3807,-3810,-3812,-3814,-3816,-3819,
|
||||
-3821,-3823,-3826,-3828,-3830,-3832,-3834,-3837,-3839,-3841,-3843,-3845,-3848,-3850,-3852,-3854,
|
||||
-3856,-3858,-3860,-3862,-3864,-3867,-3869,-3871,-3873,-3875,-3877,-3879,-3881,-3883,-3885,-3887,
|
||||
-3889,-3891,-3893,-3895,-3897,-3899,-3900,-3902,-3904,-3906,-3908,-3910,-3912,-3914,-3915,-3917,
|
||||
-3919,-3921,-3923,-3925,-3926,-3928,-3930,-3932,-3933,-3935,-3937,-3939,-3940,-3942,-3944,-3945,
|
||||
-3947,-3949,-3950,-3952,-3954,-3955,-3957,-3959,-3960,-3962,-3963,-3965,-3967,-3968,-3970,-3971,
|
||||
-3973,-3974,-3976,-3977,-3979,-3980,-3982,-3983,-3985,-3986,-3988,-3989,-3990,-3992,-3993,-3995,
|
||||
-3996,-3997,-3999,-4000,-4001,-4003,-4004,-4005,-4007,-4008,-4009,-4011,-4012,-4013,-4014,-4016,
|
||||
-4017,-4018,-4019,-4020,-4022,-4023,-4024,-4025,-4026,-4027,-4029,-4030,-4031,-4032,-4033,-4034,
|
||||
-4035,-4036,-4037,-4038,-4039,-4040,-4041,-4042,-4043,-4044,-4045,-4046,-4047,-4048,-4049,-4050,
|
||||
-4051,-4052,-4053,-4054,-4055,-4056,-4057,-4057,-4058,-4059,-4060,-4061,-4062,-4062,-4063,-4064,
|
||||
-4065,-4065,-4066,-4067,-4068,-4068,-4069,-4070,-4071,-4071,-4072,-4073,-4073,-4074,-4075,-4075,
|
||||
-4076,-4076,-4077,-4078,-4078,-4079,-4079,-4080,-4080,-4081,-4081,-4082,-4082,-4083,-4083,-4084,
|
||||
-4084,-4085,-4085,-4086,-4086,-4087,-4087,-4087,-4088,-4088,-4089,-4089,-4089,-4090,-4090,-4090,
|
||||
-4091,-4091,-4091,-4091,-4092,-4092,-4092,-4092,-4093,-4093,-4093,-4093,-4094,-4094,-4094,-4094,
|
||||
-4094,-4094,-4095,-4095,-4095,-4095,-4095,-4095,-4095,-4095,-4095,-4095,-4095,-4095,-4095,-4095,
|
||||
|
||||
-4096,-4095,-4095,-4095,-4095,-4095,-4095,-4095,-4095,-4095,-4095,-4095,-4095,-4095,-4095,-4094,
|
||||
-4094,-4094,-4094,-4094,-4094,-4093,-4093,-4093,-4093,-4092,-4092,-4092,-4092,-4091,-4091,-4091,
|
||||
-4091,-4090,-4090,-4090,-4089,-4089,-4089,-4088,-4088,-4087,-4087,-4087,-4086,-4086,-4085,-4085,
|
||||
-4084,-4084,-4083,-4083,-4082,-4082,-4081,-4081,-4080,-4080,-4079,-4079,-4078,-4078,-4077,-4076,
|
||||
-4076,-4075,-4075,-4074,-4073,-4073,-4072,-4071,-4071,-4070,-4069,-4068,-4068,-4067,-4066,-4065,
|
||||
-4065,-4064,-4063,-4062,-4062,-4061,-4060,-4059,-4058,-4057,-4057,-4056,-4055,-4054,-4053,-4052,
|
||||
-4051,-4050,-4049,-4048,-4047,-4046,-4045,-4044,-4043,-4042,-4041,-4040,-4039,-4038,-4037,-4036,
|
||||
-4035,-4034,-4033,-4032,-4031,-4030,-4029,-4027,-4026,-4025,-4024,-4023,-4022,-4020,-4019,-4018,
|
||||
-4017,-4016,-4014,-4013,-4012,-4011,-4009,-4008,-4007,-4005,-4004,-4003,-4001,-4000,-3999,-3997,
|
||||
-3996,-3995,-3993,-3992,-3990,-3989,-3988,-3986,-3985,-3983,-3982,-3980,-3979,-3977,-3976,-3974,
|
||||
-3973,-3971,-3970,-3968,-3967,-3965,-3963,-3962,-3960,-3959,-3957,-3955,-3954,-3952,-3950,-3949,
|
||||
-3947,-3945,-3944,-3942,-3940,-3939,-3937,-3935,-3933,-3932,-3930,-3928,-3926,-3925,-3923,-3921,
|
||||
-3919,-3917,-3915,-3914,-3912,-3910,-3908,-3906,-3904,-3902,-3900,-3899,-3897,-3895,-3893,-3891,
|
||||
-3889,-3887,-3885,-3883,-3881,-3879,-3877,-3875,-3873,-3871,-3869,-3867,-3864,-3862,-3860,-3858,
|
||||
-3856,-3854,-3852,-3850,-3848,-3845,-3843,-3841,-3839,-3837,-3834,-3832,-3830,-3828,-3826,-3823,
|
||||
-3821,-3819,-3816,-3814,-3812,-3810,-3807,-3805,-3803,-3800,-3798,-3796,-3793,-3791,-3789,-3786,
|
||||
-3784,-3781,-3779,-3776,-3774,-3772,-3769,-3767,-3764,-3762,-3759,-3757,-3754,-3752,-3749,-3747,
|
||||
-3744,-3742,-3739,-3736,-3734,-3731,-3729,-3726,-3723,-3721,-3718,-3716,-3713,-3710,-3708,-3705,
|
||||
-3702,-3700,-3697,-3694,-3691,-3689,-3686,-3683,-3680,-3678,-3675,-3672,-3669,-3667,-3664,-3661,
|
||||
-3658,-3655,-3652,-3650,-3647,-3644,-3641,-3638,-3635,-3632,-3629,-3627,-3624,-3621,-3618,-3615,
|
||||
-3612,-3609,-3606,-3603,-3600,-3597,-3594,-3591,-3588,-3585,-3582,-3579,-3576,-3573,-3570,-3566,
|
||||
-3563,-3560,-3557,-3554,-3551,-3548,-3545,-3541,-3538,-3535,-3532,-3529,-3526,-3522,-3519,-3516,
|
||||
-3513,-3510,-3506,-3503,-3500,-3497,-3493,-3490,-3487,-3483,-3480,-3477,-3473,-3470,-3467,-3463,
|
||||
-3460,-3457,-3453,-3450,-3447,-3443,-3440,-3436,-3433,-3429,-3426,-3423,-3419,-3416,-3412,-3409,
|
||||
-3405,-3402,-3398,-3395,-3391,-3388,-3384,-3381,-3377,-3373,-3370,-3366,-3363,-3359,-3356,-3352,
|
||||
-3348,-3345,-3341,-3337,-3334,-3330,-3326,-3323,-3319,-3315,-3312,-3308,-3304,-3301,-3297,-3293,
|
||||
-3289,-3286,-3282,-3278,-3274,-3271,-3267,-3263,-3259,-3255,-3252,-3248,-3244,-3240,-3236,-3232,
|
||||
-3229,-3225,-3221,-3217,-3213,-3209,-3205,-3201,-3197,-3193,-3190,-3186,-3182,-3178,-3174,-3170,
|
||||
-3166,-3162,-3158,-3154,-3150,-3146,-3142,-3138,-3134,-3130,-3126,-3121,-3117,-3113,-3109,-3105,
|
||||
-3101,-3097,-3093,-3089,-3085,-3080,-3076,-3072,-3068,-3064,-3060,-3055,-3051,-3047,-3043,-3039,
|
||||
-3034,-3030,-3026,-3022,-3018,-3013,-3009,-3005,-3000,-2996,-2992,-2988,-2983,-2979,-2975,-2970,
|
||||
-2966,-2962,-2957,-2953,-2949,-2944,-2940,-2936,-2931,-2927,-2922,-2918,-2914,-2909,-2905,-2900,
|
||||
-2896,-2891,-2887,-2882,-2878,-2874,-2869,-2865,-2860,-2856,-2851,-2847,-2842,-2837,-2833,-2828,
|
||||
-2824,-2819,-2815,-2810,-2806,-2801,-2796,-2792,-2787,-2783,-2778,-2773,-2769,-2764,-2760,-2755,
|
||||
-2750,-2746,-2741,-2736,-2732,-2727,-2722,-2717,-2713,-2708,-2703,-2699,-2694,-2689,-2684,-2680,
|
||||
-2675,-2670,-2665,-2661,-2656,-2651,-2646,-2641,-2637,-2632,-2627,-2622,-2617,-2613,-2608,-2603,
|
||||
-2598,-2593,-2588,-2583,-2578,-2574,-2569,-2564,-2559,-2554,-2549,-2544,-2539,-2534,-2529,-2524,
|
||||
-2519,-2515,-2510,-2505,-2500,-2495,-2490,-2485,-2480,-2475,-2470,-2465,-2460,-2455,-2450,-2445,
|
||||
-2439,-2434,-2429,-2424,-2419,-2414,-2409,-2404,-2399,-2394,-2389,-2384,-2379,-2373,-2368,-2363,
|
||||
-2358,-2353,-2348,-2343,-2337,-2332,-2327,-2322,-2317,-2312,-2306,-2301,-2296,-2291,-2286,-2280,
|
||||
-2275,-2270,-2265,-2259,-2254,-2249,-2244,-2238,-2233,-2228,-2223,-2217,-2212,-2207,-2201,-2196,
|
||||
-2191,-2186,-2180,-2175,-2170,-2164,-2159,-2154,-2148,-2143,-2138,-2132,-2127,-2121,-2116,-2111,
|
||||
-2105,-2100,-2094,-2089,-2084,-2078,-2073,-2067,-2062,-2057,-2051,-2046,-2040,-2035,-2029,-2024,
|
||||
-2018,-2013,-2007,-2002,-1997,-1991,-1986,-1980,-1975,-1969,-1964,-1958,-1952,-1947,-1941,-1936,
|
||||
-1930,-1925,-1919,-1914,-1908,-1903,-1897,-1891,-1886,-1880,-1875,-1869,-1864,-1858,-1852,-1847,
|
||||
-1841,-1835,-1830,-1824,-1819,-1813,-1807,-1802,-1796,-1790,-1785,-1779,-1773,-1768,-1762,-1756,
|
||||
-1751,-1745,-1739,-1734,-1728,-1722,-1717,-1711,-1705,-1699,-1694,-1688,-1682,-1677,-1671,-1665,
|
||||
-1659,-1654,-1648,-1642,-1636,-1631,-1625,-1619,-1613,-1608,-1602,-1596,-1590,-1584,-1579,-1573,
|
||||
-1567,-1561,-1555,-1550,-1544,-1538,-1532,-1526,-1520,-1515,-1509,-1503,-1497,-1491,-1485,-1479,
|
||||
-1474,-1468,-1462,-1456,-1450,-1444,-1438,-1433,-1427,-1421,-1415,-1409,-1403,-1397,-1391,-1385,
|
||||
-1379,-1373,-1368,-1362,-1356,-1350,-1344,-1338,-1332,-1326,-1320,-1314,-1308,-1302,-1296,-1290,
|
||||
-1284,-1278,-1272,-1266,-1260,-1254,-1248,-1243,-1237,-1231,-1225,-1219,-1213,-1207,-1201,-1195,
|
||||
-1189,-1182,-1176,-1170,-1164,-1158,-1152,-1146,-1140,-1134,-1128,-1122,-1116,-1110,-1104,-1098,
|
||||
-1092,-1086,-1080,-1074,-1068,-1062,-1056,-1050,-1043,-1037,-1031,-1025,-1019,-1013,-1007,-1001,
|
||||
-995, -989, -983, -976, -970, -964, -958, -952, -946, -940, -934, -928, -921, -915, -909, -903,
|
||||
-897, -891, -885, -879, -872, -866, -860, -854, -848, -842, -836, -829, -823, -817, -811, -805,
|
||||
-799, -792, -786, -780, -774, -768, -762, -755, -749, -743, -737, -731, -725, -718, -712, -706,
|
||||
-700, -694, -687, -681, -675, -669, -663, -656, -650, -644, -638, -632, -625, -619, -613, -607,
|
||||
-601, -594, -588, -582, -576, -569, -563, -557, -551, -545, -538, -532, -526, -520, -513, -507,
|
||||
-501, -495, -488, -482, -476, -470, -463, -457, -451, -445, -438, -432, -426, -420, -413, -407,
|
||||
-401, -395, -388, -382, -376, -370, -363, -357, -351, -345, -338, -332, -326, -320, -313, -307,
|
||||
-301, -295, -288, -282, -276, -269, -263, -257, -251, -244, -238, -232, -226, -219, -213, -207,
|
||||
-200, -194, -188, -182, -175, -169, -163, -157, -150, -144, -138, -131, -125, -119, -113, -106,
|
||||
-100, -94, -87, -81, -75, -69, -62, -56, -50, -43, -37, -31, -25, -18, -12, -6,
|
||||
|
||||
0, 6, 12, 18, 25, 31, 37, 43, 50, 56, 62, 69, 75, 81, 87, 94,
|
||||
100, 106, 113, 119, 125, 131, 138, 144, 150, 157, 163, 169, 175, 182, 188, 194,
|
||||
200, 207, 213, 219, 226, 232, 238, 244, 251, 257, 263, 269, 276, 282, 288, 295,
|
||||
301, 307, 313, 320, 326, 332, 338, 345, 351, 357, 363, 370, 376, 382, 388, 395,
|
||||
401, 407, 413, 420, 426, 432, 438, 445, 451, 457, 463, 470, 476, 482, 488, 495,
|
||||
501, 507, 513, 520, 526, 532, 538, 545, 551, 557, 563, 569, 576, 582, 588, 594,
|
||||
601, 607, 613, 619, 625, 632, 638, 644, 650, 656, 663, 669, 675, 681, 687, 694,
|
||||
700, 706, 712, 718, 725, 731, 737, 743, 749, 755, 762, 768, 774, 780, 786, 792,
|
||||
799, 805, 811, 817, 823, 829, 836, 842, 848, 854, 860, 866, 872, 879, 885, 891,
|
||||
897, 903, 909, 915, 921, 928, 934, 940, 946, 952, 958, 964, 970, 976, 983, 989,
|
||||
995, 1001, 1007, 1013, 1019, 1025, 1031, 1037, 1043, 1050, 1056, 1062, 1068, 1074, 1080, 1086,
|
||||
1092, 1098, 1104, 1110, 1116, 1122, 1128, 1134, 1140, 1146, 1152, 1158, 1164, 1170, 1176, 1182,
|
||||
1189, 1195, 1201, 1207, 1213, 1219, 1225, 1231, 1237, 1243, 1248, 1254, 1260, 1266, 1272, 1278,
|
||||
1284, 1290, 1296, 1302, 1308, 1314, 1320, 1326, 1332, 1338, 1344, 1350, 1356, 1362, 1368, 1373,
|
||||
1379, 1385, 1391, 1397, 1403, 1409, 1415, 1421, 1427, 1433, 1438, 1444, 1450, 1456, 1462, 1468,
|
||||
1474, 1479, 1485, 1491, 1497, 1503, 1509, 1515, 1520, 1526, 1532, 1538, 1544, 1550, 1555, 1561,
|
||||
1567, 1573, 1579, 1584, 1590, 1596, 1602, 1608, 1613, 1619, 1625, 1631, 1636, 1642, 1648, 1654,
|
||||
1659, 1665, 1671, 1677, 1682, 1688, 1694, 1699, 1705, 1711, 1717, 1722, 1728, 1734, 1739, 1745,
|
||||
1751, 1756, 1762, 1768, 1773, 1779, 1785, 1790, 1796, 1802, 1807, 1813, 1819, 1824, 1830, 1835,
|
||||
1841, 1847, 1852, 1858, 1864, 1869, 1875, 1880, 1886, 1891, 1897, 1903, 1908, 1914, 1919, 1925,
|
||||
1930, 1936, 1941, 1947, 1952, 1958, 1964, 1969, 1975, 1980, 1986, 1991, 1997, 2002, 2007, 2013,
|
||||
2018, 2024, 2029, 2035, 2040, 2046, 2051, 2057, 2062, 2067, 2073, 2078, 2084, 2089, 2094, 2100,
|
||||
2105, 2111, 2116, 2121, 2127, 2132, 2138, 2143, 2148, 2154, 2159, 2164, 2170, 2175, 2180, 2186,
|
||||
2191, 2196, 2201, 2207, 2212, 2217, 2223, 2228, 2233, 2238, 2244, 2249, 2254, 2259, 2265, 2270,
|
||||
2275, 2280, 2286, 2291, 2296, 2301, 2306, 2312, 2317, 2322, 2327, 2332, 2337, 2343, 2348, 2353,
|
||||
2358, 2363, 2368, 2373, 2379, 2384, 2389, 2394, 2399, 2404, 2409, 2414, 2419, 2424, 2429, 2434,
|
||||
2439, 2445, 2450, 2455, 2460, 2465, 2470, 2475, 2480, 2485, 2490, 2495, 2500, 2505, 2510, 2515,
|
||||
2519, 2524, 2529, 2534, 2539, 2544, 2549, 2554, 2559, 2564, 2569, 2574, 2578, 2583, 2588, 2593,
|
||||
2598, 2603, 2608, 2613, 2617, 2622, 2627, 2632, 2637, 2641, 2646, 2651, 2656, 2661, 2665, 2670,
|
||||
2675, 2680, 2684, 2689, 2694, 2699, 2703, 2708, 2713, 2717, 2722, 2727, 2732, 2736, 2741, 2746,
|
||||
2750, 2755, 2760, 2764, 2769, 2773, 2778, 2783, 2787, 2792, 2796, 2801, 2806, 2810, 2815, 2819,
|
||||
2824, 2828, 2833, 2837, 2842, 2847, 2851, 2856, 2860, 2865, 2869, 2874, 2878, 2882, 2887, 2891,
|
||||
2896, 2900, 2905, 2909, 2914, 2918, 2922, 2927, 2931, 2936, 2940, 2944, 2949, 2953, 2957, 2962,
|
||||
2966, 2970, 2975, 2979, 2983, 2988, 2992, 2996, 3000, 3005, 3009, 3013, 3018, 3022, 3026, 3030,
|
||||
3034, 3039, 3043, 3047, 3051, 3055, 3060, 3064, 3068, 3072, 3076, 3080, 3085, 3089, 3093, 3097,
|
||||
3101, 3105, 3109, 3113, 3117, 3121, 3126, 3130, 3134, 3138, 3142, 3146, 3150, 3154, 3158, 3162,
|
||||
3166, 3170, 3174, 3178, 3182, 3186, 3190, 3193, 3197, 3201, 3205, 3209, 3213, 3217, 3221, 3225,
|
||||
3229, 3232, 3236, 3240, 3244, 3248, 3252, 3255, 3259, 3263, 3267, 3271, 3274, 3278, 3282, 3286,
|
||||
3289, 3293, 3297, 3301, 3304, 3308, 3312, 3315, 3319, 3323, 3326, 3330, 3334, 3337, 3341, 3345,
|
||||
3348, 3352, 3356, 3359, 3363, 3366, 3370, 3373, 3377, 3381, 3384, 3388, 3391, 3395, 3398, 3402,
|
||||
3405, 3409, 3412, 3416, 3419, 3423, 3426, 3429, 3433, 3436, 3440, 3443, 3447, 3450, 3453, 3457,
|
||||
3460, 3463, 3467, 3470, 3473, 3477, 3480, 3483, 3487, 3490, 3493, 3497, 3500, 3503, 3506, 3510,
|
||||
3513, 3516, 3519, 3522, 3526, 3529, 3532, 3535, 3538, 3541, 3545, 3548, 3551, 3554, 3557, 3560,
|
||||
3563, 3566, 3570, 3573, 3576, 3579, 3582, 3585, 3588, 3591, 3594, 3597, 3600, 3603, 3606, 3609,
|
||||
3612, 3615, 3618, 3621, 3624, 3627, 3629, 3632, 3635, 3638, 3641, 3644, 3647, 3650, 3652, 3655,
|
||||
3658, 3661, 3664, 3667, 3669, 3672, 3675, 3678, 3680, 3683, 3686, 3689, 3691, 3694, 3697, 3700,
|
||||
3702, 3705, 3708, 3710, 3713, 3716, 3718, 3721, 3723, 3726, 3729, 3731, 3734, 3736, 3739, 3742,
|
||||
3744, 3747, 3749, 3752, 3754, 3757, 3759, 3762, 3764, 3767, 3769, 3772, 3774, 3776, 3779, 3781,
|
||||
3784, 3786, 3789, 3791, 3793, 3796, 3798, 3800, 3803, 3805, 3807, 3810, 3812, 3814, 3816, 3819,
|
||||
3821, 3823, 3826, 3828, 3830, 3832, 3834, 3837, 3839, 3841, 3843, 3845, 3848, 3850, 3852, 3854,
|
||||
3856, 3858, 3860, 3862, 3864, 3867, 3869, 3871, 3873, 3875, 3877, 3879, 3881, 3883, 3885, 3887,
|
||||
3889, 3891, 3893, 3895, 3897, 3899, 3900, 3902, 3904, 3906, 3908, 3910, 3912, 3914, 3915, 3917,
|
||||
3919, 3921, 3923, 3925, 3926, 3928, 3930, 3932, 3933, 3935, 3937, 3939, 3940, 3942, 3944, 3945,
|
||||
3947, 3949, 3950, 3952, 3954, 3955, 3957, 3959, 3960, 3962, 3963, 3965, 3967, 3968, 3970, 3971,
|
||||
3973, 3974, 3976, 3977, 3979, 3980, 3982, 3983, 3985, 3986, 3988, 3989, 3990, 3992, 3993, 3995,
|
||||
3996, 3997, 3999, 4000, 4001, 4003, 4004, 4005, 4007, 4008, 4009, 4011, 4012, 4013, 4014, 4016,
|
||||
4017, 4018, 4019, 4020, 4022, 4023, 4024, 4025, 4026, 4027, 4029, 4030, 4031, 4032, 4033, 4034,
|
||||
4035, 4036, 4037, 4038, 4039, 4040, 4041, 4042, 4043, 4044, 4045, 4046, 4047, 4048, 4049, 4050,
|
||||
4051, 4052, 4053, 4054, 4055, 4056, 4057, 4057, 4058, 4059, 4060, 4061, 4062, 4062, 4063, 4064,
|
||||
4065, 4065, 4066, 4067, 4068, 4068, 4069, 4070, 4071, 4071, 4072, 4073, 4073, 4074, 4075, 4075,
|
||||
4076, 4076, 4077, 4078, 4078, 4079, 4079, 4080, 4080, 4081, 4081, 4082, 4082, 4083, 4083, 4084,
|
||||
4084, 4085, 4085, 4086, 4086, 4087, 4087, 4087, 4088, 4088, 4089, 4089, 4089, 4090, 4090, 4090,
|
||||
4091, 4091, 4091, 4091, 4092, 4092, 4092, 4092, 4093, 4093, 4093, 4093, 4094, 4094, 4094, 4094,
|
||||
4094, 4094, 4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095, 4095,
|
||||
|
||||
4096,
|
||||
};
|
||||
|
||||
/* code can't actually access 2nd index >8 though */
|
||||
static const int scale_table[5][8*2] = {
|
||||
{ 2048, 2048, 4096, 4096, 8192, 8192,16384,16384, 1, 1, 1, 1, 1, 1, 1, 1, },
|
||||
{ 2048, 2048, 2048, 4096, 4096, 4096, 8192,16384, 1, 1, 1, 1, 1, 1, 1, 1, },
|
||||
{ 2048, 2048, 2048, 2048, 2048, 4096, 4096, 8192, 1, 1, 1, 1, 1, 1, 1, 1, },
|
||||
{ 1024, 1024, 1024, 2048, 2048, 2048, 2048, 2048, 1, 1, 1, 1, 1, 1, 1, 1, },
|
||||
{ 1365, 1365, 2048, 2730, 2730, 4096, 4096, 4096, 1, 1, 1, 1, 1, 1, 1, 1, },
|
||||
};
|
||||
|
||||
#endif
|
297
src/coding/circus_decoder_lzxpcm.h
Normal file
297
src/coding/circus_decoder_lzxpcm.h
Normal file
@ -0,0 +1,297 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdint.h>
|
||||
#include <string.h>
|
||||
|
||||
/* Decompresses Circus's custom LZ used in XPCM as a machine state for streaming,
|
||||
* that may break during any step. Original code decompress at once the full thing
|
||||
* into memory so it's simpler. */
|
||||
|
||||
#define LZXPCM_OK 0
|
||||
#define LZXPCM_ERROR -1
|
||||
#define LZXPCM_WINDOW_SIZE (1 << 16)
|
||||
|
||||
|
||||
typedef enum {
|
||||
READ_FLAGS,
|
||||
COPY_LITERAL,
|
||||
READ_TOKEN,
|
||||
PARSE_TOKEN,
|
||||
SET_MATCH,
|
||||
COPY_MATCH
|
||||
} lzxpcm_state_t;
|
||||
|
||||
typedef struct {
|
||||
lzxpcm_state_t state;
|
||||
|
||||
uint32_t flags;
|
||||
uint8_t token;
|
||||
int values_pos;
|
||||
int offset_pos;
|
||||
int match_len;
|
||||
int match_pos;
|
||||
|
||||
int window_pos;
|
||||
uint8_t window[LZXPCM_WINDOW_SIZE];
|
||||
} lzxpcm_context_t;
|
||||
|
||||
typedef struct {
|
||||
lzxpcm_context_t ctx;
|
||||
|
||||
uint8_t *next_out; /* next bytes to write (reassign when avail is 0) */
|
||||
int avail_out; /* bytes available at next_out */
|
||||
int total_out; /* written bytes, for reference (set to 0 per call if needed) */
|
||||
|
||||
const uint8_t *next_in; /* next bytes to read (reassign when avail is 0) */
|
||||
int avail_in; /* bytes available at next_in */
|
||||
int total_in; /* read bytes, for reference (set to 0 per call if needed) */
|
||||
} lzxpcm_stream_t;
|
||||
|
||||
|
||||
static void lzxpcm_reset(lzxpcm_stream_t* strm) {
|
||||
memset(strm, 0, sizeof(lzxpcm_stream_t));
|
||||
}
|
||||
|
||||
/* Decompress src into dst, returning a code and number of bytes used. Caller must handle
|
||||
* stop (when no more input data or all data has been decompressed) as LZXPCM has no end marker. */
|
||||
static int lzxpcm_decompress(lzxpcm_stream_t* strm) {
|
||||
lzxpcm_context_t* ctx = &strm->ctx;
|
||||
uint8_t* dst = strm->next_out;
|
||||
const uint8_t* src = strm->next_in;
|
||||
int dst_size = strm->avail_out;
|
||||
int src_size = strm->avail_in;
|
||||
int dst_pos = 0;
|
||||
int src_pos = 0;
|
||||
uint8_t next_val;
|
||||
|
||||
|
||||
while (1) {
|
||||
/* mostly linear state machine, but it may break anytime when reaching dst or src
|
||||
* end, and resume from same state in next call */
|
||||
switch(ctx->state) {
|
||||
|
||||
case READ_FLAGS:
|
||||
if (src_pos >= src_size)
|
||||
goto buffer_end;
|
||||
|
||||
ctx->flags >>= 1;
|
||||
|
||||
if ((ctx->flags & 0x0100) == 0) {
|
||||
ctx->flags = 0xFF00 | src[src_pos++];
|
||||
}
|
||||
|
||||
if (ctx->flags & 1)
|
||||
ctx->state = COPY_LITERAL;
|
||||
else
|
||||
ctx->state = READ_TOKEN;
|
||||
break;
|
||||
|
||||
case COPY_LITERAL:
|
||||
if (src_pos >= src_size || dst_pos >= dst_size)
|
||||
goto buffer_end;
|
||||
next_val = src[src_pos++];
|
||||
|
||||
dst[dst_pos++] = next_val;
|
||||
|
||||
ctx->window[ctx->window_pos++] = next_val;
|
||||
if (ctx->window_pos == LZXPCM_WINDOW_SIZE)
|
||||
ctx->window_pos = 0;
|
||||
|
||||
ctx->state = READ_FLAGS;
|
||||
break;
|
||||
|
||||
case READ_TOKEN:
|
||||
if (src_pos >= src_size)
|
||||
goto buffer_end;
|
||||
ctx->token = src[src_pos++];
|
||||
|
||||
ctx->values_pos = 0;
|
||||
|
||||
ctx->state = PARSE_TOKEN;
|
||||
break;
|
||||
|
||||
case PARSE_TOKEN:
|
||||
if (ctx->token >= 0xC0) {
|
||||
ctx->match_len = ((ctx->token >> 2) & 0x0F) + 4; /* 6b */
|
||||
|
||||
if (src_pos >= src_size)
|
||||
goto buffer_end;
|
||||
ctx->offset_pos = src[src_pos++]; /* upper 2b + lower 8b */
|
||||
ctx->offset_pos |= ((ctx->token & 3) << 8);
|
||||
|
||||
}
|
||||
else if (ctx->token >= 0x80) {
|
||||
ctx->match_len = ((ctx->token >> 5) & 3) + 2; /* 2b */
|
||||
|
||||
ctx->offset_pos = ctx->token & 0x1F; /* 5b */
|
||||
if (ctx->offset_pos == 0) {
|
||||
if (src_pos >= src_size)
|
||||
goto buffer_end;
|
||||
ctx->offset_pos = src[src_pos++];
|
||||
}
|
||||
}
|
||||
else if (ctx->token == 0x7F) {
|
||||
if (ctx->values_pos == 0) {
|
||||
if (src_pos >= src_size)
|
||||
goto buffer_end;
|
||||
ctx->match_len = (src[src_pos++] << 0u);
|
||||
ctx->values_pos++;
|
||||
}
|
||||
|
||||
if (ctx->values_pos == 1) {
|
||||
if (src_pos >= src_size)
|
||||
goto buffer_end;
|
||||
ctx->match_len |= (src[src_pos++] << 8u);
|
||||
ctx->match_len += 2;
|
||||
ctx->values_pos++;
|
||||
}
|
||||
|
||||
if (ctx->values_pos == 2) {
|
||||
if (src_pos >= src_size)
|
||||
goto buffer_end;
|
||||
ctx->offset_pos = (src[src_pos++] << 0u);
|
||||
ctx->values_pos++;
|
||||
}
|
||||
|
||||
if (ctx->values_pos == 3) {
|
||||
if (src_pos >= src_size)
|
||||
goto buffer_end;
|
||||
ctx->offset_pos |= (src[src_pos++] << 8u);
|
||||
ctx->values_pos++;
|
||||
}
|
||||
}
|
||||
else {
|
||||
ctx->match_len = ctx->token + 4;
|
||||
|
||||
if (ctx->values_pos == 0) {
|
||||
if (src_pos >= src_size)
|
||||
goto buffer_end;
|
||||
ctx->offset_pos = (src[src_pos++] << 0u);
|
||||
ctx->values_pos++;
|
||||
}
|
||||
|
||||
if (ctx->values_pos == 1) {
|
||||
if (src_pos >= src_size)
|
||||
goto buffer_end;
|
||||
ctx->offset_pos |= (src[src_pos++] << 8u);
|
||||
ctx->values_pos++;
|
||||
}
|
||||
}
|
||||
|
||||
ctx->state = SET_MATCH;
|
||||
break;
|
||||
|
||||
case SET_MATCH:
|
||||
ctx->match_pos = ctx->window_pos - ctx->offset_pos;
|
||||
if (ctx->match_pos < 0) /* circular buffer so negative is from window end */
|
||||
ctx->match_pos = LZXPCM_WINDOW_SIZE + ctx->match_pos;
|
||||
|
||||
ctx->state = COPY_MATCH;
|
||||
break;
|
||||
|
||||
case COPY_MATCH:
|
||||
while (ctx->match_len > 0) {
|
||||
if (dst_pos >= dst_size)
|
||||
goto buffer_end;
|
||||
|
||||
next_val = ctx->window[ctx->match_pos++];
|
||||
if (ctx->match_pos == LZXPCM_WINDOW_SIZE)
|
||||
ctx->match_pos = 0;
|
||||
|
||||
dst[dst_pos++] = next_val;
|
||||
|
||||
ctx->window[ctx->window_pos++] = next_val;
|
||||
if (ctx->window_pos == LZXPCM_WINDOW_SIZE)
|
||||
ctx->window_pos = 0;
|
||||
|
||||
ctx->match_len--;
|
||||
};
|
||||
|
||||
ctx->state = READ_FLAGS;
|
||||
break;
|
||||
|
||||
default:
|
||||
goto fail;
|
||||
}
|
||||
}
|
||||
|
||||
buffer_end:
|
||||
strm->next_out += dst_pos;
|
||||
strm->next_in += src_pos;
|
||||
strm->avail_out -= dst_pos;
|
||||
strm->avail_in -= src_pos;
|
||||
strm->total_out += dst_pos;
|
||||
strm->total_in += src_pos;
|
||||
|
||||
return LZXPCM_OK;
|
||||
fail:
|
||||
return LZXPCM_ERROR;
|
||||
}
|
||||
|
||||
|
||||
#if 0
|
||||
/* non-streamed form that XPCM originally uses, assumes buffers are big enough */
|
||||
static int lzxpcm_decompress_full(uint8_t* dst, size_t dst_size, const uint8_t* src, size_t src_size) {
|
||||
int src_pos = 0;
|
||||
int dst_pos = 0;
|
||||
uint32_t flags = 0;
|
||||
|
||||
|
||||
while (src_pos < src_size && dst_pos < dst_size) {
|
||||
flags >>= 1;
|
||||
|
||||
if ((flags & 0x0100) == 0) {
|
||||
flags = 0xFF00 | src[src_pos++];
|
||||
}
|
||||
|
||||
if (flags & 1) {
|
||||
/* uncompressed byte per bit */
|
||||
dst[dst_pos++] = src[src_pos++];
|
||||
}
|
||||
else {
|
||||
/* compressed data */
|
||||
uint32_t length;
|
||||
uint32_t offset;
|
||||
const uint32_t token = src[src_pos++];
|
||||
|
||||
if (token >= 0xC0) {
|
||||
length = ((token >> 2) & 0x0F) + 4; /* 6b */
|
||||
|
||||
offset = ((token & 3) << 8) | src[src_pos++]; /* upper 2b + lower 8b */
|
||||
}
|
||||
else if (token >= 0x80) {
|
||||
length = ((token >> 5) & 3) + 2; /* 2b */
|
||||
|
||||
offset = token & 0x1F; /* 5b */
|
||||
if (offset == 0) {
|
||||
offset = src[src_pos++];
|
||||
}
|
||||
}
|
||||
else if (token == 0x7F) {
|
||||
length = (uint16_t)(src[src_pos] | src[src_pos+1] << 8u) + 2;
|
||||
src_pos += 2;
|
||||
|
||||
offset = (uint16_t)(src[src_pos] | src[src_pos+1] << 8u);
|
||||
src_pos += 2;
|
||||
}
|
||||
else {
|
||||
length = token + 4;
|
||||
|
||||
offset = (uint16_t)(src[src_pos] | src[src_pos+1] << 8u);
|
||||
src_pos += 2;
|
||||
}
|
||||
|
||||
if (dst_pos + length > dst_size) {
|
||||
length = dst_size - dst_pos;
|
||||
}
|
||||
|
||||
for (int i = 0; i < length; i++) {
|
||||
dst[dst_pos] = dst[dst_pos - offset];
|
||||
dst_pos++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
#endif
|
7657
src/coding/circus_decoder_miniz.c
Normal file
7657
src/coding/circus_decoder_miniz.c
Normal file
File diff suppressed because it is too large
Load Diff
1346
src/coding/circus_decoder_miniz.h
Normal file
1346
src/coding/circus_decoder_miniz.h
Normal file
File diff suppressed because it is too large
Load Diff
@ -178,7 +178,13 @@ void decode_xmd(VGMSTREAMCHANNEL *stream, sample_t *outbuf, int channelspacing,
|
||||
void decode_derf(VGMSTREAMCHANNEL * stream, sample * outbuf, int channelspacing, int32_t first_sample, int32_t samples_to_do);
|
||||
|
||||
/* circus_decoder */
|
||||
void decode_circus_adpcm(VGMSTREAMCHANNEL * stream, sample * outbuf, int channelspacing, int32_t first_sample, int32_t samples_to_do);
|
||||
typedef struct circus_codec_data circus_codec_data;
|
||||
circus_codec_data* init_circus_vq(STREAMFILE* sf, off_t start, uint8_t codec, uint8_t flags);
|
||||
void decode_circus_vq(circus_codec_data* data, sample_t* outbuf, int32_t samples_to_do, int channels);
|
||||
void reset_circus_vq(circus_codec_data* data);
|
||||
void seek_circus_vq(circus_codec_data* data, int32_t num_sample);
|
||||
void free_circus_vq(circus_codec_data* data);
|
||||
void decode_circus_adpcm(VGMSTREAMCHANNEL* stream, sample_t* outbuf, int channelspacing, int32_t first_sample, int32_t samples_to_do);
|
||||
|
||||
/* oki_decoder */
|
||||
void decode_pcfx(VGMSTREAMCHANNEL * stream, sample_t * outbuf, int channelspacing, int32_t first_sample, int32_t samples_to_do, int mode);
|
||||
|
@ -762,7 +762,7 @@ static const coding_info coding_info_list[] = {
|
||||
{coding_UBI_ADPCM, "Ubisoft 4/6-bit ADPCM"},
|
||||
|
||||
{coding_EA_MT, "Electronic Arts MicroTalk"},
|
||||
|
||||
{coding_CIRCUS_VQ, "Circus VQ"},
|
||||
{coding_RELIC, "Relic Codec"},
|
||||
{coding_CRI_HCA, "CRI HCA"},
|
||||
|
||||
|
@ -1902,6 +1902,22 @@
|
||||
RelativePath=".\coding\acm_decoder_libacm.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\coding\circus_decoder_lib.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\coding\circus_decoder_lib_data.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\coding\circus_decoder_lzxpcm.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\coding\circus_decoder_miniz.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\coding\coding.h"
|
||||
>
|
||||
@ -1978,6 +1994,14 @@
|
||||
RelativePath=".\coding\circus_decoder.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\coding\circus_decoder_lib.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\coding\circus_decoder_miniz.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\coding\coding_utils.c"
|
||||
>
|
||||
|
@ -139,6 +139,10 @@
|
||||
<ClInclude Include="meta\hca_keys_awb.h" />
|
||||
<ClInclude Include="meta\fsb_keys.h" />
|
||||
<ClInclude Include="coding\acm_decoder_libacm.h" />
|
||||
<ClInclude Include="coding\circus_decoder_lib.h" />
|
||||
<ClInclude Include="coding\circus_decoder_lib_data.h" />
|
||||
<ClInclude Include="coding\circus_decoder_lzxpcm.h" />
|
||||
<ClInclude Include="coding\circus_decoder_miniz.h" />
|
||||
<ClInclude Include="coding\coding.h" />
|
||||
<ClInclude Include="coding\ea_mt_decoder_utk.h" />
|
||||
<ClInclude Include="coding\g7221_decoder_aes.h" />
|
||||
@ -154,6 +158,8 @@
|
||||
<ClCompile Include="coding\atrac9_decoder.c" />
|
||||
<ClCompile Include="coding\celt_fsb_decoder.c" />
|
||||
<ClCompile Include="coding\circus_decoder.c" />
|
||||
<ClCompile Include="coding\circus_decoder_lib.c" />
|
||||
<ClCompile Include="coding\circus_decoder_miniz.c" />
|
||||
<ClCompile Include="coding\coding_utils.c" />
|
||||
<ClCompile Include="coding\ffmpeg_decoder.c" />
|
||||
<ClCompile Include="coding\ffmpeg_decoder_utils.c" />
|
||||
|
@ -188,6 +188,18 @@
|
||||
<ClInclude Include="coding\acm_decoder_libacm.h">
|
||||
<Filter>coding\Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="coding\circus_decoder_lib.h">
|
||||
<Filter>coding\Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="coding\circus_decoder_lib_data.h">
|
||||
<Filter>coding\Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="coding\circus_decoder_lzxpcm.h">
|
||||
<Filter>coding\Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="coding\circus_decoder_miniz.h">
|
||||
<Filter>coding\Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="coding\coding.h">
|
||||
<Filter>coding\Header Files</Filter>
|
||||
</ClInclude>
|
||||
@ -1600,6 +1612,12 @@
|
||||
<ClCompile Include="coding\circus_decoder.c">
|
||||
<Filter>coding\Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="coding\circus_decoder_lib.c">
|
||||
<Filter>coding\Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="coding\circus_decoder_miniz.c">
|
||||
<Filter>coding\Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="meta\bcstm.c">
|
||||
<Filter>meta\Source Files</Filter>
|
||||
</ClCompile>
|
||||
|
@ -6,7 +6,7 @@ VGMSTREAM * init_vgmstream_xpcm(STREAMFILE *streamFile) {
|
||||
VGMSTREAM * vgmstream = NULL;
|
||||
off_t start_offset;
|
||||
size_t decompressed_size;
|
||||
int loop_flag, channel_count, codec, subcodec, sample_rate;
|
||||
int loop_flag, channel_count, codec, flags, sample_rate;
|
||||
|
||||
|
||||
/* checks */
|
||||
@ -17,8 +17,8 @@ VGMSTREAM * init_vgmstream_xpcm(STREAMFILE *streamFile) {
|
||||
goto fail;
|
||||
|
||||
decompressed_size = read_32bitLE(0x04,streamFile); /* (data_size for PCM) */
|
||||
codec = read_8bit(0x08, streamFile);
|
||||
subcodec = read_8bit(0x09, streamFile);
|
||||
codec = read_8bit(0x08, streamFile);
|
||||
flags = read_8bit(0x09, streamFile);
|
||||
/* 0x0a: always null */
|
||||
/* 0x0c: always 0x01 (PCM codec) */
|
||||
channel_count = read_16bitLE(0x0e,streamFile);
|
||||
@ -41,20 +41,33 @@ VGMSTREAM * init_vgmstream_xpcm(STREAMFILE *streamFile) {
|
||||
|
||||
switch(codec) {
|
||||
case 0x00:
|
||||
if (subcodec != 0) goto fail;
|
||||
if (flags != 0) goto fail;
|
||||
vgmstream->coding_type = coding_PCM16LE;
|
||||
vgmstream->layout_type = layout_interleave;
|
||||
vgmstream->interleave_block_size = 0x02;
|
||||
break;
|
||||
|
||||
case 0x02:
|
||||
if (subcodec != 0) goto fail;
|
||||
if (flags != 0) goto fail;
|
||||
vgmstream->coding_type = coding_CIRCUS_ADPCM;
|
||||
vgmstream->layout_type = layout_interleave;
|
||||
vgmstream->interleave_block_size = 0x01;
|
||||
break;
|
||||
|
||||
case 0x01: /* LZSS + VQ */
|
||||
case 0x03: /* unknown */
|
||||
case 0x01: /* VQ + LZ (usually music) */
|
||||
case 0x03: /* VQ + deflate (usually sfx/voices) */
|
||||
vgmstream->codec_data = init_circus_vq(streamFile, 0x20, codec, flags);
|
||||
if (!vgmstream->codec_data) goto fail;
|
||||
vgmstream->coding_type = coding_CIRCUS_VQ;
|
||||
vgmstream->layout_type = layout_none;
|
||||
|
||||
/* not too sure about samples, since decompressed size isn't exact sometimes vs
|
||||
* total decompression, though it's what the code uses to alloc bufs (plus + 0x2000 leeway) */
|
||||
//vgmstream->num_samples = decompressed_size / 0x2000 * 4064 / channel_count;
|
||||
//if (decompressed_size % 0x2000 != 0)
|
||||
// vgmstream->num_samples += (decompressed_size % 0x2000) / channel_count;
|
||||
break;
|
||||
|
||||
default:
|
||||
goto fail;
|
||||
}
|
||||
|
@ -662,6 +662,10 @@ void reset_vgmstream(VGMSTREAM * vgmstream) {
|
||||
}
|
||||
#endif
|
||||
|
||||
if (vgmstream->coding_type == coding_CIRCUS_VQ) {
|
||||
reset_circus_vq(vgmstream->codec_data);
|
||||
}
|
||||
|
||||
if (vgmstream->coding_type == coding_RELIC) {
|
||||
reset_relic(vgmstream->codec_data);
|
||||
}
|
||||
@ -833,6 +837,11 @@ void close_vgmstream(VGMSTREAM * vgmstream) {
|
||||
}
|
||||
#endif
|
||||
|
||||
if (vgmstream->coding_type == coding_CIRCUS_VQ) {
|
||||
free_circus_vq(vgmstream->codec_data);
|
||||
vgmstream->codec_data = NULL;
|
||||
}
|
||||
|
||||
if (vgmstream->coding_type == coding_RELIC) {
|
||||
free_relic(vgmstream->codec_data);
|
||||
vgmstream->codec_data = NULL;
|
||||
@ -1289,6 +1298,8 @@ int get_vgmstream_samples_per_frame(VGMSTREAM * vgmstream) {
|
||||
return 0; /* varies per mode */
|
||||
case coding_EA_MT:
|
||||
return 0; /* 432, but variable in looped files */
|
||||
case coding_CIRCUS_VQ:
|
||||
return 0;
|
||||
case coding_RELIC:
|
||||
return 0; /* 512 */
|
||||
case coding_CRI_HCA:
|
||||
@ -1776,6 +1787,9 @@ void decode_vgmstream(VGMSTREAM * vgmstream, int samples_written, int samples_to
|
||||
samples_to_do,vgmstream->channels);
|
||||
break;
|
||||
#endif
|
||||
case coding_CIRCUS_VQ:
|
||||
decode_circus_vq(vgmstream->codec_data, buffer+samples_written*vgmstream->channels, samples_to_do, vgmstream->channels);
|
||||
break;
|
||||
case coding_RELIC:
|
||||
decode_relic(&vgmstream->ch[0], vgmstream->codec_data, buffer+samples_written*vgmstream->channels,
|
||||
samples_to_do);
|
||||
@ -2228,6 +2242,10 @@ int vgmstream_do_loop(VGMSTREAM * vgmstream) {
|
||||
|
||||
/* prepare certain codecs' internal state for looping */
|
||||
|
||||
if (vgmstream->coding_type == coding_CIRCUS_VQ) {
|
||||
seek_circus_vq(vgmstream->codec_data, vgmstream->loop_sample);
|
||||
}
|
||||
|
||||
if (vgmstream->coding_type == coding_RELIC) {
|
||||
seek_relic(vgmstream->codec_data, vgmstream->loop_sample);
|
||||
}
|
||||
|
@ -181,7 +181,7 @@ typedef enum {
|
||||
coding_UBI_ADPCM, /* Ubisoft 4/6-bit ADPCM */
|
||||
|
||||
coding_EA_MT, /* Electronic Arts MicroTalk (linear-predictive speech codec) */
|
||||
|
||||
coding_CIRCUS_VQ, /* Circus VQ */
|
||||
coding_RELIC, /* Relic Codec (DCT-based) */
|
||||
coding_CRI_HCA, /* CRI High Compression Audio (MDCT-based) */
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user