Merge lp:~neale/mixxx/m4a into lp:~mixxxdevelopers/mixxx/trunk

[Neale Pickett]

Rewritten M4A plugin, uses libmp4ff instead of libmp4v2. Works with all my M4A files, and I will maintain the code if people can send me examples of problem files.

[Stefan Nürnberger (kabelfrickler)]

As the faad2 developers mention, mp4ff is not meant as a library for external programs like Mixxx. They do not ship the library by default anymore, resulting in quite some bug reports about broken dependencies. See e.g. http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=550679#57

Quote:
"again, libmp4ff was never meant to be used outside of faad2 and its
use is explicitely discouraged upstream and we deeply regret having
shipped it at all. Please get your application fixed to use mp4v2
instead (if it is MPL-compatible) or ffmpeg (prefered)."

I therefore propose to keep the old implementation using mp4v2. What is/was the reason for using mp4ff instead, anyway?

review: Needs Information

[Neale Pickett (neale)]

> I therefore propose to keep the old implementation using mp4v2. What is/was
> the reason for using mp4ff instead, anyway?

Yeah, it should use mp4v2.

The reason I moved to mp4ff is because I couldn't find example code for mp4v2. The original motivation for this branch was that I have a whole lot of m4a files with frames larger than the current implementation can handle.

I'll port this branch to mp4v2 and submit another merge request when that work is done. The main thing this patch does is make mixxx work with all m4a files I can find, the container parsing library isn't significant.

Unmerged revisions

3293. By Neale Pickett on 2012-08-25

Rewritten M4A plugin

=== modified file 'mixxx/build/features.py'
--- mixxx/build/features.py	2012-07-08 07:30:32 +0000
+++ mixxx/build/features.py	2012-08-25 14:26:19 +0000
@@ -465,21 +465,16 @@
         if not self.enabled(build):
             return
 
-        have_mp4v2_h = conf.CheckHeader('mp4v2/mp4v2.h')
-        have_mp4v2 = conf.CheckLib(['mp4v2','libmp4v2'], autoadd=False)
-        have_mp4 = conf.CheckLib('mp4', autoadd=False)
-
-        # Either mp4 or mp4v2 works
-        have_mp4 = (have_mp4v2_h and have_mp4v2) or have_mp4
-
-        if not have_mp4:
-            raise Exception('Could not find libmp4, libmp4v2 or the libmp4v2 development headers.')
-
         have_faad = conf.CheckLib(['faad','libfaad'], autoadd=False)
 
         if not have_faad:
             raise Exception('Could not find libfaad or the libfaad development headers.')
 
+        have_mp4ff = conf.CheckLib(['mp4ff', 'libmp4ff'], autoadd=False)
+
+        if not have_mp4ff:
+            raise Exception('Could not find libmp4ff or the libmp4ff development headers.')
+
 
 class WavPack(Feature):
     def description(self):
 
=== modified file 'mixxx/plugins/soundsourcem4a/SConscript'
--- mixxx/plugins/soundsourcem4a/SConscript	2011-03-07 22:25:20 +0000
+++ mixxx/plugins/soundsourcem4a/SConscript	2012-08-25 14:26:19 +0000
@@ -23,9 +23,7 @@
 
     conf = Configure(env)
 
-    have_mp4v2_h = conf.CheckHeader('mp4v2/mp4v2.h')
-    have_mp4 = (have_mp4v2_h and conf.CheckLib(['mp4v2', 'libmp4v2'])) or \
-        conf.CheckLib('mp4')
+    have_mp4ff = conf.CheckLib(['mp4ff', 'libmp4ff'])
 
     have_faad = conf.CheckLib(['faad', 'libfaad'])
     have_faad_26 = False
@@ -47,8 +45,6 @@
     if have_faad_26:
         env.Append(CPPDEFINES = '__M4AHACK__')
         print "libfaad 2.6 compatibility mode... enabled"
-    if have_mp4v2_h:
-        env.Append(CPPDEFINES = '__MP4V2__')
 
     env = conf.Finish()
     SHLIBPREFIX='lib' #Makes the filename "libsoundsourcem4a" consistently across platforms to make our lives easier.
@@ -63,6 +59,3 @@
     Return("ssm4a_bin")
 else:
     Return("")
-
-
-
 
=== removed directory 'mixxx/plugins/soundsourcem4a/m4a'
=== removed file 'mixxx/plugins/soundsourcem4a/m4a/comment.h'
--- mixxx/plugins/soundsourcem4a/m4a/comment.h	2008-12-14 09:12:07 +0000
+++ mixxx/plugins/soundsourcem4a/m4a/comment.h	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-#ifndef _COMMENT_H
-#define _COMMENT_H
-
-struct keyval {
-	char *key;
-	char *val;
-};
-
-struct growing_keyvals {
-	struct keyval *comments;
-	int alloc;
-	int count;
-};
-
-#define GROWING_KEYVALS(name) struct growing_keyvals name = { NULL, 0, 0 }
-
-struct keyval *comments_dup(const struct keyval *comments);
-void comments_free(struct keyval *comments);
-
-/* case insensitive key */
-const char *comments_get_val(const struct keyval *comments, const char *key);
-const char *comments_get_albumartist(const struct keyval *comments);
-int comments_get_int(const struct keyval *comments, const char *key);
-int comments_get_date(const struct keyval *comments, const char *key);
-
-int comments_add(struct growing_keyvals *c, const char *key, char *val);
-int comments_add_const(struct growing_keyvals *c, const char *key, const char *val);
-void comments_terminate(struct growing_keyvals *c);
-
-#endif
 
=== removed file 'mixxx/plugins/soundsourcem4a/m4a/ip.h'
--- mixxx/plugins/soundsourcem4a/m4a/ip.h	2008-12-14 09:12:07 +0000
+++ mixxx/plugins/soundsourcem4a/m4a/ip.h	1970-01-01 00:00:00 +0000
@@ -1,99 +0,0 @@
-/*
- * Copyright 2004-2005 Timo Hirvonen
- *
- * 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#ifndef _IP_H
-#define _IP_H
-
-#include "comment.h"
-#include "sf.h"
-
-enum {
-	/* no error */
-	IP_ERROR_SUCCESS,
-	/* system error (error code in errno) */
-	IP_ERROR_ERRNO,
-	/* file type not supported */
-	IP_ERROR_UNRECOGNIZED_FILE_TYPE,
-	/* function not supported (usually seek) */
-	IP_ERROR_FUNCTION_NOT_SUPPORTED,
-	/* input plugin detected corrupted file */
-	IP_ERROR_FILE_FORMAT,
-	/* malformed uri */
-	IP_ERROR_INVALID_URI,
-	/* sample format not supported */
-	IP_ERROR_SAMPLE_FORMAT,
-	/* error parsing response line / headers */
-	IP_ERROR_HTTP_RESPONSE,
-	/* usually 404 */
-	IP_ERROR_HTTP_STATUS,
-	/*  */
-	IP_ERROR_INTERNAL
-};
-
-/*
-struct input_plugin_data {
-	// filled by ip-layer
-	char *filename;
-	int fd;
-
-	unsigned int remote : 1;
-	unsigned int metadata_changed : 1;
-
-	// shoutcast
-	int counter;
-	int metaint;
-	char *metadata;
-
-	// filled by plugin
-	sample_format_t sf;
-	void * private_ipd;
-};
-*/
-
-struct input_plugin_data {
-	// filled by ip-layer
-//	QString filename;
-	char *filename;
-	int fd;
-
-	unsigned int remote : 1;
-	unsigned int metadata_changed : 1;
-
-	// shoutcast
-	int counter;
-	int metaint;
-	char *metadata;
-
-	// filled by plugin
-	sample_format_t sf;
-	void * private_ipd;
-};
-
-
-struct input_plugin_ops {
-	int (*open)(struct input_plugin_data *ip_data);
-	int (*close)(struct input_plugin_data *ip_data);
-	int (*read)(struct input_plugin_data *ip_data, char *buffer, int count);
-	int (*seek)(struct input_plugin_data *ip_data, double offset);
-	int (*read_comments)(struct input_plugin_data *ip_data,
-			struct keyval **comments);
-	int (*duration)(struct input_plugin_data *ip_data);
-};
-
-#endif
 
