claunia/cuetools.net
1
0
Fork 0
mirror of https://github.com/claunia/cuetools.net.git synced 2025-12-16 18:14:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

1) Support for user-defined external commandline codecs, tested on TAK

Browse Source 
2) Better support for zip archives, which previously worked only with flac/wav files
3) More reliable tag handling, using taglib-sharp. Pictures are now preserved.
4) ALAC decoder bug fixed
This commit is contained in:
chudov
2009-02-19 04:09:59 +00:00
parent 3d94188f92
commit f37d698f6a
32 changed files with 3965 additions and 2641 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
CUETools.Codecs.ALAC/ALACDotNet.cs
View File

@@ -476,7 +476,7 @@ namespace CUETools.Codecs.ALAC
for (int output_count = 0; output_count < output_size; output_count++)
{
int x = sign_modifier + decode_scalar(buff, ref pos, 31 - count_leading_zeroes((history >> 9) + 3), rice_kmodifier, readsamplesize);
output_buffer[output_count] = ((x + 1) >> 1) * (1 - ((x & 1) << 1));
output_buffer[output_count] = (x >> 1) ^ - (x & 1);
sign_modifier = 0;
/* now update the history */
@@ -542,7 +542,7 @@ namespace CUETools.Codecs.ALAC
return;
for (i = 0; i < output_size; i++)
{
sample += buf_err[i];
sample = extend_sign32(sample + buf_err[i], readsamplesize);
buf_out[i] = sample;
}
return;
@@ -554,7 +554,7 @@ namespace CUETools.Codecs.ALAC
/* read warm-up samples */
for (i = 0; i <= predictor_info.predictor_coef_num; i++)
{
sample += buf_err[i];
sample = extend_sign32(sample + buf_err[i], readsamplesize);
buf_out[i] = sample;
}
@@ -576,7 +576,7 @@ namespace CUETools.Codecs.ALAC
outval >>= pr->prediction_quantitization;
outval += sample_val + error_val;
buf_pos[pr->predictor_coef_num] = outval;
buf_pos[pr->predictor_coef_num] = extend_sign32(outval, readsamplesize);
if (error_val != 0)
{
@@ -614,14 +614,20 @@ namespace CUETools.Codecs.ALAC
{
for (i = 0; i < _samplesInBuffer; i++)
{
int a = buf_a[i];
int b = buf_b[i];
int midright = buf_a[i];
int diff = buf_b[i];
a -= (b * _interlacing_leftweight) >> _interlacing_shift;
b += a;
midright -= (diff * _interlacing_leftweight) >> _interlacing_shift;
buf_s[i * 2] = b;
buf_s[i * 2 + 1] = a;
buf_s[i * 2] = midright + diff;
buf_s[i * 2 + 1] = midright;
#if DEBUG
if (buf_s[i * 2] >= (1 << _bitsPerSample) || buf_s[i * 2] < -(1 << _bitsPerSample) ||
buf_s[i * 2 + 1] >= (1 << _bitsPerSample) || buf_s[i * 2 + 1] < -(1 << _bitsPerSample)
)
throw new Exception("overflow in ALAC decoder");
#endif
}
return;
}
@@ -1169,21 +1175,22 @@ namespace CUETools.Codecs.ALAC
qtmovie_add_any_parser("top.moov.trak.mdia.minf.stbl.stsz", new qtmovie_read_atom(qtmovie_read_chunk_stsz), null); // _sample_byte_size
qtmovie_add_nul_parser("top.moov.trak.mdia.minf.stbl.stsc"); /* skip these, no indexing for us! */
qtmovie_add_nul_parser("top.moov.trak.mdia.minf.stbl.stco"); /* skip these, no indexing for us! */
qtmovie_add_lst_parser("top.moov.udta", null);
qtmovie_add_lst_parser("top.moov.udta.meta", (uint)4);
qtmovie_add_lst_parser("top.moov.udta.meta.ilst", null);
qtmovie_add_tag_parser("top.moov.udta.meta.ilst.<2E>nam", "TITLE");
qtmovie_add_tag_parser("top.moov.udta.meta.ilst.<2E>ART", "ARTIST");
qtmovie_add_tag_parser("top.moov.udta.meta.ilst.<2E>wrt", "COMPOSER");
qtmovie_add_tag_parser("top.moov.udta.meta.ilst.<2E>alb", "ALBUM");
qtmovie_add_tag_parser("top.moov.udta.meta.ilst.<2E>day", "DATE");
qtmovie_add_tag_parser("top.moov.udta.meta.ilst.<2E>gen", "GENRE");
qtmovie_add_tag_parser("top.moov.udta.meta.ilst.disk");
qtmovie_add_tag_parser("top.moov.udta.meta.ilst.trkn");
qtmovie_add_any_parser("top.moov.udta.meta.ilst.----", new qtmovie_read_atom(qtmovie_read_meta_freeform), null);
qtmovie_add_any_parser("top.moov.udta.meta.ilst.----.mean", new qtmovie_read_atom(qtmovie_read_meta_mean), null);
qtmovie_add_any_parser("top.moov.udta.meta.ilst.----.name", new qtmovie_read_atom(qtmovie_read_meta_name), null);
qtmovie_add_any_parser("top.moov.udta.meta.ilst.----.data", new qtmovie_read_atom(qtmovie_read_meta_data), null);
qtmovie_add_nul_parser("top.moov.udta");
//qtmovie_add_lst_parser("top.moov.udta", null);
//qtmovie_add_lst_parser("top.moov.udta.meta", (uint)4);
//qtmovie_add_lst_parser("top.moov.udta.meta.ilst", null);
//qtmovie_add_tag_parser("top.moov.udta.meta.ilst.<2E>nam", "TITLE");
//qtmovie_add_tag_parser("top.moov.udta.meta.ilst.<2E>ART", "ARTIST");
//qtmovie_add_tag_parser("top.moov.udta.meta.ilst.<2E>wrt", "COMPOSER");
//qtmovie_add_tag_parser("top.moov.udta.meta.ilst.<2E>alb", "ALBUM");
//qtmovie_add_tag_parser("top.moov.udta.meta.ilst.<2E>day", "DATE");
//qtmovie_add_tag_parser("top.moov.udta.meta.ilst.<EFBFBD>gen", "GENRE");
//qtmovie_add_tag_parser("top.moov.udta.meta.ilst.disk");
//qtmovie_add_tag_parser("top.moov.udta.meta.ilst.trkn");
//qtmovie_add_any_parser("top.moov.udta.meta.ilst.----", new qtmovie_read_atom(qtmovie_read_meta_freeform), null);
//qtmovie_add_any_parser("top.moov.udta.meta.ilst.----.mean", new qtmovie_read_atom(qtmovie_read_meta_mean), null);
//qtmovie_add_any_parser("top.moov.udta.meta.ilst.----.name", new qtmovie_read_atom(qtmovie_read_meta_name), null);
//qtmovie_add_any_parser("top.moov.udta.meta.ilst.----.data", new qtmovie_read_atom(qtmovie_read_meta_data), null);
while (true)
{