changeset 2182:cc5e9ec110a4

Added initial version of Monkey's Audio plugin
author Eugene Zagidullin <e.asphyx@gmail.com>
date Thu, 22 Nov 2007 02:54:06 +0300
parents bbb631ab78e9
children b73ea297d197
files configure.ac src/demac/Makefile src/demac/ape.c src/demac/ape.h src/demac/apedec.c src/demac/apev2.c src/demac/apev2.h src/demac/crc.c src/demac/plugin.c
diffstat 9 files changed, 2201 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Wed Nov 21 17:02:26 2007 +0100
+++ b/configure.ac	Thu Nov 22 02:54:06 2007 +0300
@@ -770,6 +770,18 @@
 	INPUT_PLUGINS="$INPUT_PLUGINS wma"
 fi
 
+dnl *** Monkey's Audio
+
+AC_ARG_ENABLE(ape,
+    [  --disable-ape           disable Monkey's Audio plugin. (default=enabled)],
+    [enable_ape=$enableval],
+    [enable_ape=yes]
+)
+
+if test "$enable_ape" = "yes"; then
+	INPUT_PLUGINS="$INPUT_PLUGINS demac"
+fi
+
 dnl *** jack output plugin
 AC_ARG_ENABLE( jack,
 [  --disable-jack          disable jack output plugin (default=enabled)], [enable_jack=$enableval],
@@ -1615,6 +1627,7 @@
 echo "  MPEG 1/2/3 (madplug):                   $enable_mp3"
 echo "  MPEG 4 Audio (AAC):                     $enable_aac"
 echo "  Windows Media Audio (wma):              $enable_wma"
+echo "  Monkey's Audio (ape):                   $enable_ape"
 echo "  Module decoder (modplug):               $have_modplug"
 echo "  MIDI modular plugin (amidi-plug):       $enable_amidiplug"
 echo "    -> ALSA backend:                      $enable_amidiplug_alsa"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/demac/Makefile	Thu Nov 22 02:54:06 2007 +0300
@@ -0,0 +1,15 @@
+PLUGIN = demac${PLUGIN_SUFFIX}
+
+SRCS = plugin.c	\
+       apev2.c \
+       ape.c \
+       apedec.c
+
+include ../../buildsys.mk
+include ../../extra.mk
+
+plugindir := ${plugindir}/${INPUT_PLUGIN_DIR}
+
+CFLAGS += ${PLUGIN_CFLAGS}
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} -I../../intl -I../..
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/demac/ape.c	Thu Nov 22 02:54:06 2007 +0300
@@ -0,0 +1,370 @@
+/*
+ * Monkey's Audio APE demuxer, standalone version
+ * Copyright (c) 2007 Benjamin Zores <ben@geexbox.org>
+ *  based upon libdemac from Dave Chapman.
+ * Copyright (c) 2007 Eugene Zagidullin <e.asphyx@gmail.com>
+ *   Cleanup libav* depending code, Audacious stuff.
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <stdio.h>
+#include <stdlib.h> 
+#include <errno.h> 
+#include <string.h> 
+
+#include <audacious/vfs.h>
+#include <audacious/plugin.h> 
+
+#include "ape.h"
+
+#define ENABLE_DEBUG 0
+
+/* The earliest and latest file formats supported by this library */
+#define APE_MIN_VERSION 3950
+#define APE_MAX_VERSION 3990
+
+#define MAC_FORMAT_FLAG_8_BIT                 1 // is 8-bit [OBSOLETE]
+#define MAC_FORMAT_FLAG_CRC                   2 // uses the new CRC32 error detection [OBSOLETE]
+#define MAC_FORMAT_FLAG_HAS_PEAK_LEVEL        4 // uint32 nPeakLevel after the header [OBSOLETE]
+#define MAC_FORMAT_FLAG_24_BIT                8 // is 24-bit [OBSOLETE]
+#define MAC_FORMAT_FLAG_HAS_SEEK_ELEMENTS    16 // has the number of seek elements after the peak level
+#define MAC_FORMAT_FLAG_CREATE_WAV_HEADER    32 // create the wave header on decompression (not stored)
+
+#define MAC_SUBFRAME_SIZE 4608
+
+#define APE_EXTRADATA_SIZE 6
+
+/* APE tags */
+#define APE_TAG_VERSION               2000
+#define APE_TAG_FOOTER_BYTES          32
+#define APE_TAG_FLAG_CONTAINS_HEADER  (1 << 31)
+#define APE_TAG_FLAG_IS_HEADER        (1 << 29)
+
+#define TAG(name, field)  {name, offsetof(AVFormatContext, field), sizeof(((AVFormatContext *)0)->field)}
+
+
+static uint16_t get_le16(VFSFile *vfd)
+{
+    unsigned char tmp[2];
+    
+    if(aud_vfs_fread(tmp, 1, 2, vfd) != 2) return -1;
+    return tmp[0] | (tmp[1] << 8);
+}
+
+static uint32_t get_le32(VFSFile *vfd)
+{
+    unsigned char tmp[4];
+    
+    if(aud_vfs_fread(tmp, 1, 4, vfd) != 4) return -1;
+    return tmp[0] | (tmp[1] << 8) | (tmp[2] << 16) | (tmp[3] << 24);
+}
+
+#ifdef DEBUG
+static void ape_dumpinfo(APEContext * ape_ctx)
+{
+    int i;
+
+    av_log(NULL, AV_LOG_DEBUG, "Descriptor Block:\n\n");
+    av_log(NULL, AV_LOG_DEBUG, "magic                = \"%c%c%c%c\"\n", ape_ctx->magic[0], ape_ctx->magic[1], ape_ctx->magic[2], ape_ctx->magic[3]);
+    av_log(NULL, AV_LOG_DEBUG, "fileversion          = %d\n", ape_ctx->fileversion);
+    av_log(NULL, AV_LOG_DEBUG, "descriptorlength     = %d\n", ape_ctx->descriptorlength);
+    av_log(NULL, AV_LOG_DEBUG, "headerlength         = %d\n", ape_ctx->headerlength);
+    av_log(NULL, AV_LOG_DEBUG, "seektablelength      = %d\n", ape_ctx->seektablelength);
+    av_log(NULL, AV_LOG_DEBUG, "wavheaderlength      = %d\n", ape_ctx->wavheaderlength);
+    av_log(NULL, AV_LOG_DEBUG, "audiodatalength      = %d\n", ape_ctx->audiodatalength);
+    av_log(NULL, AV_LOG_DEBUG, "audiodatalength_high = %d\n", ape_ctx->audiodatalength_high);
+    av_log(NULL, AV_LOG_DEBUG, "wavtaillength        = %d\n", ape_ctx->wavtaillength);
+    av_log(NULL, AV_LOG_DEBUG, "md5                  = ");
+    for (i = 0; i < 16; i++)
+         av_log(NULL, AV_LOG_DEBUG, "%02x", ape_ctx->md5[i]);
+    av_log(NULL, AV_LOG_DEBUG, "\n");
+
+    av_log(NULL, AV_LOG_DEBUG, "\nHeader Block:\n\n");
+
+    av_log(NULL, AV_LOG_DEBUG, "compressiontype      = %d\n", ape_ctx->compressiontype);
+    av_log(NULL, AV_LOG_DEBUG, "formatflags          = %d\n", ape_ctx->formatflags);
+    av_log(NULL, AV_LOG_DEBUG, "blocksperframe       = %d\n", ape_ctx->blocksperframe);
+    av_log(NULL, AV_LOG_DEBUG, "finalframeblocks     = %d\n", ape_ctx->finalframeblocks);
+    av_log(NULL, AV_LOG_DEBUG, "totalframes          = %d\n", ape_ctx->totalframes);
+    av_log(NULL, AV_LOG_DEBUG, "bps                  = %d\n", ape_ctx->bps);
+    av_log(NULL, AV_LOG_DEBUG, "channels             = %d\n", ape_ctx->channels);
+    av_log(NULL, AV_LOG_DEBUG, "samplerate           = %d\n", ape_ctx->samplerate);
+
+    av_log(NULL, AV_LOG_DEBUG, "\nSeektable\n\n");
+    if ((ape_ctx->seektablelength / sizeof(uint32_t)) != ape_ctx->totalframes) {
+        av_log(NULL, AV_LOG_DEBUG, "No seektable\n");
+    } else {
+        for (i = 0; i < ape_ctx->seektablelength / sizeof(uint32_t); i++) {
+            if (i < ape_ctx->totalframes - 1) {
+                av_log(NULL, AV_LOG_DEBUG, "%8d   %d (%d bytes)\n", i, ape_ctx->seektable[i], ape_ctx->seektable[i + 1] - ape_ctx->seektable[i]);
+            } else {
+                av_log(NULL, AV_LOG_DEBUG, "%8d   %d\n", i, ape_ctx->seektable[i]);
+            }
+        }
+    }
+
+    av_log(NULL, AV_LOG_DEBUG, "\nFrames\n\n");
+    for (i = 0; i < ape_ctx->totalframes; i++)
+        av_log(NULL, AV_LOG_DEBUG, "%8d   %8lld %8d (%d samples)\n", i, ape_ctx->frames[i].pos, ape_ctx->frames[i].size, ape_ctx->frames[i].nblocks);
+
+    av_log(NULL, AV_LOG_DEBUG, "\nCalculated information:\n\n");
+    av_log(NULL, AV_LOG_DEBUG, "junklength           = %d\n", ape_ctx->junklength);
+    av_log(NULL, AV_LOG_DEBUG, "firstframe           = %d\n", ape_ctx->firstframe);
+    av_log(NULL, AV_LOG_DEBUG, "totalsamples         = %d\n", ape_ctx->totalsamples);
+}
+#else
+#define ape_dumpinfo(a) ;
+#endif
+
+int ape_read_header(APEContext *ape, VFSFile *pb, int probe_only)
+{
+    /*ByteIOContext *pb = &s->pb;
+    APEContext *ape = s->priv_data;
+    AVStream *st;*/
+    uint32_t tag;
+    int i;
+    //int total_blocks;
+    //int64_t pts;
+
+    /* TODO: Skip any leading junk such as id3v2 tags */
+    ape->junklength = 0;
+
+    tag = get_le32(pb);
+    if (tag != MKTAG('M', 'A', 'C', ' '))
+        return -1;
+
+    ape->fileversion = get_le16(pb);
+
+    if (ape->fileversion < APE_MIN_VERSION || ape->fileversion > APE_MAX_VERSION) {
+#ifdef DEBUG
+        fprintf(stderr, "ape.c: ape_read_header(): Unsupported file version - %d.%02d\n",
+	        ape->fileversion / 1000, (ape->fileversion % 1000) / 10);
+#endif
+        return -1;
+    }
+
+    if (ape->fileversion >= 3980) {
+        ape->padding1             = get_le16(pb);
+        ape->descriptorlength     = get_le32(pb);
+        ape->headerlength         = get_le32(pb);
+        ape->seektablelength      = get_le32(pb);
+        ape->wavheaderlength      = get_le32(pb);
+        ape->audiodatalength      = get_le32(pb);
+        ape->audiodatalength_high = get_le32(pb);
+        ape->wavtaillength        = get_le32(pb);
+
+        aud_vfs_fread(ape->md5, 1, 16, pb);
+
+        /* Skip any unknown bytes at the end of the descriptor.
+           This is for future compatibility */
+        if (ape->descriptorlength > 52)
+	    aud_vfs_fseek(pb, ape->descriptorlength - 52, SEEK_CUR);
+
+        /* Read header data */
+        ape->compressiontype      = get_le16(pb);
+        ape->formatflags          = get_le16(pb);
+        ape->blocksperframe       = get_le32(pb);
+        ape->finalframeblocks     = get_le32(pb);
+        ape->totalframes          = get_le32(pb);
+        ape->bps                  = get_le16(pb);
+        ape->channels             = get_le16(pb);
+        ape->samplerate           = get_le32(pb);
+    } else {
+        ape->descriptorlength = 0;
+        ape->headerlength = 32;
+
+        ape->compressiontype      = get_le16(pb);
+        ape->formatflags          = get_le16(pb);
+        ape->channels             = get_le16(pb);
+        ape->samplerate           = get_le32(pb);
+        ape->wavheaderlength      = get_le32(pb);
+        ape->wavtaillength        = get_le32(pb);
+        ape->totalframes          = get_le32(pb);
+        ape->finalframeblocks     = get_le32(pb);
+
+        if (ape->formatflags & MAC_FORMAT_FLAG_HAS_PEAK_LEVEL) {
+	    aud_vfs_fseek(pb, 4, SEEK_CUR); /* Skip the peak level */
+            ape->headerlength += 4;
+        }
+
+        if (ape->formatflags & MAC_FORMAT_FLAG_HAS_SEEK_ELEMENTS) {
+            ape->seektablelength = get_le32(pb);
+            ape->headerlength += 4;
+            ape->seektablelength *= sizeof(int32_t);
+        } else
+            ape->seektablelength = ape->totalframes * sizeof(int32_t);
+
+        if (ape->formatflags & MAC_FORMAT_FLAG_8_BIT)
+            ape->bps = 8;
+        else if (ape->formatflags & MAC_FORMAT_FLAG_24_BIT)
+            ape->bps = 24;
+        else
+            ape->bps = 16;
+
+        if (ape->fileversion >= 3950)
+            ape->blocksperframe = 73728 * 4;
+        else if (ape->fileversion >= 3900 || (ape->fileversion >= 3800  && ape->compressiontype >= 4000))
+            ape->blocksperframe = 73728;
+        else
+            ape->blocksperframe = 9216;
+
+        /* Skip any stored wav header */
+        if (!(ape->formatflags & MAC_FORMAT_FLAG_CREATE_WAV_HEADER))
+	    aud_vfs_fseek(pb, ape->wavheaderlength, SEEK_CUR);
+    }
+
+    if(ape->totalframes > UINT_MAX / sizeof(APEFrame)){
+#ifdef DEBUG
+        fprintf(stdout, "Too many frames: %d\n", ape->totalframes);
+#endif
+        return -1;
+    }
+    
+    if(!probe_only) {
+      ape->frames = malloc(ape->totalframes * sizeof(APEFrame));
+      if(!ape->frames)
+          return AVERROR_NOMEM;
+    }
+
+    ape->firstframe   = ape->junklength + ape->descriptorlength + ape->headerlength + ape->seektablelength + ape->wavheaderlength;
+    ape->currentframe = 0;
+
+    ape->totalsamples = ape->finalframeblocks;
+    if (ape->totalframes > 1)
+        ape->totalsamples += ape->blocksperframe * (ape->totalframes - 1);
+    
+    if (!probe_only) {
+        if (ape->seektablelength > 0) {
+            ape->seektable = malloc(ape->seektablelength);
+            for (i = 0; i < ape->seektablelength / sizeof(uint32_t); i++)
+                ape->seektable[i] = get_le32(pb);
+        }
+
+        ape->frames[0].pos     = ape->firstframe;
+        ape->frames[0].nblocks = ape->blocksperframe;
+        ape->frames[0].skip    = 0;
+        for (i = 1; i < ape->totalframes; i++) {
+            ape->frames[i].pos      = ape->seektable[i]; //ape->frames[i-1].pos + ape->blocksperframe;
+            ape->frames[i].nblocks  = ape->blocksperframe;
+            ape->frames[i - 1].size = ape->frames[i].pos - ape->frames[i - 1].pos;
+            ape->frames[i].skip     = (ape->frames[i].pos - ape->frames[0].pos) & 3;
+        }
+        ape->frames[ape->totalframes - 1].size    = ape->finalframeblocks * 4;
+        ape->frames[ape->totalframes - 1].nblocks = ape->finalframeblocks;
+
+        ape->max_packet_size = 0;
+        
+        for (i = 0; i < ape->totalframes; i++) {
+            if(ape->frames[i].skip){
+                ape->frames[i].pos  -= ape->frames[i].skip;
+                ape->frames[i].size += ape->frames[i].skip;
+            }
+            ape->frames[i].size = (ape->frames[i].size + 3) & ~3;
+    	    // Eugene:
+    	    ape->max_packet_size = MAX(ape->max_packet_size, ape->frames[i].size + 8);
+    	    // why +8? look in ape_read_packet()
+        }
+        ape_dumpinfo(ape);
+
+    } // !probe_only
+
+    //ape->total_blocks = (ape->totalframes == 0) ? 0 : ((ape->totalframes - 1) * ape->blocksperframe) + ape->finalframeblocks;
+    ape->frame_size = MAC_SUBFRAME_SIZE;
+    //ape->duration = (uint64_t) total_blocks * AV_TIME_BASE / ape->samplerate;
+    ape->duration = (uint64_t) ape->totalsamples * AV_TIME_BASE / ape->samplerate;
+
+#ifdef DEBUG
+    fprintf(stderr, "Decoding file - v%4.2f, compression level %d, duration %llu msec, %d frames, %d blocks per frame, %s\n",
+            ape->fileversion / 1000.0, ape->compressiontype, (unsigned long long)ape->duration,
+	    ape->totalframes, ape->blocksperframe, ape->channels == 2 ? "stereo" : "mono");
+#endif
+
+    //av_set_pts_info(st, 64, MAC_SUBFRAME_SIZE, ape->samplerate);
+
+    /*pts = 0;
+    for (i = 0; i < ape->totalframes; i++) {
+        ape->frames[i].pts = pts;
+        av_add_index_entry(st, ape->frames[i].pos, ape->frames[i].pts, 0, 0, AVINDEX_KEYFRAME);
+        pts += ape->blocksperframe / MAC_SUBFRAME_SIZE;
+    }*/
+
+    return 0;
+}
+
+/* buffer must be allocated before in conformity to ape->max_packet_size. Eugene. */
+int ape_read_packet(APEContext *ape, VFSFile *pb, uint8_t *pkt, int *pkt_size)
+{
+    int ret;
+    int nblocks;
+    uint32_t extra_size = 8;
+
+    if (aud_vfs_feof(pb))
+        return AVERROR_IO;
+    if (ape->currentframe > ape->totalframes)
+        return AVERROR_IO;
+
+    aud_vfs_fseek(pb, ape->frames[ape->currentframe].pos, SEEK_SET);
+
+    /* Calculate how many blocks there are in this frame */
+    if (ape->currentframe == (ape->totalframes - 1))
+        nblocks = ape->finalframeblocks;
+    else
+        nblocks = ape->blocksperframe;
+
+    /*if (av_new_packet(pkt,  ape->frames[ape->currentframe].size + extra_size) < 0)
+        return AVERROR_NOMEM;*/
+
+    AV_WL32(pkt    , nblocks);
+    AV_WL32(pkt + 4, ape->frames[ape->currentframe].skip);
+
+    ret = aud_vfs_fread(pkt + extra_size, 1, ape->frames[ape->currentframe].size, pb);
+
+    /*pkt->pts = ape->frames[ape->currentframe].pts;
+    pkt->stream_index = 0;*/
+
+    /* note: we need to modify the packet size here to handle the last
+       packet */
+    /*pkt->size = ret + extra_size;*/
+
+    ape->currentframe++;
+    *pkt_size = ape->frames[ape->currentframe].size + extra_size;
+
+    return 0;
+}
+
+int ape_read_close(APEContext *ape)
+{
+    if(ape->frames != NULL) free(ape->frames);
+    if(ape->seektable != NULL) free(ape->seektable);
+    return 0;
+}
+
+/*
+static int ape_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp, int flags)
+{
+    AVStream *st = s->streams[stream_index];
+    APEContext *ape = s->priv_data;
+    int index = av_index_search_timestamp(st, timestamp, flags);
+
+    if (index < 0)
+        return -1;
+
+    ape->currentframe = index;
+    return 0;
+}*/
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/demac/ape.h	Thu Nov 22 02:54:06 2007 +0300
@@ -0,0 +1,299 @@
+/*
+ * Monkey's Audio lossless audio decoder, common header,
+ * some libav* compatibility stuff
+ * Copyright (c) 2007 Benjamin Zores <ben@geexbox.org>
+ *  based upon libdemac from Dave Chapman.
+ * Copyright (c) 2007 Eugene Zagidullin <e.asphyx@gmail.com>
+ *   Cleanup libav* depending code, Audacious stuff.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or 
+ * (at your option) any later version. 
+ *  
+ * This program is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * GNU General Public License for more details. 
+ *  
+ * You should have received a copy of the GNU General Public License 
+ * along with this program; if not, write to the Free Software 
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA
+ */
+
+#ifndef APE_H
+#define APE_H
+
+#define FFMIN(a,b) ((a) < (b) ? (a) : (b))
+
+#ifdef DEBUG
+#define av_log(a, b, ...) fprintf(stderr, __VA_ARGS__)
+#else
+#define av_log(a, b, ...) ;
+#endif
+
+#define MKTAG(a,b,c,d) (a | (b << 8) | (c << 16) | (d << 24))
+#define AV_TIME_BASE 1000
+#define AV_WL16(a,b) { \
+          ((uint8_t*)(a))[0] =  (uint16_t)(b) & 0x00ff;        \
+          ((uint8_t*)(a))[1] = ((uint16_t)(b) & 0xff00) >> 8; \
+	}
+#define AV_WL32(a,b) { \
+          ((uint8_t*)(a))[0] = ((uint32_t)(b) & 0x000000ff);       \
+          ((uint8_t*)(a))[1] = ((uint32_t)(b) & 0x0000ff00) >> 8;  \
+          ((uint8_t*)(a))[2] = ((uint32_t)(b) & 0x00ff0000) >> 16; \
+          ((uint8_t*)(a))[3] = ((uint32_t)(b) & 0xff000000) >> 24; \
+	}
+
+#ifndef MAX
+#define MAX(a,b) ((a) > (b) ? (a) : (b))
+#endif
+
+#define BLOCKS_PER_LOOP     4608
+#define MAX_CHANNELS        2
+//#define MAX_BYTESPERSAMPLE  3
+
+#define APE_FRAMECODE_MONO_SILENCE    1
+#define APE_FRAMECODE_STEREO_SILENCE  3
+#define APE_FRAMECODE_PSEUDO_STEREO   4
+
+#define HISTORY_SIZE 512
+#define PREDICTOR_ORDER 8
+/** Total size of all predictor histories */
+#define PREDICTOR_SIZE 50
+
+#define YDELAYA (18 + PREDICTOR_ORDER*4)
+#define YDELAYB (18 + PREDICTOR_ORDER*3)
+#define XDELAYA (18 + PREDICTOR_ORDER*2)
+#define XDELAYB (18 + PREDICTOR_ORDER)
+
+#define YADAPTCOEFFSA 18
+#define XADAPTCOEFFSA 14
+#define YADAPTCOEFFSB 10
+#define XADAPTCOEFFSB 5
+
+#define APE_FILTER_LEVELS 3
+
+#define AVERROR_IO -1
+#define AVERROR_NOMEM -1
+
+typedef struct {
+    int64_t pos;
+    int nblocks;
+    int size;
+    int skip;
+    int64_t pts;
+} APEFrame;
+
+typedef struct {
+    /* Derived fields */
+    uint32_t junklength;
+    uint32_t firstframe;
+    uint32_t totalsamples;
+    int currentframe;
+    APEFrame *frames;
+
+    /* Info from Descriptor Block */
+    char magic[4];
+    int16_t fileversion;
+    int16_t padding1;
+    uint32_t descriptorlength;
+    uint32_t headerlength;
+    uint32_t seektablelength;
+    uint32_t wavheaderlength;
+    uint32_t audiodatalength;
+    uint32_t audiodatalength_high;
+    uint32_t wavtaillength;
+    uint8_t md5[16];
+
+    /* Info from Header Block */
+    uint16_t compressiontype;
+    uint16_t formatflags;
+    uint32_t blocksperframe;
+    uint32_t finalframeblocks;
+    uint32_t totalframes;
+    uint16_t bps;
+    uint16_t channels;
+    uint32_t samplerate;
+
+    /* Seektable */
+    uint32_t *seektable;
+
+    /* Added by Eugene: */
+    uint32_t frame_size;
+    //uint64_t total_blocks;
+    uint64_t duration;
+    uint32_t max_packet_size;
+} APEContext;
+
+/** Filters applied to the decoded data */
+typedef struct APEFilter {
+    int16_t *coeffs;        ///< actual coefficients used in filtering
+    int16_t *adaptcoeffs;   ///< adaptive filter coefficients used for correcting of actual filter coefficients
+    int16_t *historybuffer; ///< filter memory
+    int16_t *delay;         ///< filtered values
+
+    int avg;
+} APEFilter;
+
+typedef struct APERice {
+    uint32_t k;
+    uint32_t ksum;
+} APERice;
+
+typedef struct APERangecoder {
+    uint32_t low;           ///< low end of interval
+    uint32_t range;         ///< length of interval
+    uint32_t help;          ///< bytes_to_follow resp. intermediate value
+    unsigned int buffer;    ///< buffer for input/output
+} APERangecoder;
+
+/** Filter histories */
+typedef struct APEPredictor {
+    int32_t *buf;
+
+    int32_t lastA[2];
+
+    int32_t filterA[2];
+    int32_t filterB[2];
+
+    int32_t coeffsA[2][4];  ///< adaption coefficients
+    int32_t coeffsB[2][5];  ///< adaption coefficients
+    int32_t historybuffer[HISTORY_SIZE + PREDICTOR_SIZE];
+} APEPredictor;
+
+/** Decoder context */
+typedef struct APEDecoderContext {
+    //AVCodecContext *avctx;
+    APEContext *apectx;
+    //DSPContext dsp;
+    int channels;
+    int samples;                             ///< samples left to decode in current frame
+
+    int fileversion;                         ///< codec version, very important in decoding process
+    int compression_level;                   ///< compression levels
+    int fset;                                ///< which filter set to use (calculated from compression level)
+    int flags;                               ///< global decoder flags
+
+    uint32_t CRC;                            ///< frame CRC
+    int frameflags;                          ///< frame flags
+    int currentframeblocks;                  ///< samples (per channel) in current frame
+    int blocksdecoded;                       ///< count of decoded samples in current frame
+    APEPredictor predictor;                  ///< predictor used for final reconstruction
+
+    int32_t decoded0[BLOCKS_PER_LOOP];       ///< decoded data for the first channel
+    int32_t decoded1[BLOCKS_PER_LOOP];       ///< decoded data for the second channel
+
+    int16_t* filterbuf[APE_FILTER_LEVELS];   ///< filter memory
+
+    APERangecoder rc;                        ///< rangecoder used to decode actual values
+    APERice riceX;                           ///< rice code parameters for the second channel
+    APERice riceY;                           ///< rice code parameters for the first channel
+    APEFilter filters[APE_FILTER_LEVELS][2]; ///< filters used for reconstruction
+
+    uint8_t *data;                           ///< current frame data
+    uint8_t *data_end;                       ///< frame data end
+    uint8_t *ptr;                            ///< current position in frame data
+    uint8_t *last_ptr;                       ///< position where last 4608-sample block ended
+    /*Eugene:*/
+    unsigned int max_packet_size;            // Avoid multiply realloc calls
+} APEDecoderContext;
+
+
+static inline uint8_t bytestream_get_byte(uint8_t** ptr) {
+  uint8_t tmp;
+  tmp = **ptr;
+  *ptr += 1;
+  return tmp;
+}
+
+/*static inline uint32_t bytestream_get_be32(uint8_t** ptr) {
+  uint32_t tmp;
+  tmp = *((uint32_t*)*ptr);
+  *ptr += 4;
+  return tmp;
+}*/
+
+static inline uint32_t bytestream_get_be32(uint8_t** ptr) {
+  uint32_t tmp;
+  tmp = (*ptr)[3] | ((*ptr)[2] << 8) | ((*ptr)[1] << 16) | ((*ptr)[0] << 24);
+  *ptr += 4;
+  return tmp;
+}
+
+static inline uint32_t bswap_32(uint32_t x)
+{
+#if defined(ARCH_X86)
+#if __CPU__ != 386
+ __asm("bswap   %0":
+      "=r" (x)     :
+#else
+ __asm("xchgb   %b0,%h0\n"
+      "         rorl    $16,%0\n"
+      "         xchgb   %b0,%h0":
+      LEGACY_REGS (x)                :
+#endif
+      "0" (x));
+#elif defined(ARCH_SH4)
+        __asm__(
+        "swap.b %0,%0\n"
+        "swap.w %0,%0\n"
+        "swap.b %0,%0\n"
+        :"=r"(x):"0"(x));
+#elif defined(ARCH_ARM)
+    uint32_t t;
+    __asm__ (
+      "eor %1, %0, %0, ror #16 \n\t"
+      "bic %1, %1, #0xFF0000   \n\t"
+      "mov %0, %0, ror #8      \n\t"
+      "eor %0, %0, %1, lsr #8  \n\t"
+      : "+r"(x), "+r"(t));
+#elif defined(ARCH_BFIN)
+    unsigned tmp;
+    asm("%1 = %0 >> 8 (V);\n\t"
+        "%0 = %0 << 8 (V);\n\t"
+        "%0 = %0 | %1;\n\t"
+        "%0 = PACK(%0.L, %0.H);\n\t"
+        : "+d"(x), "=&d"(tmp));
+#else
+    x= ((x<<8)&0xFF00FF00) | ((x>>8)&0x00FF00FF);
+    x= (x>>16) | (x<<16);
+#endif
+    return x;
+}
+
+static inline void bswap_buf(uint32_t *dst, uint32_t *src, int w){
+    int i;
+
+    for(i=0; i+8<=w; i+=8){
+        dst[i+0]= bswap_32(src[i+0]);
+        dst[i+1]= bswap_32(src[i+1]);
+        dst[i+2]= bswap_32(src[i+2]);
+        dst[i+3]= bswap_32(src[i+3]);
+        dst[i+4]= bswap_32(src[i+4]);
+        dst[i+5]= bswap_32(src[i+5]);
+        dst[i+6]= bswap_32(src[i+6]);
+        dst[i+7]= bswap_32(src[i+7]);
+    }
+    for(;i<w; i++){
+        dst[i+0]= bswap_32(src[i+0]);
+    }
+}
+
+static inline int16_t av_clip_int16(int a) {
+    if ((a+32768) & ~65535) return (a>>31) ^ 32767;
+    else                    return a;
+}
+
+int ape_read_header(APEContext *ape, VFSFile *pb, int probe_only);
+int ape_read_packet(APEContext *ape, VFSFile *pb, uint8_t *pkt, int *pkt_size);
+int ape_read_close(APEContext *ape);
+
+int ape_decode_init(APEDecoderContext *s, APEContext *ctx);
+int ape_decode_frame(APEDecoderContext *s,
+                            void *data, int *data_size,
+                            uint8_t * buf, int buf_size);
+
+int ape_decode_close(APEDecoderContext *s);
+
+#endif // APE_H
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/demac/apedec.c	Thu Nov 22 02:54:06 2007 +0300
@@ -0,0 +1,852 @@
+/*
+ * Monkey's Audio lossless audio decoder, standalone version
+ * Copyright (c) 2007 Benjamin Zores <ben@geexbox.org>
+ *  based upon libdemac from Dave Chapman.
+ * Copyright (c) 2007 Eugene Zagidullin <e.asphyx@gmail.com>
+ *   Cleanup libav* depending code, Audacious stuff.
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <stdio.h>
+#include <stdlib.h> 
+#include <errno.h> 
+#include <string.h> 
+#include <assert.h> 
+
+#include <audacious/vfs.h>
+#include <audacious/plugin.h> 
+
+#include "ape.h"
+
+/**
+ * @file apedec.c
+ * Monkey's Audio lossless audio decoder
+ */
+
+
+/**
+ * Possible compression levels
+ * @{
+ */
+enum APECompressionLevel {
+    COMPRESSION_LEVEL_FAST       = 1000,
+    COMPRESSION_LEVEL_NORMAL     = 2000,
+    COMPRESSION_LEVEL_HIGH       = 3000,
+    COMPRESSION_LEVEL_EXTRA_HIGH = 4000,
+    COMPRESSION_LEVEL_INSANE     = 5000
+};
+/** @} */
+
+
+/** Filter orders depending on compression level */
+static const uint16_t ape_filter_orders[5][APE_FILTER_LEVELS] = {
+    {  0,   0,    0 },
+    { 16,   0,    0 },
+    { 64,   0,    0 },
+    { 32, 256,    0 },
+    { 16, 256, 1280 }
+};
+
+/** Filter fraction bits depending on compression level */
+static const uint16_t ape_filter_fracbits[5][APE_FILTER_LEVELS] = {
+    {  0,  0,  0 },
+    { 11,  0,  0 },
+    { 11,  0,  0 },
+    { 10, 13,  0 },
+    { 11, 13, 15 }
+};
+
+// TODO: dsputilize
+static inline void vector_add(int16_t * v1, int16_t * v2, int order)
+{
+    while (order--)
+       *v1++ += *v2++;
+}
+
+// TODO: dsputilize
+static inline void vector_sub(int16_t * v1, int16_t * v2, int order)
+{
+    while (order--)
+        *v1++ -= *v2++;
+}
+
+// TODO: dsputilize
+static inline int32_t scalarproduct(int16_t * v1, int16_t * v2, int order)
+{
+    int res = 0;
+
+    while (order--)
+        res += *v1++ * *v2++;
+
+    return res;
+}
+
+int ape_decode_init(APEDecoderContext *s, APEContext *ctx)
+{
+    int i;
+
+    if (ctx->bps != 16) {
+        av_log(avctx, AV_LOG_ERROR, "Only 16-bit samples are supported\n");
+        return -1;
+    }
+    if (ctx->channels > 2) {
+        av_log(avctx, AV_LOG_ERROR, "Only mono and stereo is supported\n");
+        return -1;
+    }
+    s->apectx            = ctx;
+    s->channels          = ctx->channels;
+    s->fileversion       = ctx->fileversion;
+    s->compression_level = ctx->compressiontype;
+    s->flags             = ctx->formatflags;
+    s->max_packet_size   = ctx->max_packet_size; // We will use this value to avoid multiply reallocs. Eugene.
+
+    av_log(avctx, AV_LOG_DEBUG, "Compression Level: %d - Flags: %d\n", s->compression_level, s->flags);
+    if (s->compression_level % 1000 || s->compression_level > COMPRESSION_LEVEL_INSANE) {
+        av_log(avctx, AV_LOG_ERROR, "Incorrect compression level %d\n", s->compression_level);
+        return -1;
+    }
+    s->fset = s->compression_level / 1000 - 1;
+    for (i = 0; i < APE_FILTER_LEVELS; i++) {
+        if (!ape_filter_orders[s->fset][i])
+            break;
+        s->filterbuf[i] = malloc((ape_filter_orders[s->fset][i] * 3 + HISTORY_SIZE) * 4);
+    }
+
+    //dsputil_init(&s->dsp, avctx);
+    return 0;
+}
+
+int ape_decode_close(APEDecoderContext *s)
+{
+    int i;
+
+    for (i = 0; i < APE_FILTER_LEVELS; i++)
+        free(s->filterbuf[i]);
+    if(s->data != NULL) free (s->data);
+
+    return 0;
+}
+
+/**
+ * @defgroup rangecoder APE range decoder
+ * @{
+ */
+
+#define CODE_BITS    32
+#define TOP_VALUE    ((unsigned int)1 << (CODE_BITS-1))
+#define SHIFT_BITS   (CODE_BITS - 9)
+#define EXTRA_BITS   ((CODE_BITS-2) % 8 + 1)
+#define BOTTOM_VALUE (TOP_VALUE >> 8)
+
+/** Start the decoder */
+static inline void range_start_decoding(APEDecoderContext * ctx)
+{
+    /* Eugene: */
+#ifdef DEBUG
+    assert(ctx->ptr < ctx->data_end);
+#endif
+    /**/
+    ctx->rc.buffer = bytestream_get_byte(&ctx->ptr);
+    ctx->rc.low    = ctx->rc.buffer >> (8 - EXTRA_BITS);
+    ctx->rc.range  = (uint32_t) 1 << EXTRA_BITS;
+}
+
+/** Perform normalization */
+static inline void range_dec_normalize(APEDecoderContext * ctx)
+{
+    while (ctx->rc.range <= BOTTOM_VALUE) {
+#ifdef DEBUG
+    assert(ctx->ptr < ctx->data_end);
+#endif
+        ctx->rc.buffer = (ctx->rc.buffer << 8) | bytestream_get_byte(&ctx->ptr);
+        ctx->rc.low    = (ctx->rc.low << 8)    | ((ctx->rc.buffer >> 1) & 0xFF);
+        ctx->rc.range  <<= 8;
+    }
+}
+
+/**
+ * Calculate culmulative frequency for next symbol. Does NO update!
+ * @param tot_f is the total frequency or (code_value)1<<shift
+ * @return the culmulative frequency
+ */
+static inline int range_decode_culfreq(APEDecoderContext * ctx, int tot_f)
+{
+    range_dec_normalize(ctx);
+    ctx->rc.help = ctx->rc.range / tot_f;
+    return ctx->rc.low / ctx->rc.help;
+}
+
+/**
+ * Decode value with given size in bits
+ * @param shift number of bits to decode
+ */
+static inline int range_decode_culshift(APEDecoderContext * ctx, int shift)
+{
+    range_dec_normalize(ctx);
+    ctx->rc.help = ctx->rc.range >> shift;
+    return ctx->rc.low / ctx->rc.help;
+}
+
+
+/**
+ * Update decoding state
+ * @param sy_f the interval length (frequency of the symbol)
+ * @param lt_f the lower end (frequency sum of < symbols)
+ */
+static inline void range_decode_update(APEDecoderContext * ctx, int sy_f, int lt_f)
+{
+    ctx->rc.low  -= ctx->rc.help * lt_f;
+    ctx->rc.range = ctx->rc.help * sy_f;
+}
+
+/** Decode n bits (n <= 16) without modelling */
+static inline int range_decode_bits(APEDecoderContext * ctx, int n)
+{
+    int sym = range_decode_culshift(ctx, n);
+    range_decode_update(ctx, 1, sym);
+    return sym;
+}
+
+
+#define MODEL_ELEMENTS 64
+
+/**
+ * Fixed probabilities for symbols in Monkey Audio version 3.97
+ */
+static const uint32_t counts_3970[65] = {
+        0, 14824, 28224, 39348, 47855, 53994, 58171, 60926,
+    62682, 63786, 64463, 64878, 65126, 65276, 65365, 65419,
+    65450, 65469, 65480, 65487, 65491, 65493, 65494, 65495,
+    65496, 65497, 65498, 65499, 65500, 65501, 65502, 65503,
+    65504, 65505, 65506, 65507, 65508, 65509, 65510, 65511,
+    65512, 65513, 65514, 65515, 65516, 65517, 65518, 65519,
+    65520, 65521, 65522, 65523, 65524, 65525, 65526, 65527,
+    65528, 65529, 65530, 65531, 65532, 65533, 65534, 65535,
+    65536
+};
+
+/**
+ * Probability ranges for symbols in Monkey Audio version 3.97
+ */
+static const uint16_t counts_diff_3970[64] = {
+    14824, 13400, 11124, 8507, 6139, 4177, 2755, 1756,
+    1104, 677, 415, 248, 150, 89, 54, 31,
+    19, 11, 7, 4, 2, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1
+};
+
+/**
+ * Fixed probabilities for symbols in Monkey Audio version 3.98
+ */
+static const uint32_t counts_3980[65] = {
+        0, 19578, 36160, 48417, 56323, 60899, 63265, 64435,
+    64971, 65232, 65351, 65416, 65447, 65466, 65476, 65482,
+    65485, 65488, 65490, 65491, 65492, 65493, 65494, 65495,
+    65496, 65497, 65498, 65499, 65500, 65501, 65502, 65503,
+    65504, 65505, 65506, 65507, 65508, 65509, 65510, 65511,
+    65512, 65513, 65514, 65515, 65516, 65517, 65518, 65519,
+    65520, 65521, 65522, 65523, 65524, 65525, 65526, 65527,
+    65528, 65529, 65530, 65531, 65532, 65533, 65534, 65535,
+    65536
+};
+
+/**
+ * Probability ranges for symbols in Monkey Audio version 3.98
+ */
+static const uint16_t counts_diff_3980[64] = {
+    19578, 16582, 12257, 7906, 4576, 2366, 1170, 536,
+    261, 119, 65, 31, 19, 10, 6, 3,
+    3, 2, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1
+};
+
+/**
+ * Decode symbol
+ * @param counts probability range start position
+ * @param count_diffs probability range widths
+ */
+static inline int range_get_symbol(APEDecoderContext * ctx,
+                                   const uint32_t counts[],
+                                   const uint16_t counts_diff[])
+{
+    int symbol, cf;
+
+    cf = range_decode_culshift(ctx, 16);
+
+    /* figure out the symbol inefficiently; a binary search would be much better */
+    for (symbol = 0; counts[symbol + 1] <= cf; symbol++);
+
+    range_decode_update(ctx, counts_diff[symbol], counts[symbol]);
+
+    return symbol;
+}
+/** @} */ // group rangecoder
+
+static inline void update_rice(APERice *rice, int x)
+{
+    rice->ksum += ((x + 1) / 2) - ((rice->ksum + 16) >> 5);
+
+    if (rice->k == 0)
+        rice->k = 1;
+    else if (rice->ksum < (1 << (rice->k + 4)))
+        rice->k--;
+    else if (rice->ksum >= (1 << (rice->k + 5)))
+        rice->k++;
+}
+
+static inline int ape_decode_value(APEDecoderContext * ctx, APERice *rice)
+{
+    int x, overflow;
+
+    if (ctx->fileversion < 3980) {
+        int tmpk;
+
+        overflow = range_get_symbol(ctx, counts_3970, counts_diff_3970);
+
+        if (overflow == (MODEL_ELEMENTS - 1)) {
+            tmpk = range_decode_bits(ctx, 5);
+            overflow = 0;
+        } else
+            tmpk = (rice->k < 1) ? 0 : rice->k - 1;
+
+        if (tmpk <= 16)
+            x = range_decode_bits(ctx, tmpk);
+        else {
+            x = range_decode_bits(ctx, 16);
+            x |= (range_decode_bits(ctx, tmpk - 16) << 16);
+        }
+        x += overflow << tmpk;
+    } else {
+        int base, pivot;
+
+        pivot = rice->ksum >> 5;
+        if (pivot == 0)
+            pivot = 1;
+
+        overflow = range_get_symbol(ctx, counts_3980, counts_diff_3980);
+
+        if (overflow == (MODEL_ELEMENTS - 1)) {
+            overflow  = range_decode_bits(ctx, 16) << 16;
+            overflow |= range_decode_bits(ctx, 16);
+        }
+
+        base = range_decode_culfreq(ctx, pivot);
+        range_decode_update(ctx, 1, base);
+
+        x = base + overflow * pivot;
+    }
+
+    update_rice(rice, x);
+
+    /* Convert to signed */
+    if (x & 1)
+        return (x >> 1) + 1;
+    else
+        return -(x >> 1);
+}
+
+static void entropy_decode(APEDecoderContext * ctx, int blockstodecode, int stereo)
+{
+    int32_t *decoded0 = ctx->decoded0;
+    int32_t *decoded1 = ctx->decoded1;
+
+    ctx->blocksdecoded = blockstodecode;
+
+    if (ctx->frameflags & APE_FRAMECODE_STEREO_SILENCE) {
+        /* We are pure silence, just memset the output buffer. */
+        memset(decoded0, 0, blockstodecode * sizeof(int32_t));
+        memset(decoded1, 0, blockstodecode * sizeof(int32_t));
+    } else {
+        while (blockstodecode--) {
+            *decoded0++ = ape_decode_value(ctx, &ctx->riceY);
+            if (stereo)
+                *decoded1++ = ape_decode_value(ctx, &ctx->riceX);
+        }
+    }
+
+    if (ctx->blocksdecoded == ctx->currentframeblocks)
+        range_dec_normalize(ctx);   /* normalize to use up all bytes */
+}
+
+static void init_entropy_decoder(APEDecoderContext * ctx)
+{
+    /* Read the CRC */
+    ctx->CRC = bytestream_get_be32(&ctx->ptr);
+
+    /* Read the frame flags if they exist */
+    ctx->frameflags = 0;
+    if ((ctx->fileversion > 3820) && (ctx->CRC & 0x80000000)) {
+        ctx->CRC &= ~0x80000000;
+
+        ctx->frameflags = bytestream_get_be32(&ctx->ptr);
+    }
+
+    /* Keep a count of the blocks decoded in this frame */
+    ctx->blocksdecoded = 0;
+
+    /* Initialise the rice structs */
+    ctx->riceX.k = 10;
+    ctx->riceX.ksum = (1 << ctx->riceX.k) * 16;
+    ctx->riceY.k = 10;
+    ctx->riceY.ksum = (1 << ctx->riceY.k) * 16;
+
+    /* The first 8 bits of input are ignored. */
+    ctx->ptr++;
+
+    range_start_decoding(ctx);
+}
+
+static const int32_t initial_coeffs[4] = {
+    360, 317, -109, 98
+};
+
+static void init_predictor_decoder(APEDecoderContext * ctx)
+{
+    APEPredictor *p = &ctx->predictor;
+
+    /* Zero the history buffers */
+    memset(p->historybuffer, 0, PREDICTOR_SIZE * sizeof(int32_t));
+    p->buf = p->historybuffer;
+
+    /* Initialise and zero the co-efficients */
+    memcpy(p->coeffsA[0], initial_coeffs, sizeof(initial_coeffs));
+    memcpy(p->coeffsA[1], initial_coeffs, sizeof(initial_coeffs));
+    memset(p->coeffsB, 0, sizeof(p->coeffsB));
+
+    p->filterA[0] = p->filterA[1] = 0;
+    p->filterB[0] = p->filterB[1] = 0;
+    p->lastA[0]   = p->lastA[1]   = 0;
+}
+
+/** Get inverse sign of integer (-1 for positive, 1 for negative and 0 for zero) */
+static inline int APESIGN(int32_t x) {
+    return (x < 0) - (x > 0);
+}
+
+static int predictor_update_filter(APEPredictor *p, const int decoded, const int filter, const int delayA, const int delayB, const int adaptA, const int adaptB)
+{
+    int32_t predictionA, predictionB;
+
+    p->buf[delayA]     = p->lastA[filter];
+    p->buf[adaptA]     = APESIGN(p->buf[delayA]);
+    p->buf[delayA - 1] = p->buf[delayA] - p->buf[delayA - 1];
+    p->buf[adaptA - 1] = APESIGN(p->buf[delayA - 1]);
+
+    predictionA = p->buf[delayA    ] * p->coeffsA[filter][0] +
+                  p->buf[delayA - 1] * p->coeffsA[filter][1] +
+                  p->buf[delayA - 2] * p->coeffsA[filter][2] +
+                  p->buf[delayA - 3] * p->coeffsA[filter][3];
+
+    /*  Apply a scaled first-order filter compression */
+    p->buf[delayB]     = p->filterA[filter ^ 1] - ((p->filterB[filter] * 31) >> 5);
+    p->buf[adaptB]     = APESIGN(p->buf[delayB]);
+    p->buf[delayB - 1] = p->buf[delayB] - p->buf[delayB - 1];
+    p->buf[adaptB - 1] = APESIGN(p->buf[delayB - 1]);
+    p->filterB[filter] = p->filterA[filter ^ 1];
+
+    predictionB = p->buf[delayB    ] * p->coeffsB[filter][0] +
+                  p->buf[delayB - 1] * p->coeffsB[filter][1] +
+                  p->buf[delayB - 2] * p->coeffsB[filter][2] +
+                  p->buf[delayB - 3] * p->coeffsB[filter][3] +
+                  p->buf[delayB - 4] * p->coeffsB[filter][4];
+
+    p->lastA[filter] = decoded + ((predictionA + (predictionB >> 1)) >> 10);
+    p->filterA[filter] = p->lastA[filter] + ((p->filterA[filter] * 31) >> 5);
+
+    if (!decoded) // no need updating filter coefficients
+        return p->filterA[filter];
+
+    if (decoded > 0) {
+        p->coeffsA[filter][0] -= p->buf[adaptA    ];
+        p->coeffsA[filter][1] -= p->buf[adaptA - 1];
+        p->coeffsA[filter][2] -= p->buf[adaptA - 2];
+        p->coeffsA[filter][3] -= p->buf[adaptA - 3];
+
+        p->coeffsB[filter][0] -= p->buf[adaptB    ];
+        p->coeffsB[filter][1] -= p->buf[adaptB - 1];
+        p->coeffsB[filter][2] -= p->buf[adaptB - 2];
+        p->coeffsB[filter][3] -= p->buf[adaptB - 3];
+        p->coeffsB[filter][4] -= p->buf[adaptB - 4];
+    } else {
+        p->coeffsA[filter][0] += p->buf[adaptA    ];
+        p->coeffsA[filter][1] += p->buf[adaptA - 1];
+        p->coeffsA[filter][2] += p->buf[adaptA - 2];
+        p->coeffsA[filter][3] += p->buf[adaptA - 3];
+
+        p->coeffsB[filter][0] += p->buf[adaptB    ];
+        p->coeffsB[filter][1] += p->buf[adaptB - 1];
+        p->coeffsB[filter][2] += p->buf[adaptB - 2];
+        p->coeffsB[filter][3] += p->buf[adaptB - 3];
+        p->coeffsB[filter][4] += p->buf[adaptB - 4];
+    }
+    return p->filterA[filter];
+}
+
+static void predictor_decode_stereo(APEDecoderContext * ctx, int count)
+{
+    int32_t predictionA, predictionB;
+    APEPredictor *p = &ctx->predictor;
+    int32_t *decoded0 = ctx->decoded0;
+    int32_t *decoded1 = ctx->decoded1;
+
+    while (count--) {
+        /* Predictor Y */
+        predictionA = predictor_update_filter(p, *decoded0, 0, YDELAYA, YDELAYB, YADAPTCOEFFSA, YADAPTCOEFFSB);
+        predictionB = predictor_update_filter(p, *decoded1, 1, XDELAYA, XDELAYB, XADAPTCOEFFSA, XADAPTCOEFFSB);
+        *(decoded0++) = predictionA;
+        *(decoded1++) = predictionB;
+
+        /* Combined */
+        p->buf++;
+
+        /* Have we filled the history buffer? */
+        if (p->buf == p->historybuffer + HISTORY_SIZE) {
+            memmove(p->historybuffer, p->buf, PREDICTOR_SIZE * sizeof(int32_t));
+            p->buf = p->historybuffer;
+        }
+    }
+}
+
+static void predictor_decode_mono(APEDecoderContext * ctx, int count)
+{
+    APEPredictor *p = &ctx->predictor;
+    int32_t *decoded0 = ctx->decoded0;
+    int32_t predictionA, currentA, A;
+
+    currentA = p->lastA[0];
+
+    while (count--) {
+        A = *decoded0;
+
+        p->buf[YDELAYA] = currentA;
+        p->buf[YDELAYA - 1] = p->buf[YDELAYA] - p->buf[YDELAYA - 1];
+
+        predictionA = p->buf[YDELAYA    ] * p->coeffsA[0][0] +
+                      p->buf[YDELAYA - 1] * p->coeffsA[0][1] +
+                      p->buf[YDELAYA - 2] * p->coeffsA[0][2] +
+                      p->buf[YDELAYA - 3] * p->coeffsA[0][3];
+
+        currentA = A + (predictionA >> 10);
+
+        p->buf[YADAPTCOEFFSA]     = APESIGN(p->buf[YDELAYA    ]);
+        p->buf[YADAPTCOEFFSA - 1] = APESIGN(p->buf[YDELAYA - 1]);
+
+        if (A > 0) {
+            p->coeffsA[0][0] -= p->buf[YADAPTCOEFFSA    ];
+            p->coeffsA[0][1] -= p->buf[YADAPTCOEFFSA - 1];
+            p->coeffsA[0][2] -= p->buf[YADAPTCOEFFSA - 2];
+            p->coeffsA[0][3] -= p->buf[YADAPTCOEFFSA - 3];
+        } else if (A < 0) {
+            p->coeffsA[0][0] += p->buf[YADAPTCOEFFSA    ];
+            p->coeffsA[0][1] += p->buf[YADAPTCOEFFSA - 1];
+            p->coeffsA[0][2] += p->buf[YADAPTCOEFFSA - 2];
+            p->coeffsA[0][3] += p->buf[YADAPTCOEFFSA - 3];
+        }
+
+        p->buf++;
+
+        /* Have we filled the history buffer? */
+        if (p->buf == p->historybuffer + HISTORY_SIZE) {
+            memmove(p->historybuffer, p->buf, PREDICTOR_SIZE * sizeof(int32_t));
+            p->buf = p->historybuffer;
+        }
+
+        p->filterA[0] = currentA + ((p->filterA[0] * 31) >> 5);
+        *(decoded0++) = p->filterA[0];
+    }
+
+    p->lastA[0] = currentA;
+}
+
+static void do_init_filter(APEFilter *f, int16_t * buf, int order)
+{
+    f->coeffs = buf;
+    f->historybuffer = buf + order;
+    f->delay       = f->historybuffer + order * 2;
+    f->adaptcoeffs = f->historybuffer + order;
+
+    memset(f->historybuffer, 0, (order * 2) * sizeof(int16_t));
+    memset(f->coeffs, 0, order * sizeof(int16_t));
+    f->avg = 0;
+}
+
+static void init_filter(APEDecoderContext * ctx, APEFilter *f, int16_t * buf, int order)
+{
+    do_init_filter(&f[0], buf, order);
+    do_init_filter(&f[1], buf + order * 3 + HISTORY_SIZE, order);
+}
+
+static inline void do_apply_filter(int version, APEFilter *f, int32_t *data, int count, int order, int fracbits)
+{
+    int res;
+    int absres;
+
+    while (count--) {
+        /* round fixedpoint scalar product */
+        res = (scalarproduct(f->delay - order, f->coeffs, order) + (1 << (fracbits - 1))) >> fracbits;
+
+        if (*data < 0)
+            vector_add(f->coeffs, f->adaptcoeffs - order, order);
+        else if (*data > 0)
+            vector_sub(f->coeffs, f->adaptcoeffs - order, order);
+
+        res += *data;
+
+        *data++ = res;
+
+        /* Update the output history */
+        *f->delay++ = av_clip_int16(res);
+
+        if (version < 3980) {
+            /* Version ??? to < 3.98 files (untested) */
+            f->adaptcoeffs[0]  = (res == 0) ? 0 : ((res >> 28) & 8) - 4;
+            f->adaptcoeffs[-4] >>= 1;
+            f->adaptcoeffs[-8] >>= 1;
+        } else {
+            /* Version 3.98 and later files */
+
+            /* Update the adaption coefficients */
+            absres = (res < 0 ? -res : res);
+
+            if (absres > (f->avg * 3))
+                *f->adaptcoeffs = ((res >> 25) & 64) - 32;
+            else if (absres > (f->avg * 4) / 3)
+                *f->adaptcoeffs = ((res >> 26) & 32) - 16;
+            else if (absres > 0)
+                *f->adaptcoeffs = ((res >> 27) & 16) - 8;
+            else
+                *f->adaptcoeffs = 0;
+
+            f->avg += (absres - f->avg) / 16;
+
+            f->adaptcoeffs[-1] >>= 1;
+            f->adaptcoeffs[-2] >>= 1;
+            f->adaptcoeffs[-8] >>= 1;
+        }
+
+        f->adaptcoeffs++;
+
+        /* Have we filled the history buffer? */
+        if (f->delay == f->historybuffer + HISTORY_SIZE + (order * 2)) {
+            memmove(f->historybuffer, f->delay - (order * 2),
+                    (order * 2) * sizeof(int16_t));
+            f->delay = f->historybuffer + order * 2;
+            f->adaptcoeffs = f->historybuffer + order;
+        }
+    }
+}
+
+static void apply_filter(APEDecoderContext * ctx, APEFilter *f,
+                         int32_t * data0, int32_t * data1,
+                         int count, int order, int fracbits)
+{
+    do_apply_filter(ctx->fileversion, &f[0], data0, count, order, fracbits);
+    if (data1)
+        do_apply_filter(ctx->fileversion, &f[1], data1, count, order, fracbits);
+}
+
+static void ape_apply_filters(APEDecoderContext * ctx, int32_t * decoded0,
+                              int32_t * decoded1, int count)
+{
+    int i;
+
+    for (i = 0; i < APE_FILTER_LEVELS; i++) {
+        if (!ape_filter_orders[ctx->fset][i])
+            break;
+        apply_filter(ctx, ctx->filters[i], decoded0, decoded1, count, ape_filter_orders[ctx->fset][i], ape_filter_fracbits[ctx->fset][i]);
+    }
+}
+
+static void init_frame_decoder(APEDecoderContext * ctx)
+{
+    int i;
+    init_entropy_decoder(ctx);
+    init_predictor_decoder(ctx);
+
+    for (i = 0; i < APE_FILTER_LEVELS; i++) {
+        if (!ape_filter_orders[ctx->fset][i])
+            break;
+        init_filter(ctx, ctx->filters[i], ctx->filterbuf[i], ape_filter_orders[ctx->fset][i]);
+    }
+}
+
+static void ape_unpack_mono(APEDecoderContext * ctx, int count)
+{
+    int32_t left;
+    int32_t *decoded0 = ctx->decoded0;
+    int32_t *decoded1 = ctx->decoded1;
+
+    if (ctx->frameflags & APE_FRAMECODE_STEREO_SILENCE) {
+        entropy_decode(ctx, count, 0);
+        /* We are pure silence, so we're done. */
+        av_log(ctx->avctx, AV_LOG_DEBUG, "pure silence mono\n");
+        return;
+    }
+
+    entropy_decode(ctx, count, 0);
+    ape_apply_filters(ctx, decoded0, NULL, count);
+
+    /* Now apply the predictor decoding */
+    predictor_decode_mono(ctx, count);
+
+    /* Pseudo-stereo - just copy left channel to right channel */
+    if (ctx->channels == 2) {
+        while (count--) {
+            left = *decoded0;
+            *(decoded1++) = *(decoded0++) = left;
+        }
+    }
+}
+
+static void ape_unpack_stereo(APEDecoderContext * ctx, int count)
+{
+    int32_t left, right;
+    int32_t *decoded0 = ctx->decoded0;
+    int32_t *decoded1 = ctx->decoded1;
+
+    if (ctx->frameflags & APE_FRAMECODE_STEREO_SILENCE) {
+        /* We are pure silence, so we're done. */
+        av_log(ctx->avctx, AV_LOG_DEBUG, "pure silence stereo\n");
+        return;
+    }
+
+    entropy_decode(ctx, count, 1);
+    ape_apply_filters(ctx, decoded0, decoded1, count);
+
+    /* Now apply the predictor decoding */
+    predictor_decode_stereo(ctx, count);
+
+    /* Decorrelate and scale to output depth */
+    while (count--) {
+        left = *decoded1 - (*decoded0 / 2);
+        right = left + *decoded0;
+
+        *(decoded0++) = left;
+        *(decoded1++) = right;
+    }
+}
+
+int ape_decode_frame(APEDecoderContext *s,
+                            void *data, int *data_size,
+                            uint8_t * buf, int buf_size)
+{
+    int16_t *samples = data;
+    int nblocks;
+    int i, n;
+    int blockstodecode;
+    int bytes_used;
+    int aligned_size;
+
+    if (buf_size == 0 && !s->samples) {
+        *data_size = 0;
+        return 0;
+    }
+
+    /* should not happen but who knows */
+    if (BLOCKS_PER_LOOP * 2 * s->channels > *data_size) {
+        av_log (avctx, AV_LOG_ERROR, "Packet size is too big to be handled in lavc! (max is %d where you have %d)\n", *data_size, s->samples * 2 * s->channels);
+        return -1;
+    }
+
+    if(!s->samples){
+#ifdef DEBUG
+        //fprintf(stderr, "apedec.c: ape_decode_frame(): initializing frame decoder\n");
+#endif
+        //s->data = realloc(s->data, (buf_size + 3) & ~3);
+	aligned_size = (s->max_packet_size + 3) & ~3;
+        if(s->data == NULL) s->data = malloc(aligned_size);
+        bswap_buf((uint32_t*)s->data, (uint32_t*)buf, aligned_size >> 2);
+        s->ptr = s->last_ptr = s->data;
+        //s->data_end = s->data + buf_size;
+        s->data_end = s->data + aligned_size; // ??? it works ... Eugene
+
+        nblocks = s->samples = bytestream_get_be32(&s->ptr);
+        n =  bytestream_get_be32(&s->ptr);
+        if(n < 0 || n > 3){
+            av_log(avctx, AV_LOG_ERROR, "Incorrect offset passed, %d\n", n);
+            s->data = NULL;
+            return -1;
+        }
+        s->ptr += n;
+
+        s->currentframeblocks = nblocks;
+        buf += 4;
+        if (s->samples <= 0) {
+            *data_size = 0;
+            return buf_size;
+        }
+
+        memset(s->decoded0,  0, sizeof(s->decoded0));
+        memset(s->decoded1,  0, sizeof(s->decoded1));
+
+        /* Initialize the frame decoder */
+        init_frame_decoder(s);
+    }
+
+    if (!s->data) {
+        *data_size = 0;
+        return buf_size;
+    }
+#ifdef DEBUG
+    //fprintf(stderr, "apedec.c: ape_decode_frame(): decoding frame's part\n");
+#endif
+
+    nblocks = s->samples;
+    blockstodecode = FFMIN(BLOCKS_PER_LOOP, nblocks);
+
+    if ((s->channels == 1) || (s->frameflags & APE_FRAMECODE_PSEUDO_STEREO))
+        ape_unpack_mono(s, blockstodecode);
+    else
+        ape_unpack_stereo(s, blockstodecode);
+
+    for (i = 0; i < blockstodecode; i++) {
+        *samples++ = s->decoded0[i];
+        if(s->channels == 2)
+            *samples++ = s->decoded1[i];
+    }
+
+    s->samples -= blockstodecode;
+#ifdef DEBUG
+    //fprintf(stderr, "apedec.c: ape_decode_frame(): samples left: %d, total bytes left: %d\n", s->samples, s->data_end - s->ptr);
+    assert(s->ptr < s->data_end);
+#endif
+
+    *data_size = blockstodecode * 2 * s->channels;
+    bytes_used = s->samples ? s->ptr - s->last_ptr : buf_size;
+    s->last_ptr = s->ptr;
+    return bytes_used;
+}
+
+/*AVCodec ape_decoder = {
+    "ape",
+    CODEC_TYPE_AUDIO,
+    CODEC_ID_APE,
+    sizeof(APEDecoderContext),
+    ape_decode_init,
+    NULL,
+    ape_decode_close,
+    ape_decode_frame,
+};*/
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/demac/apev2.c	Thu Nov 22 02:54:06 2007 +0300
@@ -0,0 +1,116 @@
+/* 
+ * Audacious Monkey's Audio plugin, an APE tag reading stuff
+ *
+ * Copyright (C) Eugene Zagidullin 2007
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or 
+ * (at your option) any later version. 
+ *  
+ * This program is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * GNU General Public License for more details. 
+ *  
+ * You should have received a copy of the GNU General Public License 
+ * along with this program; if not, write to the Free Software 
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA
+ *
+ */
+
+#include <stdio.h> 
+#include <stdlib.h> 
+#include <errno.h> 
+#include <string.h> 
+
+#include <glib.h>
+#include <audacious/vfs.h>
+#include <audacious/plugin.h> 
+
+#include "apev2.h"
+
+
+static int read_uint32(VFSFile *vfd, guint32* x) {
+    unsigned char tmp[4];
+    int n;
+
+    n = aud_vfs_fread(tmp, 1, 4, vfd);
+
+    if (n != 4)
+        return -1;
+    
+    /* convert to native endianness */
+    *x = tmp[0] | (tmp[1] << 8) | (tmp[2] << 16) | (tmp[3] << 24);
+
+    return 0;
+}
+
+#define TMP_BUFSIZE 256
+#ifndef MIN
+#define MIN(a,b) ((a) < (b) ? (a) : (b))
+#endif
+
+GHashTable* parse_apev2_tag(VFSFile *vfd) {
+  unsigned char tmp[TMP_BUFSIZE+1];
+  unsigned char tmp2[TMP_BUFSIZE+1];
+  guint32 tag_version;
+  guint32 tag_size, item_size, item_flags;
+  guint32 tag_items;
+  guint32 tag_flags;
+  GHashTable *hash;
+
+  aud_vfs_fseek(vfd, -32, SEEK_END);
+  aud_vfs_fread(tmp, 1, 8, vfd);
+  if ((tmp[0]!='A')||(tmp[1]!='P')||(tmp[2]!='E')||(tmp[3]!='T')||
+     (tmp[4]!='A')||(tmp[5]!='G')||(tmp[6]!='E')||(tmp[7]!='X')) {
+#ifdef DEBUG
+    fprintf(stderr, "** demac: apev2.c: APE tag not found\n");
+#endif
+    return NULL;
+  }
+  
+  read_uint32(vfd, &tag_version);
+  read_uint32(vfd, &tag_size);
+  read_uint32(vfd, &tag_items);
+  read_uint32(vfd, &tag_flags);
+#ifdef DEBUG
+  fprintf(stderr, "** demac: apev2.c: found APE tag version %d contains %d items, flags %08x\n", tag_version, tag_items, tag_flags);
+#endif
+  if(tag_items == 0) {
+#ifdef DEBUG
+    fprintf(stderr, "** demac: apev2.c: found empty tag\n");
+#endif
+    return NULL;
+  }
+  
+  hash = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); /* string-keyed table with dynamically allocated keys and items */
+
+  aud_vfs_fseek(vfd, -tag_size, SEEK_END);
+  int i;
+  unsigned char *p;
+  for(i=0; i<tag_items; i++) {
+      read_uint32(vfd, &item_size);
+      read_uint32(vfd, &item_flags);
+      
+      /* read key */
+      for(p = tmp; p <= tmp+TMP_BUFSIZE; p++) {
+        aud_vfs_fread(p, 1, 1, vfd);
+	if(*p == '\0') break;
+      }
+      *(p+1) = '\0';
+
+      /* read item */
+      aud_vfs_fread(tmp2, 1, MIN(item_size, TMP_BUFSIZE), vfd);
+      tmp2[item_size] = '\0';
+#ifdef DEBUG
+      fprintf(stderr, "%s: \"%s\", f:%08x\n", tmp, tmp2, item_flags);
+#endif
+      /* APEv2 stores all items in utf-8 */
+      gchar *item = ((tag_version == 1000 ) ? aud_str_to_utf8((gchar*)tmp2) : g_strdup((gchar*)tmp2));
+      
+      g_hash_table_insert (hash, g_strdup((gchar*)tmp), item);
+  }
+  
+  return hash;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/demac/apev2.h	Thu Nov 22 02:54:06 2007 +0300
@@ -0,0 +1,9 @@
+#ifndef APEV2_H
+#define APEV2_H
+
+#include <glib.h>
+#include <audacious/vfs.h>
+
+GHashTable* parse_apev2_tag(VFSFile *vfd);
+
+#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/demac/crc.c	Thu Nov 22 02:54:06 2007 +0300
@@ -0,0 +1,119 @@
+/*
+
+libdemac - A Monkey's Audio decoder
+
+$Id: crc.c 13562 2007-06-05 16:58:29Z dave $
+
+Copyright (C) Dave Chapman 2007
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA
+
+*/
+
+#include <inttypes.h>
+
+static uint32_t crctab32[] =
+{
+  0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA,
+  0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
+  0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988,
+  0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
+  0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE,
+  0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
+  0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC,
+  0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
+  0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172,
+  0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
+  0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940,
+  0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
+  0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116,
+  0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
+  0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924,
+  0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
+
+  0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A,
+  0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
+  0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818,
+  0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
+  0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E,
+  0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
+  0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C,
+  0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
+  0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2,
+  0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
+  0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0,
+  0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
+  0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086,
+  0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
+  0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4,
+  0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
+
+  0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A,
+  0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
+  0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8,
+  0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
+  0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE,
+  0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
+  0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC,
+  0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
+  0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252,
+  0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
+  0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60,
+  0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
+  0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
+  0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
+  0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04,
+  0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
+
+  0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A,
+  0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
+  0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38,
+  0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
+  0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E,
+  0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
+  0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C,
+  0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
+  0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2,
+  0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
+  0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0,
+  0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
+  0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6,
+  0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
+  0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
+  0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
+};
+
+uint32_t ape_initcrc(void)
+{
+    return 0xffffffff;
+}
+
+/* Update the CRC from a block of WAV-format audio data */
+uint32_t ape_updatecrc(unsigned char *block, int count, uint32_t crc)
+{
+    while (count--)
+        crc = (crc >> 8) ^ crctab32[(crc & 0xff) ^ *block++];
+
+    return crc;
+}
+
+uint32_t ape_finishcrc(uint32_t crc)
+{
+    crc ^= 0xffffffff;
+    crc >>= 1;
+
+    return crc;
+}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/demac/plugin.c	Thu Nov 22 02:54:06 2007 +0300
@@ -0,0 +1,408 @@
+/* 
+ * Audacious Monkey's Audio plugin
+ *
+ * Copyright (C) Eugene Zagidullin 2007
+ *
+ * Used some code from libdemac and example application:
+ * Copyright (C) Dave Chapman 2007
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or 
+ * (at your option) any later version. 
+ *  
+ * This program is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * GNU General Public License for more details. 
+ *  
+ * You should have received a copy of the GNU General Public License 
+ * along with this program; if not, write to the Free Software 
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA
+ *
+ */
+
+#ifndef _XOPEN_SOURCE
+#define _XOPEN_SOURCE
+#endif
+
+#include "config.h" 
+
+#include <ctype.h> 
+#include <stdio.h> 
+
+#include <stdlib.h> 
+#include <errno.h> 
+#include <string.h> 
+#include <assert.h> 
+
+#include <glib.h> 
+#include <gtk/gtk.h>
+#include <glib/gprintf.h>
+
+#include <audacious/i18n.h> 
+
+#include <audacious/plugin.h> 
+#include <audacious/main.h> 
+#include <audacious/output.h> 
+#include <audacious/vfs.h> 
+#include <audacious/util.h> 
+
+#include "ape.h"
+#include "apev2.h"
+
+#ifndef MIN
+#define MIN(a,b) ((a) < (b) ? (a) : (b))
+#endif
+
+#define MAX_BYTESPERSAMPLE 2 // currently only 16bps supported
+
+static GThread *pb_thread;
+static gpointer demac_decode_loop(InputPlayback *pb);
+static Tuple *demac_get_tuple(char *filename);
+static Tuple *demac_probe_for_tuple (gchar *uri, VFSFile *vfd);
+
+static GMutex *demac_mutex;
+static unsigned long seek_to_msec=(unsigned long)-1; /* -1 == not needed */
+
+static InputPlugin demac_ip;
+
+#ifdef DEBUG
+# include "crc.c"
+#endif
+
+static gboolean demac_probe_vfs(char *filename, VFSFile* input_file) {
+    APEContext *ctx;
+
+    ctx = calloc(sizeof(APEContext), 1);
+    if(ape_read_header(ctx, input_file, 1) < 0) {
+      free(ctx);
+      aud_vfs_rewind(input_file); /* Do we really need it? */
+      return FALSE;
+    }
+
+    free(ctx);
+
+    aud_vfs_rewind(input_file); /* Do we really need it? */
+
+    return TRUE;
+}
+
+static void demac_play(InputPlayback *pb) {
+    pb->playing = 1;
+    pb->eof = 0;
+    pb->error = FALSE;
+    pb_thread = g_thread_self();
+    pb->set_pb_ready(pb);
+    
+    demac_decode_loop(pb);
+}
+
+static void demac_do_mseek(APEContext *ctx, unsigned long msec) {
+  if(ctx->seektable) {
+    unsigned int framecount = msec * ((unsigned long long)ctx->totalframes - 1L) / ctx->duration;
+    ctx->currentframe = framecount;
+  }
+}
+
+gpointer demac_decode_loop(InputPlayback *pb) {
+    VFSFile *vfd;
+    uint8_t *frame_buf = NULL;
+    guint8 *wav = NULL;
+    int wav_buffer_size;
+    gchar *title = NULL;
+    int audio_opened = 0;
+    int playing;
+    unsigned long local_seek_to;
+    APEContext *ctx = NULL;
+    APEDecoderContext *dec = NULL;
+    int decoded_bytes;
+    int pkt_size, bytes_used;
+#ifdef DEBUG
+    uint32_t frame_crc;
+#endif
+    
+    if ((vfd = aud_vfs_fopen(pb->filename, "r")) == NULL) {
+#ifdef DEBUG
+        fprintf(stderr, "** demac: plugin.c: Error opening URI: %s\n", pb->filename);
+#endif
+        pb->error = TRUE;
+        goto cleanup;
+    }
+
+    ctx = calloc(sizeof(APEContext), 1);
+    if(ape_read_header(ctx, vfd, 0) < 0) {
+        pb->error = TRUE;
+#ifdef DEBUG
+        fprintf(stderr, "** demac: plugin.c: Cannot parse APE header or unsupported format: %s\n", pb->filename);
+#endif
+        goto cleanup;
+    }
+
+    dec = calloc(sizeof(APEDecoderContext), 1);
+    if(ape_decode_init(dec, ctx) < 0) {
+        pb->error = TRUE;
+#ifdef DEBUG
+        fprintf(stderr, "** demac: plugin.c: Error initializing decoder\n");
+#endif
+        goto cleanup;
+    }
+    
+    frame_buf = malloc(ctx->max_packet_size);
+   
+#ifdef DEBUG
+    fprintf(stderr, "** demac: plugin.c: Duration: %u msec\n", ctx->duration);
+#endif
+
+    if(!pb->output->open_audio(FMT_S16_LE, ctx->samplerate, ctx->channels)) {
+        pb->error = TRUE;
+#ifdef DEBUG
+        fprintf(stderr, "** demac: plugin.c: Cannot open audio.\n");
+#endif
+        goto cleanup;
+    }
+
+    audio_opened = 1;
+
+    Tuple *tpl = demac_probe_for_tuple (pb->filename, vfd);
+    title = aud_tuple_formatter_make_title_string(tpl, aud_get_gentitle_format());
+    pb->set_params(pb, title, ctx->duration, -1, ctx->samplerate, ctx->channels);
+    aud_tuple_free(tpl);
+
+    /* begin decoding */
+    wav_buffer_size = ctx->blocksperframe * MAX_BYTESPERSAMPLE * ctx->channels;
+    wav = malloc(wav_buffer_size);
+
+    g_mutex_lock(demac_mutex);
+    playing = pb->playing;
+    g_mutex_unlock(demac_mutex);
+
+    while (playing && (ctx->currentframe < ctx->totalframes))
+    {
+        g_mutex_lock(demac_mutex);
+        playing = pb->playing;
+        local_seek_to = seek_to_msec;
+        g_mutex_unlock(demac_mutex);
+        
+        /* do seeking */
+        if (local_seek_to != -1) {
+            demac_do_mseek(ctx, local_seek_to);
+            pb->output->flush(local_seek_to);
+	    
+	    local_seek_to = -1;
+            g_mutex_lock(demac_mutex);
+	    seek_to_msec = -1;
+            g_mutex_unlock(demac_mutex);
+
+	    /* reset decoder */
+	    dec->samples = 0;
+	}
+
+        ape_read_packet(ctx, vfd, frame_buf, &pkt_size);
+#ifdef DEBUG
+        assert(pkt_size <= ctx->max_packet_size);
+	frame_crc = ape_initcrc();
+#endif
+	bytes_used = 0;
+
+/*#ifdef DEBUG
+        fprintf(stderr, "frame %d, %d samples, offset %d, size %d\n", ctx->currentframe-1,
+	        *((uint32_t*)frame_buf), *((uint32_t*)(frame_buf+4)), pkt_size);
+#endif*/
+
+        /* Decode the frame a chunk at a time */
+        while (playing && (bytes_used != pkt_size) && (local_seek_to == -1))
+        {
+            g_mutex_lock(demac_mutex);
+            playing = pb->playing;
+            local_seek_to = seek_to_msec;
+            g_mutex_unlock(demac_mutex);
+	    
+	    decoded_bytes = wav_buffer_size;
+            bytes_used = ape_decode_frame(dec, wav, &decoded_bytes, frame_buf, pkt_size);
+	    if(bytes_used < 0) {
+	        /* skip frame */
+		dec->samples = 0;
+		break;
+	    }
+	    
+	    if(local_seek_to != -1) break;
+
+            /* Write audio data */
+            pb->pass_audio(pb, FMT_S16_LE, ctx->channels, decoded_bytes, wav, &playing);
+#if DEBUG
+            frame_crc = ape_updatecrc(wav, decoded_bytes, frame_crc);
+#endif
+
+        }
+
+#if DEBUG
+        frame_crc = ape_finishcrc(frame_crc);
+
+        if (dec->CRC != frame_crc) {
+            fprintf(stderr, "** demac: plugin.c: CRC error in frame %d\n", ctx->currentframe-1);
+        }
+#endif
+    }
+
+cleanup:
+    
+    pb->eof = TRUE;
+    pb->playing = 0;
+
+    if(title) g_free(title);
+    if(audio_opened) pb->output->close_audio();
+   
+    if(dec) {ape_decode_close(dec); free(dec);}
+    if(wav) free(wav);
+    if(frame_buf) free(frame_buf);
+    if(ctx) {ape_read_close(ctx); free(ctx);}
+    if(vfd) aud_vfs_fclose(vfd);
+
+#ifdef DEBUG
+    fprintf(stderr, "** demac: plugin.c: decoding loop finished\n");
+#endif
+
+    return NULL;
+}
+
+static void demac_stop(InputPlayback *pb)
+{
+    g_mutex_lock(demac_mutex);
+    int playing = pb->playing;
+    g_mutex_unlock(demac_mutex);
+
+    if (playing) {
+        g_mutex_lock(demac_mutex);
+        pb->playing = 0;
+        g_mutex_unlock(demac_mutex);
+#ifdef DEBUG
+        fprintf(stderr, "** demac: plugin.c: waiting for thread finished\n");
+#endif
+        //g_thread_join(pb->thread);
+	/* pb->thread is useless if input plugin initialized from **terrible** cue-sheet plugin */
+        g_thread_join(pb_thread);
+#ifdef DEBUG
+        fprintf(stderr, "** demac: plugin.c: thread finished\n");
+#endif
+    }
+}
+
+static void demac_pause(InputPlayback *pb, short paused) {
+    pb->output->pause(paused);
+}
+
+Tuple *demac_probe_for_tuple (gchar *uri, VFSFile *vfd) {
+#ifdef DEBUG
+    fprintf(stderr, "** demac: plugin.c: demac_probe_for_tuple()\n");
+#endif
+    Tuple *tpl = aud_tuple_new_from_filename(uri);
+    gchar codec_string[32];
+
+    GHashTable *tag = NULL;
+    gchar *item;
+    if ((tag = parse_apev2_tag(vfd)) != NULL) {
+        if((item = g_hash_table_lookup (tag, "Artist")) != NULL) aud_tuple_associate_string(tpl, FIELD_ARTIST, NULL, item);
+        if((item = g_hash_table_lookup (tag, "Title")) != NULL) aud_tuple_associate_string(tpl, FIELD_TITLE, NULL, item);
+        if((item = g_hash_table_lookup (tag, "Album")) != NULL) aud_tuple_associate_string(tpl, FIELD_ALBUM, NULL, item);
+        if((item = g_hash_table_lookup (tag, "Comment")) != NULL) aud_tuple_associate_string(tpl, FIELD_COMMENT, NULL, item);
+        if((item = g_hash_table_lookup (tag, "Genre")) != NULL) aud_tuple_associate_string(tpl, FIELD_GENRE, NULL, item);
+        if((item = g_hash_table_lookup (tag, "Track")) != NULL) aud_tuple_associate_int(tpl, FIELD_TRACK_NUMBER, NULL, atoi(item));
+        if((item = g_hash_table_lookup (tag, "Year")) != NULL) aud_tuple_associate_int(tpl, FIELD_YEAR, NULL, atoi(item));
+    }
+
+    APEContext *ctx = calloc(sizeof(APEContext), 1);
+    aud_vfs_rewind(vfd);
+    ape_read_header(ctx, vfd, 1);
+    aud_tuple_associate_int(tpl, FIELD_LENGTH, NULL, ctx->duration);
+    ape_read_close(ctx);
+    free(ctx);
+
+    if (tag) g_hash_table_remove_all(tag);
+    
+    g_sprintf(codec_string, "Monkey's Audio v%4.2f", (float)ctx->fileversion/1000.0);
+#ifdef DEBUG
+    fprintf(stderr, "** demac: plugin.c: Codec: %s\n", codec_string);
+#endif
+    aud_tuple_associate_string(tpl, FIELD_CODEC, NULL, codec_string);
+    aud_tuple_associate_string(tpl, FIELD_QUALITY, NULL, "lossless");
+    return tpl;
+}
+
+Tuple *demac_get_tuple(char *filename) {
+#ifdef DEBUG
+  fprintf(stderr, "** demac: plugin.c: demac_get_tuple()\n");
+#endif
+  VFSFile *vfd;
+
+  if ((vfd = aud_vfs_fopen(filename, "r")) == NULL) {
+    return NULL;
+  }
+
+  Tuple *tpl = demac_probe_for_tuple(filename, vfd);
+  aud_vfs_fclose(vfd);
+  return tpl;
+}
+
+static void demac_mseek (InputPlayback *pb, gulong millisecond) {
+  g_mutex_lock(demac_mutex);
+  seek_to_msec = millisecond;
+  g_mutex_unlock(demac_mutex);
+#ifdef DEBUG
+  fprintf(stderr, "** demac: plugin.c: seeking to %u msec\n", millisecond);
+#endif
+}
+
+static void demac_seek (InputPlayback *pb, gint time) {
+  demac_mseek(pb, (unsigned long)time*1000);
+}
+
+static void demac_init() {
+  /* Found in Freedesktop shared-mime-info */
+  aud_mime_set_plugin("audio/x-ape", &demac_ip);
+  demac_mutex = g_mutex_new();
+}
+
+static void demac_cleanup() {
+  g_mutex_free(demac_mutex);
+}
+
+static void demac_about(void) {
+    static GtkWidget *about_window = NULL;
+
+    if (about_window)
+      gdk_window_raise(about_window->window);
+    else {
+      about_window = audacious_info_dialog(_("About Monkey's Audio Plugin"),
+                                       _("Copyright (C) 2007 Eugene Zagidullin <e.asphyx@gmail.com>\n"
+                                        "Based on ffape decoder, Copyright (C) 2007 Benjamin Zores\n"
+					"ffape itself based on libdemac by Dave Chapman\n\n"
+					"ffape is a part of FFmpeg project, http://ffmpeg.mplayerhq.hu/"),
+                                       _("Ok"), FALSE, NULL, NULL);
+      g_signal_connect(G_OBJECT(about_window), "destroy",
+                       G_CALLBACK(gtk_widget_destroyed), &about_window);
+    }
+}
+
+static gchar *fmts[] = { "ape", NULL };
+
+static InputPlugin demac_ip = {
+    .description = "Monkey's Audio Plugin",
+    .init = demac_init,
+    .about = demac_about,
+    .play_file = demac_play,
+    .stop = demac_stop,
+    .pause = demac_pause,
+    .seek = demac_seek,
+    .cleanup = demac_cleanup,
+    .get_song_tuple = demac_get_tuple,
+    .is_our_file_from_vfs = demac_probe_vfs,
+    .vfs_extensions = fmts,
+    .mseek = demac_mseek,
+    .probe_for_tuple = demac_probe_for_tuple,
+};
+
+InputPlugin *demac_iplist[] = { &demac_ip, NULL };
+DECLARE_PLUGIN(demac, NULL, NULL, demac_iplist, NULL, NULL, NULL, NULL, NULL);
+
+ /* vim:foldmethod=syntax: */