=== removed file 'mixxx/plugins/soundsourcem4a/m4a/mp4-mixxx.cpp'
--- mixxx/plugins/soundsourcem4a/m4a/mp4-mixxx.cpp	2012-05-04 03:44:44 +0000
+++ mixxx/plugins/soundsourcem4a/m4a/mp4-mixxx.cpp	1970-01-01 00:00:00 +0000
@@ -1,587 +0,0 @@
-// mp4-mixxx.cpp
-// This file is a hopefully shortlived fork + convertsion to C++ of the M4A audio playback plugin from the C* Music Player (cmus) project.
-// The original file mp4.c is also in this directory.
-//
-// This forked and converted by Garth and Albert in Summer 2008 to support M4A playback in Mixxx
-//
-// g++ $(pkg-config --cflags QtCore) $(pkg-config --libs-only-l QtCore) -lmp4v2 -lfaad -o mp4-mixxx mp4-mixxx.cpp
-//
-#include <QtCore>
-#include <stdlib.h>
-
-#include "mathstuff.h"
-
-/*
- * Copyright 2006 dnk <[e-mail]>
- *
- * 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#include "ip.h"
-// #include "xmalloc.h"
-// #include "debug.h"
-// #include "file.h"
-
-#ifdef __MP4V2__
-    #include <mp4v2/mp4v2.h>
-#else
-    #include <mp4.h>
-#endif
-
-#include <neaacdec.h>
-
-#include <errno.h>
-#include <string.h>
-#include <sys/types.h>
-#ifndef _MSC_VER
-    #include <unistd.h>
-#endif
-
-#ifdef _MSC_VER
-    #define S_ISDIR(mode) (mode & _S_IFDIR)
-    #define strcasecmp stricmp
-    #define strncasecmp strnicmp
-#endif
-
-#ifdef __M4AHACK__
-    typedef uint32_t SAMPLERATE_TYPE;
-#else
-    typedef unsigned long SAMPLERATE_TYPE;
-#endif
-
-struct mp4_private {
-    char *overflow_buf;
-    int overflow_buf_len;
-
-    unsigned char *aac_data;
-    unsigned int aac_data_len;
-
-    char *sample_buf;
-    unsigned int sample_buf_frame;
-    unsigned int sample_buf_len;
-
-    unsigned char channels;
-    unsigned long sample_rate;
-
-    faacDecHandle decoder; /* typedef void * */
-
-    struct {
-        MP4FileHandle handle; /* typedef void * */
-
-        MP4TrackId track;
-        MP4SampleId sample;
-        MP4SampleId num_samples;
-    } mp4;
-};
-
-
-static MP4TrackId mp4_get_track(MP4FileHandle *handle)
-{
-    MP4TrackId num_tracks;
-    const char *track_type;
-    uint8_t obj_type;
-    MP4TrackId i;
-
-    num_tracks = MP4GetNumberOfTracks(handle, NULL, 0);
-
-    for (i = 1; i <= num_tracks; i++) {
-        track_type = MP4GetTrackType(handle, i);
-        if (!track_type)
-            continue;
-
-        if (!MP4_IS_AUDIO_TRACK_TYPE(track_type))
-            continue;
-
-        /* MP4GetTrackAudioType */
-        obj_type = MP4GetTrackEsdsObjectTypeId(handle, i);
-        if (obj_type == MP4_INVALID_AUDIO_TYPE)
-            continue;
-
-        if (obj_type == MP4_MPEG4_AUDIO_TYPE) {
-            obj_type = MP4GetTrackAudioMpeg4Type(handle, i);
-
-            if (MP4_IS_MPEG4_AAC_AUDIO_TYPE(obj_type))
-                return i;
-        } else {
-            if (MP4_IS_AAC_AUDIO_TYPE(obj_type))
-                return i;
-        }
-    }
-
-    return MP4_INVALID_TRACK_ID;
-}
-
-static int mp4_open(struct input_plugin_data *ip_data)
-{
-    struct mp4_private *priv;
-    faacDecConfigurationPtr neaac_cfg;
-    unsigned char *buf;
-    unsigned int buf_size;
-
-    /* http://sourceforge.net/forum/message.php?msg_id=3578887 */
-    if (ip_data->remote)
-        return -IP_ERROR_FUNCTION_NOT_SUPPORTED;
-
-    /* init private_ipd struct */
-    //  priv = xnew0(struct mp4_private, 1);
-    priv = new mp4_private();
-    //priv = (mp4_private*) calloc(1, sizeof(mp4_private));
-    // FIXME: there was some alloc error checking in the orgininal ver
-    memset(priv, 0, sizeof(*priv));
-
-    priv->overflow_buf_len = 0;
-    priv->overflow_buf = NULL;
-
-    priv->sample_buf_len = 4096;
-    priv->sample_buf = new char[priv->sample_buf_len];
-    priv->sample_buf_frame = -1;
-
-    ip_data->private_ipd = priv;
-
-    priv->decoder = faacDecOpen();
-    /* set decoder config */
-    neaac_cfg = faacDecGetCurrentConfiguration(priv->decoder);
-    neaac_cfg->outputFormat = FAAD_FMT_16BIT; /* force 16 bit audio */
-    neaac_cfg->downMatrix = 1; /* 5.1 -> stereo */
-    neaac_cfg->defObjectType = LC;
-    //qDebug() << "Decoder Config" << neaac_cfg->defObjectType
-    //         << neaac_cfg->defSampleRate
-    //         << neaac_cfg->useOldADTSFormat
-    //         << neaac_cfg->dontUpSampleImplicitSBR;
-    faacDecSetConfiguration(priv->decoder, neaac_cfg);
-
-    /* open mpeg-4 file, check for >= ver 1.9.1 */
-#if MP4V2_PROJECT_version_hex <= 0x00010901
-    priv->mp4.handle = MP4Read(ip_data->filename, 0);
-#else
-    priv->mp4.handle = MP4Read(ip_data->filename);
-#endif
-    if (!priv->mp4.handle) {
-        qDebug() << "MP4Read failed";
-        goto out;
-    }
-
-    /* find aac audio track */
-    priv->mp4.track = mp4_get_track((MP4FileHandle*)priv->mp4.handle);
-    if (priv->mp4.track == MP4_INVALID_TRACK_ID) {
-        qDebug() << "MP4FindTrackId failed";
-        goto out;
-    }
-
-    // Allocate AAC read buffer
-    priv->aac_data_len = MP4GetTrackMaxSampleSize(priv->mp4.handle, priv->mp4.track);
-    priv->aac_data = new unsigned char[priv->aac_data_len];
-
-    priv->mp4.num_samples = MP4GetTrackNumberOfSamples(priv->mp4.handle, priv->mp4.track);
-    // MP4 frames are 1-indexed
-    priv->mp4.sample = 1;
-
-    buf = NULL;
-    buf_size = 0;
-    if (!MP4GetTrackESConfiguration(priv->mp4.handle, priv->mp4.track, &buf, &buf_size)) {
-        /* failed to get mpeg-4 audio config... this is ok.
-         * faacDecInit2() will simply use default values instead.
-         */
-        qDebug() << "Didn't get MP4 Audio Config (not a bad thing)";
-            buf = NULL;
-            buf_size = 0;
-    }
-
-    /* init decoder according to mpeg-4 audio config */
-    if (faacDecInit2(priv->decoder, buf, buf_size,
-            (SAMPLERATE_TYPE*)&priv->sample_rate, &priv->channels) < 0) {
-        free(buf);
-        goto out;
-    }
-    free(buf);
-
-    // qDebug() << "sample rate "<< priv->sample_rate <<"hz, channels" << priv->channels;
-
-    ip_data->sf = sf_rate(priv->sample_rate) | sf_channels(priv->channels) | sf_bits(16) | sf_signed(1);
-#if defined(WORDS_BIGENDIAN)
-    ip_data->sf |= sf_bigendian(1);
-#endif
-
-    return 0;
-out:
-    if (priv->mp4.handle)
-        MP4Close(priv->mp4.handle);
-    if (priv->decoder)
-        faacDecClose(priv->decoder);
-    delete [] priv->sample_buf;
-    delete [] priv->aac_data;
-    delete priv;
-    return -IP_ERROR_FILE_FORMAT;
-}
-
-static int mp4_close(struct input_plugin_data *ip_data)
-{
-    struct mp4_private *priv;
-
-    priv = (mp4_private*) ip_data->private_ipd;
-
-    if (priv->mp4.handle)
-        MP4Close(priv->mp4.handle);
-
-    if (priv->decoder)
-        faacDecClose(priv->decoder);
-
-    if (priv->sample_buf) {
-        delete [] priv->sample_buf;
-    }
-
-    if (priv->aac_data) {
-        delete [] priv->aac_data;
-    }
-
-    delete priv;
-    ip_data->private_ipd = NULL;
-
-    return 0;
-}
-
-/* returns -1 on fatal errors
- * returns -2 on non-fatal errors
- * 0 on eof
- * number of bytes put in 'buffer' on success */
-static int decode_one_frame(struct input_plugin_data *ip_data, void *buffer, int count)
-{
-    struct mp4_private *priv = (mp4_private*) ip_data->private_ipd;
-    faacDecFrameInfo frame_info;
-    int bytes;
-
-    //BUG_ON(priv->overflow_buf_len);
-
-    if (priv->mp4.sample > priv->mp4.num_samples)
-        return 0; /* EOF */
-
-    unsigned char *aac_data = priv->aac_data;
-    unsigned int aac_data_len = priv->aac_data_len;
-
-    // If you do this, then MP4ReadSample allocates the buffer for you. We don't
-    // want this because it's slow.
-    // unsigned char *aac_data = NULL;
-    // unsigned int aac_data_len = 0;
-
-    int this_frame = priv->mp4.sample;
-    if (MP4ReadSample(priv->mp4.handle, priv->mp4.track, this_frame,
-                      &aac_data, &aac_data_len,
-                      NULL, NULL, NULL, NULL) == 0) {
-        qWarning() << "m4a: error reading mp4 sample" << priv->mp4.sample;
-        errno = EINVAL;
-        return -1;
-    }
-
-    if (!aac_data) {
-        qWarning() << "m4a: aac_data == NULL";
-        errno = EINVAL;
-        return -1;
-    }
-
-    char* sample_buf = priv->sample_buf;
-    int sample_buf_len = priv->sample_buf_len;
-
-    NeAACDecDecode2(priv->decoder,
-                  &frame_info,
-                  aac_data, aac_data_len,
-                  (void**)&sample_buf, sample_buf_len);
-
-    // qDebug() << "Sample frame" << priv->mp4.sample
-    //          << "has" << frame_info.samples << "samples"
-    //          << frame_info.bytesconsumed << "bytes"
-    //          << frame_info.channels << "channels"
-    //          << frame_info.error << "error"
-    //          << frame_info.samplerate << "samplerate";
-
-    if (!sample_buf || frame_info.bytesconsumed <= 0) {
-        qWarning() << "m4a fatal error:" << faacDecGetErrorMessage(frame_info.error);
-        errno = EINVAL;
-        return -1;
-    }
-
-    if (frame_info.error != 0) {
-        qDebug() << "frame error:" << faacDecGetErrorMessage(frame_info.error);
-        return -2;
-    }
-
-    if (frame_info.samples <= 0) {
-        return -2;
-    }
-
-    if (frame_info.channels != priv->channels ||
-      frame_info.samplerate != priv->sample_rate) {
-        qDebug() << "invalid channel or sample_rate count\n";
-        return -2;
-    }
-
-    // The frame read was successful
-    priv->sample_buf_frame = this_frame;
-    priv->mp4.sample++;
-
-    /* 16-bit samples */
-    bytes = frame_info.samples * 2;
-
-    if (bytes > count) {
-        /* decoded too much; keep overflow. */
-        //memcpy(priv->overflow_buf_base, sample_buf + count, bytes - count);
-        //priv->overflow_buf = priv->overflow_buf_base;
-
-        priv->overflow_buf = sample_buf + count;
-        priv->overflow_buf_len = bytes - count;
-        memcpy(buffer, sample_buf, count);
-        return count;
-    }
-
-    memcpy(buffer, sample_buf, bytes);
-    return bytes;
-}
-
-static int mp4_read(struct input_plugin_data *ip_data, char *buffer, int count)
-{
-    struct mp4_private *priv = (mp4_private*) ip_data->private_ipd;
-    int rc;
-
-    /* use overflow from previous call (if any) */
-    if (priv->overflow_buf_len > 0) {
-        int len = priv->overflow_buf_len;
-
-        if (len > count)
-            len = count;
-
-        memcpy(buffer, priv->overflow_buf, len);
-        priv->overflow_buf += len;
-        priv->overflow_buf_len -= len;
-
-        //qDebug() << "Reading" << len << "from overflow."
-        //         << priv->overflow_buf_len << "overflow remains";
-
-        return len;
-    }
-
-    do {
-        rc = decode_one_frame(ip_data, buffer, count);
-    } while (rc == -2);
-
-    return rc;
-}
-
-static int mp4_total_samples(struct input_plugin_data *ip_data) {
-    struct mp4_private *priv = (struct mp4_private*)ip_data->private_ipd;
-    return priv->channels * priv->mp4.num_samples * 1024;
-}
-
-static int mp4_current_sample(struct input_plugin_data *ip_data) {
-    struct mp4_private *priv = (struct mp4_private*)ip_data->private_ipd;
-    int frame_length = priv->channels * 1024;
-    if (priv->overflow_buf_len == 0) {
-    return priv->mp4.sample * frame_length - priv->overflow_buf_len;
-    }
-    // rryan 9/2009 This is equivalent to the current sample. The full expression
-    // is (priv->mp4.sample - 1) * frame_length + (frame_length -
-    // priv->overflow_buf_len); but the frame_length lone terms drop out.
-
-    // -1 because if overflow buf is filled then mp4.sample is incremented, and
-    // the samples in the overflow buf are for sample - 1
-    return (priv->mp4.sample - 1) * frame_length - priv->overflow_buf_len;
-}
-
-static int mp4_seek_sample(struct input_plugin_data *ip_data, int sample)
-{
-    struct mp4_private *priv;
-    priv = (mp4_private*) ip_data->private_ipd;
-
-    Q_ASSERT(sample >= 0);
-    // The first frame is samples 0 through 2047. The first sample of the second
-    // frame is 2048. 2048 / 2048 = 1, so frame_for_sample will be 2 on the
-    // 2048'th sample. The frame_offset_samples is how many samples into the frame
-    // the sample'th sample is. For x in (0,2047), the frame offset is x. For x in
-    // (2048,4095) the offset is x-2048 and so on. sample % 2048 is therefore
-    // suitable for calculating the offset.
-    unsigned int frame_for_sample = 1 + (sample / (2 * 1024));
-    unsigned int frame_offset_samples = sample % (2 * 1024);
-    unsigned int frame_offset_bytes = frame_offset_samples * 2;
-
-    //qDebug() << "Seeking to" << frame_for_sample << ":" << frame_offset;
-
-    // Invalid sample requested -- return the current position.
-    if (frame_for_sample < 1 || frame_for_sample > priv->mp4.num_samples)
-        return mp4_current_sample(ip_data);
-
-    // We don't have the current frame decoded -- decode it.
-    if (priv->sample_buf_frame != frame_for_sample) {
-
-        // We might have to 'prime the pump' if this isn't the first frame. The
-        // decoder has internal state that it builds as it plays, and just seeking
-        // to the frame we want will result in poor audio quality (clicks and
-        // pops). This is akin to seeking in a video and seeing MPEG
-        // artifacts. Figure out how many frames we need to go backward -- 1 seems
-        // to work.
-        const int how_many_backwards = 1;
-        int start_frame = math_max(frame_for_sample - how_many_backwards, 1);
-        priv->mp4.sample = start_frame;
-
-        // rryan 9/2009 -- the documentation is sketchy on this, but I think that
-        // it tells the decoder that you are seeking so it should flush its state
-        faacDecPostSeekReset(priv->decoder, priv->mp4.sample);
-
-        // Loop until the current frame is past the frame we intended to read
-        // (i.e. we have decoded how_many_backwards + 1 frames). The desidered
-        // decoded frame will be stored in the overflow buffer, since we're asking
-        // to read 0 bytes.
-        int result;
-        do {
-            result = decode_one_frame(ip_data, 0, 0);
-            if (result < 0) qDebug() << "SEEK_ERROR";
-        } while (result == -2 || priv->mp4.sample <= frame_for_sample);
-
-        if (result == -1 || result == 0) {
-            return mp4_current_sample(ip_data);
-        }
-    } else {
-        qDebug() << "Seek within frame";
-    }
-
-    // Now the overflow buffer contains the sample we want to seek to. Fix the
-    // overflow buffer so that the next call to read() will read starting with the
-    // requested sample.
-    priv->overflow_buf = priv->sample_buf;
-    priv->overflow_buf += frame_offset_bytes;
-    priv->overflow_buf_len -= frame_offset_bytes;
-
-    return mp4_current_sample(ip_data);
-}
-
-static int mp4_seek(struct input_plugin_data *ip_data, double offset)
-{
-    struct mp4_private *priv;
-    MP4SampleId sample;
-    uint32_t scale;
-
-    priv = (mp4_private*) ip_data->private_ipd;
-
-    scale = MP4GetTrackTimeScale(priv->mp4.handle, priv->mp4.track);
-    if (scale == 0)
-        return -IP_ERROR_INTERNAL;
-
-    sample = MP4GetSampleIdFromTime(priv->mp4.handle, priv->mp4.track,
-        (MP4Timestamp)(offset * (double)scale), 0);
-    if (sample == MP4_INVALID_SAMPLE_ID)
-        return -IP_ERROR_INTERNAL;
-
-    qDebug() << "seeking from sample" << priv->mp4.sample << "to sample" << sample;
-    priv->mp4.sample = sample;
-    priv->overflow_buf_len = 0;
-
-    return priv->mp4.sample;
-}
-
-/* commented because we use TagLib now ??? -- bkgood
-static int mp4_read_comments(struct input_plugin_data *ip_data,
-        struct keyval **comments)
-{
-    struct mp4_private *priv;
-    uint16_t meta_num, meta_total;
-    uint8_t val;
-    uint8_t *ustr;
-    uint32_t size;
-    char *str;
-    GROWING_KEYVALS(c);
-
-    priv = ip_data->private;
-
-     MP4GetMetadata* provides malloced pointers, and the data
-     * is in UTF-8 (or at least it should be).
-     if (MP4GetMetadataArtist(priv->mp4.handle, &str))
-         comments_add(&c, "artist", str);
-     if (MP4GetMetadataAlbum(priv->mp4.handle, &str))
-         comments_add(&c, "album", str);
-     if (MP4GetMetadataName(priv->mp4.handle, &str))
-         comments_add(&c, "title", str);
-     if (MP4GetMetadataGenre(priv->mp4.handle, &str))
-         comments_add(&c, "genre", str);
-     if (MP4GetMetadataYear(priv->mp4.handle, &str))
-         comments_add(&c, "date", str);
-
-     if (MP4GetMetadataCompilation(priv->mp4.handle, &val))
-         comments_add_const(&c, "compilation", val ? "yes" : "no");
-#if 0
-     if (MP4GetBytesProperty(priv->mp4.handle, "moov.udta.meta.ilst.aART.data", &ustr, &size)) {
-         char *xstr;
-
-         What's this?
-         * This is the result from lack of documentation.
-         * It's supposed to return just a string, but it
-         * returns an additional 16 bytes of junk at the
-         * beginning. Could be a bug. Could be intentional.
-         * Hopefully this works around it:
-
-         if (ustr[0] == 0 && size > 16) {
-             ustr += 16;
-             size -= 16;
-         }
-         xstr = xmalloc(size + 1);
-         memcpy(xstr, ustr, size);
-         xstr[size] = 0;
-         comments_add(&c, "albumartist", xstr);
-         free(xstr);
-     }
-#endif
-    if (MP4GetMetadataTrack(priv->mp4.handle, &meta_num, &meta_total)) {
-        char buf[6];
-        snprintf(buf, 6, "%u", meta_num);
-        comments_add_const(&c, "tracknumber", buf);
-    }
-    if (MP4GetMetadataDisk(priv->mp4.handle, &meta_num, &meta_total)) {
-        char buf[6];
-        snprintf(buf, 6, "%u", meta_num);
-        comments_add_const(&c, "discnumber", buf);
-    }
-
-    comments_terminate(&c);
-    *comments = c.comments;
-    return 0;
-}
-*/
-
-static int mp4_duration(struct input_plugin_data *ip_data)
-{
-    struct mp4_private *priv;
-    uint32_t scale;
-    uint64_t duration;
-
-    priv = (mp4_private*) ip_data->private_ipd;
-
-    scale = MP4GetTrackTimeScale(priv->mp4.handle, priv->mp4.track);
-    if (scale == 0)
-        return 0;
-
-    duration = MP4GetTrackDuration(priv->mp4.handle, priv->mp4.track);
-
-    return duration / scale;
-}
-/*
-const struct input_plugin_ops ip_ops = {
-    .open = mp4_open,
-    .close = mp4_close,
-    .read = mp4_read,
-    .seek = mp4_seek,
-    .read_comments = mp4_read_comments,
-    .duration = mp4_duration
-};
-
-const char * const ip_extensions[] = { "mp4", "m4a", "m4b", NULL };
-const char * const ip_mime_types[] = { "audio/mp4", "audio/mp4a-latm", NULL };
-*/
 
=== removed file 'mixxx/plugins/soundsourcem4a/m4a/mp4.c'
--- mixxx/plugins/soundsourcem4a/m4a/mp4.c	2010-01-19 21:49:19 +0000
+++ mixxx/plugins/soundsourcem4a/m4a/mp4.c	1970-01-01 00:00:00 +0000
@@ -1,407 +0,0 @@
-/*
- * Copyright 2006 dnk <[e-mail]>
- *
- * 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#include "ip.h"
-#include "xmalloc.h"
-#include "debug.h"
-#include "file.h"
-
-#ifdef __MP4V2__
-    #include <mp4v2/mp4v2.h>
-#else
-    #include <mp4.h>
-#endif
-#include <faad.h>
-
-#include <errno.h>
-#include <string.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-struct mp4_private {
-	char *overflow_buf;
-	int overflow_buf_len;
-
-	unsigned char channels;
-	unsigned long sample_rate;
-
-	faacDecHandle decoder;		/* typedef void * */
-
-	struct {
-		MP4FileHandle handle;	/* typedef void * */
-
-		MP4TrackId track;
-		MP4SampleId sample;
-		MP4SampleId num_samples;
-	} mp4;
-};
-
-
-static MP4TrackId mp4_get_track(MP4FileHandle *handle)
-{
-	MP4TrackId num_tracks;
-	const char *track_type;
-	uint8_t obj_type;
-	MP4TrackId i;
-
-	num_tracks = MP4GetNumberOfTracks(handle, NULL, 0);
-
-	for (i = 1; i <= num_tracks; i++) {
-		track_type = MP4GetTrackType(handle, i);
-		if (!track_type)
-			continue;
-
-		if (!MP4_IS_AUDIO_TRACK_TYPE(track_type))
-			continue;
-
-		/* MP4GetTrackAudioType */
-		obj_type = MP4GetTrackEsdsObjectTypeId(handle, i);
-		if (obj_type == MP4_INVALID_AUDIO_TYPE)
-			continue;
-
-		if (obj_type == MP4_MPEG4_AUDIO_TYPE) {
-			obj_type = MP4GetTrackAudioMpeg4Type(handle, i);
-
-			if (MP4_IS_MPEG4_AAC_AUDIO_TYPE(obj_type))
-				return i;
-		} else {
-			if (MP4_IS_AAC_AUDIO_TYPE(obj_type))
-				return i;
-		}
-	}
-
-	return MP4_INVALID_TRACK_ID;
-}
-
-static int mp4_open(struct input_plugin_data *ip_data)
-{
-	struct mp4_private *priv;
-	faacDecConfigurationPtr neaac_cfg;
-	unsigned char *buf;
-	unsigned int buf_size;
-
-
-	/* http://sourceforge.net/forum/message.php?msg_id=3578887 */
-	if (ip_data->remote)
-		return -IP_ERROR_FUNCTION_NOT_SUPPORTED;
-
-	/* init private struct */
-	priv = xnew0(struct mp4_private, 1);
-	ip_data->private = priv;
-
-	priv->decoder = faacDecOpen();
-
-	/* set decoder config */
-	neaac_cfg = faacDecGetCurrentConfiguration(priv->decoder);
-	neaac_cfg->outputFormat = FAAD_FMT_16BIT;	/* force 16 bit audio */
-	neaac_cfg->downMatrix = 1;			/* 5.1 -> stereo */
-	faacDecSetConfiguration(priv->decoder, neaac_cfg);
-
-	/* open mpeg-4 file */
-	priv->mp4.handle = MP4Read(ip_data->filename, 0);
-	if (!priv->mp4.handle) {
-		d_print("MP4Read failed\n");
-		goto out;
-	}
-
-	/* find aac audio track */
-	priv->mp4.track = mp4_get_track(priv->mp4.handle);
-	if (priv->mp4.track == MP4_INVALID_TRACK_ID) {
-		d_print("MP4FindTrackId failed\n");
-		goto out;
-	}
-
-	priv->mp4.num_samples = MP4GetTrackNumberOfSamples(priv->mp4.handle, priv->mp4.track);
-
-	priv->mp4.sample = 1;
-
-	buf = NULL;
-	buf_size = 0;
-	if (!MP4GetTrackESConfiguration(priv->mp4.handle, priv->mp4.track, &buf, &buf_size)) {
-		/* failed to get mpeg-4 audio config... this is ok.
-		 * faacDecInit2() will simply use default values instead.
-		 */
-		buf = NULL;
-		buf_size = 0;
-	}
-
-	/* init decoder according to mpeg-4 audio config */
-	if (faacDecInit2(priv->decoder, buf, buf_size, &priv->sample_rate, &priv->channels) < 0) {
-		free(buf);
-		goto out;
-	}
-
-	free(buf);
-
-	d_print("sample rate %luhz, channels %u\n", priv->sample_rate, priv->channels);
-
-	ip_data->sf = sf_rate(priv->sample_rate) | sf_channels(priv->channels) | sf_bits(16) | sf_signed(1);
-#if defined(WORDS_BIGENDIAN)
-	ip_data->sf |= sf_bigendian(1);
-#endif
-
-	return 0;
-
-out:
-	if (priv->mp4.handle)
-		MP4Close(priv->mp4.handle);
-	if (priv->decoder)
-		faacDecClose(priv->decoder);
-	free(priv);
-	return -IP_ERROR_FILE_FORMAT;
-}
-
-static int mp4_close(struct input_plugin_data *ip_data)
-{
-	struct mp4_private *priv;
-
-	priv = ip_data->private;
-
-	if (priv->mp4.handle)
-		MP4Close(priv->mp4.handle);
-
-	if (priv->decoder)
-		faacDecClose(priv->decoder);
-
-	free(priv);
-	ip_data->private = NULL;
-
-	return 0;
-}
-
-/* returns -1 on fatal errors
- * returns -2 on non-fatal errors
- * 0 on eof
- * number of bytes put in 'buffer' on success */
-static int decode_one_frame(struct input_plugin_data *ip_data, void *buffer, int count)
-{
-	struct mp4_private *priv;
-	unsigned char *aac_data = NULL;
-	unsigned int aac_data_len = 0;
-	faacDecFrameInfo frame_info;
-	char *sample_buf;
-	int bytes;
-
-	priv = ip_data->private;
-
-	BUG_ON(priv->overflow_buf_len);
-
-	if (priv->mp4.sample > priv->mp4.num_samples)
-		return 0; /* EOF */
-
-	if (MP4ReadSample(priv->mp4.handle, priv->mp4.track, priv->mp4.sample,
-		&aac_data, &aac_data_len, NULL, NULL, NULL, NULL) == 0) {
-		d_print("error reading mp4 sample %d\n", priv->mp4.sample);
-		errno = EINVAL;
-		return -1;
-	}
-
-	priv->mp4.sample++;
-
-	if (!aac_data) {
-		d_print("aac_data == NULL\n");
-		errno = EINVAL;
-		return -1;
-	}
-
-	sample_buf = faacDecDecode(priv->decoder, &frame_info, aac_data, aac_data_len);
-
-	free(aac_data);
-
-	if (!sample_buf || frame_info.bytesconsumed <= 0) {
-		d_print("fatal error: %s\n", faacDecGetErrorMessage(frame_info.error));
-		errno = EINVAL;
-		return -1;
-	}
-
-	if (frame_info.error != 0) {
-		d_print("frame error: %s\n", faacDecGetErrorMessage(frame_info.error));
-		return -2;
-	}
-
-	if (frame_info.samples <= 0)
-		return -2;
-
-	if (frame_info.channels != priv->channels || frame_info.samplerate != priv->sample_rate) {
-		d_print("invalid channel or sample_rate count\n");
-		return -2;
-	}
-
-	/* 16-bit samples */
-	bytes = frame_info.samples * 2;
-
-	if (bytes > count) {
-		/* decoded too much; keep overflow. */
-		priv->overflow_buf = sample_buf + count;
-		priv->overflow_buf_len = bytes - count;
-		memcpy(buffer, sample_buf, count);
-		return count;
-	} else {
-		memcpy(buffer, sample_buf, bytes);
-	}
-
-	return bytes;
-}
-
-static int mp4_read(struct input_plugin_data *ip_data, char *buffer, int count)
-{
-	struct mp4_private *priv;
-	int rc;
-
-	priv = ip_data->private;
-
-	/* use overflow from previous call (if any) */
-	if (priv->overflow_buf_len > 0) {
-		int len = priv->overflow_buf_len;
-
-		if (len > count)
-			len = count;
-
-		memcpy(buffer, priv->overflow_buf, len);
-		priv->overflow_buf += len;
-		priv->overflow_buf_len -= len;
-
-		return len;
-	}
-
-	do {
-		rc = decode_one_frame(ip_data, buffer, count);
-	} while (rc == -2);
-
-	return rc;
-}
-
-static int mp4_seek(struct input_plugin_data *ip_data, double offset)
-{
-	struct mp4_private *priv;
-	MP4SampleId sample;
-	uint32_t scale;
-
-	priv = ip_data->private;
-
-	scale = MP4GetTrackTimeScale(priv->mp4.handle, priv->mp4.track);
-	if (scale == 0)
-		return -IP_ERROR_INTERNAL;
-
-	sample = MP4GetSampleIdFromTime(priv->mp4.handle, priv->mp4.track,
-		(MP4Timestamp)(offset * (double)scale), 0);
-	if (sample == MP4_INVALID_SAMPLE_ID)
-		return -IP_ERROR_INTERNAL;
-
-	priv->mp4.sample = sample;
-
-	d_print("seeking to sample %d\n", sample);
-
-	return 0;
-}
-
-static int mp4_read_comments(struct input_plugin_data *ip_data,
-		struct keyval **comments)
-{
-	struct mp4_private *priv;
-	uint16_t meta_num, meta_total;
-	uint8_t val;
-	/*uint8_t *ustr;
-	uint32_t size;*/
-	char *str;
-	GROWING_KEYVALS(c);
-
-	priv = ip_data->private;
-
-	/* MP4GetMetadata* provides malloced pointers, and the data
-	 * is in UTF-8 (or at least it should be). */
-	if (MP4GetMetadataArtist(priv->mp4.handle, &str))
-		comments_add(&c, "artist", str);
-	if (MP4GetMetadataAlbum(priv->mp4.handle, &str))
-		comments_add(&c, "album", str);
-	if (MP4GetMetadataName(priv->mp4.handle, &str))
-		comments_add(&c, "title", str);
-	if (MP4GetMetadataGenre(priv->mp4.handle, &str))
-		comments_add(&c, "genre", str);
-	if (MP4GetMetadataYear(priv->mp4.handle, &str))
-		comments_add(&c, "date", str);
-
-	if (MP4GetMetadataCompilation(priv->mp4.handle, &val))
-		comments_add_const(&c, "compilation", val ? "yes" : "no");
-#if 0
-	if (MP4GetBytesProperty(priv->mp4.handle, "moov.udta.meta.ilst.aART.data", &ustr, &size)) {
-		char *xstr;
-
-		/* What's this?
-		 * This is the result from lack of documentation.
-		 * It's supposed to return just a string, but it
-		 * returns an additional 16 bytes of junk at the
-		 * beginning. Could be a bug. Could be intentional.
-		 * Hopefully this works around it:
-		 */
-		if (ustr[0] == 0 && size > 16) {
-			ustr += 16;
-			size -= 16;
-		}
-		xstr = xmalloc(size + 1);
-		memcpy(xstr, ustr, size);
-		xstr[size] = 0;
-		comments_add(&c, "albumartist", xstr);
-		free(xstr);
-	}
-#endif
-	if (MP4GetMetadataTrack(priv->mp4.handle, &meta_num, &meta_total)) {
-		char buf[6];
-		snprintf(buf, 6, "%u", meta_num);
-		comments_add_const(&c, "tracknumber", buf);
-	}
-	if (MP4GetMetadataDisk(priv->mp4.handle, &meta_num, &meta_total)) {
-		char buf[6];
-		snprintf(buf, 6, "%u", meta_num);
-		comments_add_const(&c, "discnumber", buf);
-	}
-
-	comments_terminate(&c);
-	*comments = c.comments;
-	return 0;
-}
-
-static int mp4_duration(struct input_plugin_data *ip_data)
-{
-	struct mp4_private *priv;
-	uint32_t scale;
-	uint64_t duration;
-
-	priv = ip_data->private;
-
-	scale = MP4GetTrackTimeScale(priv->mp4.handle, priv->mp4.track);
-	if (scale == 0)
-		return 0;
-
-	duration = MP4GetTrackDuration(priv->mp4.handle, priv->mp4.track);
-
-	return duration / scale;
-}
-
-const struct input_plugin_ops ip_ops = {
-	.open = mp4_open,
-	.close = mp4_close,
-	.read = mp4_read,
-	.seek = mp4_seek,
-	.read_comments = mp4_read_comments,
-	.duration = mp4_duration
-};
-
-const char * const ip_extensions[] = { "mp4", "m4a", "m4b", NULL };
-const char * const ip_mime_types[] = { /*"audio/mp4", "audio/mp4a-latm",*/ NULL };
 
=== removed file 'mixxx/plugins/soundsourcem4a/m4a/sf.h'
--- mixxx/plugins/soundsourcem4a/m4a/sf.h	2008-12-14 09:12:07 +0000
+++ mixxx/plugins/soundsourcem4a/m4a/sf.h	1970-01-01 00:00:00 +0000
@@ -1,61 +0,0 @@
-/* 
- * Copyright 2004 Timo Hirvonen
- * 
- * 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#ifndef _SF_H
-#define	_SF_H
-
-/*
- *  0     1 big_endian 0-1
- *  1     1 is_signed  0-1
- *  2     1 unused     0
- *  3-5   3 bits >> 3  0-7 (* 8 = 0-56)
- *  6-23 18 rate       0-262143
- * 24-31  8 channels   0-255
- */
-typedef unsigned int sample_format_t;
-
-#define SF_BIGENDIAN_MASK	0x00000001
-#define SF_SIGNED_MASK		0x00000002
-#define SF_BITS_MASK		0x00000038
-#define SF_RATE_MASK		0x00ffffc0
-#define SF_CHANNELS_MASK	0xff000000
-
-#define SF_BIGENDIAN_SHIFT	0
-#define SF_SIGNED_SHIFT		1
-#define SF_BITS_SHIFT		0
-#define SF_RATE_SHIFT		6
-#define SF_CHANNELS_SHIFT	24
-
-#define sf_get_bigendian(sf)	(((sf) & SF_BIGENDIAN_MASK) >> SF_BIGENDIAN_SHIFT)
-#define sf_get_signed(sf)	(((sf) & SF_SIGNED_MASK   ) >> SF_SIGNED_SHIFT)
-#define sf_get_bits(sf)		(((sf) & SF_BITS_MASK     ) >> SF_BITS_SHIFT)
-#define sf_get_rate(sf)		(((sf) & SF_RATE_MASK     ) >> SF_RATE_SHIFT)
-#define sf_get_channels(sf)	(((sf) & SF_CHANNELS_MASK ) >> SF_CHANNELS_SHIFT)
-
-#define sf_bigendian(val)	(((val) << SF_BIGENDIAN_SHIFT) & SF_BIGENDIAN_MASK)
-#define sf_signed(val)		(((val) << SF_SIGNED_SHIFT   ) & SF_SIGNED_MASK)
-#define sf_bits(val)		(((val) << SF_BITS_SHIFT     ) & SF_BITS_MASK)
-#define sf_rate(val)		(((val) << SF_RATE_SHIFT     ) & SF_RATE_MASK)
-#define sf_channels(val)	(((val) << SF_CHANNELS_SHIFT ) & SF_CHANNELS_MASK)
-
-#define sf_get_sample_size(sf)	(sf_get_bits((sf)) >> 3)
-#define sf_get_frame_size(sf)	(sf_get_sample_size((sf)) * sf_get_channels((sf)))
-#define sf_get_second_size(sf)	(sf_get_rate((sf)) * sf_get_frame_size((sf)))
-
-#endif
 
=== modified file 'mixxx/plugins/soundsourcem4a/soundsourcem4a.cpp'
--- mixxx/plugins/soundsourcem4a/soundsourcem4a.cpp	2011-03-31 16:07:22 +0000
+++ mixxx/plugins/soundsourcem4a/soundsourcem4a.cpp	2012-08-25 14:26:19 +0000
@@ -1,9 +1,14 @@
-/***************************************************************************
-                          soundsourcem4a.cpp  -  mp4/m4a decoder
-                             -------------------
-    copyright            : (C) 2008 by Garth Dahlstrom
-    email                : [e-mail]
- ***************************************************************************/
+/* soundsourcem4a.cpp - mp4/m4a decoder
+ *
+ * Author: Neale Pickett <[e-mail]>
+ *
+ * Based on:
+ *    soundsourcem4a.cpp (C) 2008 Garth Dahlstrom <[e-mail]>
+ *    faad 2.7           (C) Ahead Software
+ *
+ *
+ * Both GPLv2.
+ */
 
 /***************************************************************************
  *                                                                         *
@@ -14,14 +19,11 @@
  *                                                                         *
  ***************************************************************************/
 
+#include <stdio.h>
+
 #include <taglib/mp4file.h>
 #include <neaacdec.h>
-
-#ifdef __MP4V2__
-    #include <mp4v2/mp4v2.h>
-#else
-    #include <mp4.h>
-#endif
+#include <mp4ff.h>
 
 #ifdef __WINDOWS__
 #include <io.h>
@@ -30,7 +32,90 @@
 
 #include <QtDebug>
 #include "soundsourcem4a.h"
-#include "m4a/mp4-mixxx.cpp"
+
+
+/* Some things I use for debugging */
+#ifdef NODUMP
+#  define DUMPf(fmt, args...)
+#else
+#  define DUMPf(fmt, args...) fprintf(stderr, "%s:%s:%d " fmt "\n", __FILE__, __FUNCTION__, __LINE__, ##args)
+#endif
+#define DUMP() DUMPf("")
+#define DUMP_d(v) DUMPf("%s = %d", #v, v)
+#define DUMP_x(v) DUMPf("%s = 0x%x", #v, v)
+#define DUMP_s(v) DUMPf("%s = %s", #v, v)
+#define DUMP_c(v) DUMPf("%s = '%c' (0x%02x)", #v, v, v)
+#define DUMP_p(v) DUMPf("%s = %p", #v, v)
+
+static uint32_t
+read_callback(void *user_data, void *buffer, uint32_t length)
+{
+    return fread(buffer, 1, length, (FILE*)user_data);
+}
+        
+static uint32_t
+seek_callback(void *user_data, uint64_t position)
+{
+    return fseek((FILE*)user_data, position, SEEK_SET);
+}
+
+static int
+GetAACTrack(mp4ff_t *infile)
+{
+    /* find AAC track */
+    int i, rc;
+    int numTracks = mp4ff_total_tracks(infile);
+
+    for (i = 0; i < numTracks; i++)
+    {
+        mp4AudioSpecificConfig mp4ASC;
+        unsigned char *buff = NULL;
+        unsigned int buff_size = 0;
+
+        mp4ff_get_decoder_config(infile, i, &buff, &buff_size);
+
+        if (buff)
+        {
+            rc = NeAACDecAudioSpecificConfig(buff, buff_size, &mp4ASC);
+            free(buff);
+
+            if (rc < 0)
+                continue;
+            return i;
+        }
+    }
+
+    /* can't decode this */
+    return -1;
+}
+
+static long 
+read_decode_frame(NeAACDecHandle hDecoder,
+                  mp4ff_t *infile,
+                  unsigned long track,
+                  unsigned long frameno,
+                  char *buf,
+                  size_t buflen)
+{
+    NeAACDecFrameInfo frameInfo;
+    unsigned char frame[8192];
+    size_t framelen;
+
+    /* Read a frame (mp4ff calls it a "sample") of encoded data */
+    framelen = mp4ff_read_sample_v2(infile, track, frameno, frame);
+    if (framelen == 0) {
+        qWarning() << "SoundSourceM4A::read failed!";
+        return -1;
+    }
+
+    /* Decode that into the buffer */
+    NeAACDecDecode2(hDecoder, &frameInfo, frame, framelen, (void **)&buf, buflen);
+    if (frameInfo.bytesconsumed <= 0) {
+        qWarning() << "m4a fatal error:" << faacDecGetErrorMessage(frameInfo.error);
+        return -1;
+    }
+    return frameInfo.samples;
+}
 
 namespace Mixxx {
 
@@ -38,146 +123,247 @@
   : SoundSource(qFileName) {
 
     // Initialize variables to invalid values in case loading fails.
-    mp4file = MP4_INVALID_FILE_HANDLE;
-    filelength = 0;
-    memset(&ipd, 0, sizeof(ipd));
+    stream = NULL;
+    infile = NULL;
+    hDecoder = NULL;
+    frame = NULL;
 }
 
 SoundSourceM4A::~SoundSourceM4A() {
-    if (ipd.filename) {
-        delete [] ipd.filename;
-        ipd.filename = NULL;
-    }
-
-    if (mp4file != MP4_INVALID_FILE_HANDLE) {
-        mp4_close(&ipd);
-        mp4file = MP4_INVALID_FILE_HANDLE;
-    }
+    close();
+}
+
+void
+SoundSourceM4A::close() {
+    if (infile) {
+        mp4ff_close(infile);
+        infile = NULL;
+    }
+    if (stream) {
+        fclose(stream);
+        stream = NULL;
+    }
+    if (hDecoder) {
+        NeAACDecClose(hDecoder);
+        hDecoder = NULL;
+    }
+
+    if (frame) {
+        free(frame);
+        frame = NULL;
+    }
+
+}
+
+int SoundSourceM4A::decoder_init()
+{
+    int passed = 0;
+    unsigned char *buffer = NULL;
+
+    do {
+        unsigned int buffer_size = 0;
+        unsigned long samplerate;
+        unsigned char channels;
+        NeAACDecConfigurationPtr config;
+
+        if (hDecoder) {
+            NeAACDecClose(hDecoder);
+        }
+        hDecoder = NeAACDecOpen();
+
+        config = NeAACDecGetCurrentConfiguration(hDecoder);
+        config->outputFormat = FAAD_FMT_16BIT;
+        config->downMatrix = 1; /* 5.1 -> stereo */
+        config->defObjectType = LC;
+        NeAACDecSetConfiguration(hDecoder, config);
+
+        mp4ff_get_decoder_config(infile, track, &buffer, &buffer_size);
+
+        if (NeAACDecInit2(hDecoder, buffer, buffer_size, &samplerate, &channels) < 0) break;
+
+        // Apparently this prevents dropping the first frame.
+        // http://ac3filter.net/repo/valib/file/37171946becf/valib/parsers/aac/aac_parser.cpp
+
+        m_iSampleRate = samplerate;
+        m_iChannels = channels;
+
+        passed = 1;
+    } while (0);
+
+    if (buffer) {
+        free(buffer);
+    }
+
+    if (passed) {
+        return 0;
+    }
+
+    return -1;
 }
 
 int SoundSourceM4A::open()
 {
-    //Initialize the FAAD2 decoder...
-    initializeDecoder();
-
-    //qDebug() << "SSM4A: channels:" << m_iChannels
-    //         << "filelength:" << filelength
-    //         << "Sample Rate:" << m_iSampleRate;
-    return OK;
-}
-
-int SoundSourceM4A::initializeDecoder()
-{
-    // Copy QString to char[] buffer for mp4_open to read from later
-    QByteArray qbaFileName;
+    int passed = 0;
+    char filename[PATH_MAX];
+
+    {
+        QByteArray qbaFileName;
+        size_t fnlen;
+
 #ifdef Q_OS_WIN32
-    // fopen() doesn't do utf8 on windows
-    qbaFileName = m_qFilename.toLocal8Bit();
+        qbaFileName = m_qFilename.toLocal8Bit(); // fopen() doesn't do utf8 on windows
 #else
-    qbaFileName = m_qFilename.toUtf8();
+        qbaFileName = m_qFilename.toUtf8();
 #endif
-    int bytes = qbaFileName.length() + 1;
-    ipd.filename = new char[bytes];
-    strncpy(ipd.filename, qbaFileName.constData(), bytes);
-    ipd.filename[bytes-1] = '\0';
-    ipd.remote = false; // File is not an stream
-    // The file was loading and failing erratically because
-    // ipd.remote was an in an uninitialized state, it needed to be
-    // set to false.
-
-    int mp4_open_status = mp4_open(&ipd);
-    if (mp4_open_status != 0) {
-        qWarning() << "SSM4A::initializeDecoder failed"
-                 << m_qFilename << " with status:" << mp4_open_status;
+        fnlen = qbaFileName.length() + 1;
+
+        if (fnlen >= sizeof filename) {
+            fnlen = sizeof filename;
+        }
+
+        strncpy(filename, qbaFileName.constData(), fnlen);
+        filename[fnlen-1] = '\0';
+    }
+
+    do {
+
+        stream = fopen(filename, "r");
+        if (! stream) break;
+            
+        mp4cb.read = read_callback;
+        mp4cb.seek = seek_callback;
+        mp4cb.user_data = stream;
+
+        infile = mp4ff_open_read(&mp4cb);
+        if (! infile) break;
+
+        if ((track = GetAACTrack(infile)) < 0) break;
+
+        if (-1 == decoder_init()) break;
+
+        nframes = mp4ff_num_samples(infile, track);
+
+        passed = 1;
+    } while (0);
+
+    // It's okay to pass through mp4ff's approximation of track duration.
+    // This is the only place in this plugin where mixxx can handle an inexact value.
+    audiolen = mp4ff_get_track_duration(infile, track) * 2;
+
+    // I have seen no frame larger than 700 bytes.  Hopefully this is big enough.
+    frame = (unsigned char *)malloc(4096);
+
+    mixxx_pos = 0;
+
+    if (! passed) {
+        close();
+
+        qWarning() << "SoundSourceM4A::open failed";
         return ERR;
     }
 
-    // mp4_open succeeded -> populate variables
-    mp4_private* mp = (struct mp4_private*)ipd.private_ipd;
-    Q_ASSERT(mp);
-    mp4file = mp->mp4.handle;
-    filelength = mp4_total_samples(&ipd);
-    m_iSampleRate = mp->sample_rate;
-    m_iChannels = mp->channels;
-
     return OK;
 }
 
-long SoundSourceM4A::seek(long filepos){
+
+long SoundSourceM4A::seek(long filepos) {
     // Abort if file did not load.
-    if (filelength == 0)
+    if (! infile) {
         return 0;
-
-    //qDebug() << "SSM4A::seek()" << filepos;
-
-    // qDebug() << "MP4SEEK: seek time:" << filepos / (m_iChannels * m_iSampleRate) ;
-
-    int position = mp4_seek_sample(&ipd, filepos);
-    //int position = mp4_seek(&ipd, filepos / (m_iChannels * m_iSampleRate));
-    return position;
+    }
+
+    if (mixxx_pos == filepos) {
+        // Don't reset decoder state
+        return mixxx_pos;
+    }
+
+    if (filepos < 0) {
+        mixxx_pos = 0;
+    } else if (filepos > audiolen) {
+        mixxx_pos = audiolen;
+    } else {
+        mixxx_pos = filepos;
+    }
+
+    decoder_init();
+    {
+        // In my tests, faad needs about 2 frames to establish enough
+        // state that there are no abrupt pops.  So we'll do 4.
+        long f = mp4ff_find_sample(infile, track, mixxx_pos/2, NULL);
+        long g = f - 4;
+
+        if (f == 0) g = 0;
+        NeAACDecPostSeekReset(hDecoder, g);
+
+        for (; g < f; g += 1) {
+            char buf[8192];
+
+            read_decode_frame(hDecoder, infile, track, g, buf, sizeof buf);
+        }
+    }
+
+    return mixxx_pos;
 }
 
-unsigned SoundSourceM4A::read(volatile unsigned long size, const SAMPLE* destination) {
+
+unsigned SoundSourceM4A::read(unsigned long samples_wanted, const SAMPLE *destination) {
+    SAMPLE *dbuf = (SAMPLE *)destination;
+    unsigned int samples_decoded = 0;
+    int32_t toskip;
+    long f;             // Current frame number
+
     // Abort if file did not load.
-    if (filelength == 0)
-        return 0;
-
-    //qDebug() << "SSM4A::read()" << size;
-
-    // We want to read a total of "size" samples, and the mp4_read()
-    // function wants to know how many bytes we want to decode. One
-    // sample is 16-bits = 2 bytes here, so we multiply size by channels to
-    // get the number of bytes we want to decode.
-
-    int total_bytes_to_decode = size * m_iChannels;
-    int total_bytes_decoded = 0;
-    int num_bytes_req = 4096;
-    char* buffer = (char*)destination;
-    SAMPLE * as_buffer = (SAMPLE*) destination; //pointer for mono->stereo filling.
-    do {
-        if (total_bytes_decoded + num_bytes_req > total_bytes_to_decode)
-            num_bytes_req = total_bytes_to_decode - total_bytes_decoded;
-
-        // (char *)&destination[total_bytes_decoded/2],
-        int numRead = mp4_read(&ipd,
-                               buffer,
-                               num_bytes_req);
-        if(numRead <= 0) {
-            //qDebug() << "SSM4A::read: EOF";
-            break;
-        }
-        buffer += numRead;
-        total_bytes_decoded += numRead;
-    } while (total_bytes_decoded < total_bytes_to_decode);
-
-    // At this point *destination should be filled. If mono : double all samples
-    // (L => R)
-    if (m_iChannels == 1) {
-        for (int i = total_bytes_decoded/2-1; i >= 0; --i) {
-            // as_buffer[i] is an audio sample (s16)
-            //scroll through , copying L->R & expanding buffer
-            as_buffer[i*2+1] = as_buffer[i];
-            as_buffer[i*2] = as_buffer[i];
-        }
-    }
-
-    // Tell us about it only if we end up decoding a different value
-    // then what we expect.
-
-    if (total_bytes_decoded % (size * 2)) {
-        qDebug() << "SSM4A::read : total_bytes_decoded:"
-                 << total_bytes_decoded
-                 << "size:"
-                 << size;
-    }
-
-    //There are two bytes in a 16-bit sample, so divide by 2.
-    return total_bytes_decoded / 2;
+    if (! infile) {
+        return 0;
+    }
+
+    // Figure out which frame to start reading
+    f = mp4ff_find_sample(infile, track, mixxx_pos/2, &toskip);
+    if (-1 == f) {
+        // Can't find that sample, probably because mp4ff_get_track_duration
+        // overestimated earlier
+        return 0;
+    }
+
+    // In theory, we could see a tiny speedup by caching the output of
+    // the last-read frame's decode, in case f here is the same as it
+    // was at the end of the last call to this function.
+    //
+    // In practice, this situation never seems to arise.  The complexity
+    // caching introduces into the code isn't worth the diminutive
+    // theoretical performance gain.
+
+    while ((f < nframes) && (samples_decoded < samples_wanted)) {
+        long samples;
+
+        samples = read_decode_frame(hDecoder, infile, track, f, (char *)dbuf, (samples_wanted - samples_decoded)*2);
+
+        /* If we were supposed to skip some samples, shuffle */
+        if (toskip > 0) {
+            // XXX: I have no idea what the unit of toskip is.  I've never seen it non-zero.
+            qDebug() << "Warning: toskip=" << toskip << ", this may sound glitchy!";
+            memmove(dbuf, (char *)dbuf + toskip, (samples - toskip) * 2);
+            toskip = 0;
+        }
+
+        /* Next! */
+        f += 1;
+
+        dbuf += samples;
+        samples_decoded += samples;
+    }
+
+    // Advance where mixxx thinks we are in the file
+    mixxx_pos += samples_decoded;
+
+    return samples_decoded;
 }
 
 inline long unsigned SoundSourceM4A::length(){
-    return filelength;
-    //return m_iChannels * mp4_duration(&ipd) * m_iSampleRate;
+    if (! infile) {
+        return 0;
+    }
+    return audiolen;
 }
 
 int SoundSourceM4A::parseHeader(){
@@ -210,4 +396,5 @@
     return list;
 }
 
+
 }
 
=== modified file 'mixxx/plugins/soundsourcem4a/soundsourcem4a.h'
--- mixxx/plugins/soundsourcem4a/soundsourcem4a.h	2011-10-09 19:05:15 +0000
+++ mixxx/plugins/soundsourcem4a/soundsourcem4a.h	2012-08-25 14:26:19 +0000
@@ -17,17 +17,13 @@
 #ifndef SOUNDSOURCEM4A_H
 #define SOUNDSOURCEM4A_H
 
-#ifdef __MP4V2__
-    #include <mp4v2/mp4v2.h>
-#else
-    #include <mp4.h>
-#endif
+#include <stdio.h>
 
 #include <neaacdec.h>
+#include <mp4ff.h>
 #include <QString>
 #include "soundsource.h"
 #include "defs_version.h"
-#include "m4a/ip.h"
 
 //As per QLibrary docs: http://doc.trolltech.com/4.6/qlibrary.html#resolve
 #ifdef Q_WS_WIN
@@ -43,6 +39,7 @@
         SoundSourceM4A(QString qFileName);
         ~SoundSourceM4A();
         int open();
+        void close();
         long seek(long);
         int initializeDecoder();
         unsigned read(unsigned long size, const SAMPLE*);
@@ -50,10 +47,19 @@
         int parseHeader();
         static QList<QString> supportedFileExtensions();
     private:
-        int trackId;
-        unsigned long filelength;
-        MP4FileHandle mp4file;
-        input_plugin_data ipd;
+        int decoder_init();
+
+        FILE *stream;               // Input stream
+        mp4ff_t *infile;            // Container context object
+        mp4ff_callback_t mp4cb;
+
+        NeAACDecHandle hDecoder;    // AAC context object
+        long nframes;               // Number of frames in container
+        long audiolen;              // Length of track (in samples)
+        long mixxx_pos;             // Where mixxx thinks we are (in samples)
+        int track;
+
+        unsigned char *frame;       // A little buffer space for reading container frames
 };
 
 extern "C" MY_EXPORT const char* getMixxxVersion()