Merge lp:~mixxxdevelopers/mixxx/features_m4a_win7_plugin into lp:mixxx/1.10

[William Good]

Replacing https://code.launchpad.net/~mixxxdevelopers/mixxx/features_m4a_win7/+merge/67111 because the only way to have this functionality built in to Mixxx would be to either a) distribute multiple executables which is a PITA or b) load the necessary COM interfaces dynamically which would be somewhere between a huge PITA and impossible.

I was initially against the plugin thing but with the fixes in lp:~mixxxdevelopers/mixxx/fixes-plugins-mempassing it should be stable for production.

Anyway, so this way we can package a plugin DLL with the normal installers, and if the requisite interfaces/libraries aren't available at runtime, the plugin DLL will simply fail to load and nothing will crash and burn. This plugin is 110% legal to distribute because the AAC patent applies to distributing decoders, not code calling someone else's decoder (like how our binaries with CoreAudio-based m4a decoding are legal to distribute, except on Windows).

Proposed for 1.10 because it works, and m4a decoding was targeted for like 2 major versions ago so it'd be way cool to have in 1.10. It does feel a bit slower than most of our decoders (to me), but that's Media Foundation's fault, as far as I can tell. CachingReader really mitigates the issue for all intents and purposes, though.

[William Good (bkgood)]

I screwed up a merge somewhere on this, I'll sort it out later today.

review: Needs Fixing

[lp:~mixxxdevelopers/mixxx/features_m4a_win7_plugin]

2850. By William Good on 2011-10-11

Merged from lp:~mixxxdevelopers/mixxx/fixes-plugins-mempassing. Updated SoundSourceMediaFoundation to new plugin API.

[RJ Skerry-Ryan (rryan)]

Hey Bill,

What's the status of the branch? Do you think it's stable enough to be in 1.10?

If so, I'd like to figure out how to get it packaged for the beta so we can work out the kinks. It only works for Vista onwards because of the WMF dependency right? We may need Sean's help updating the NSIS to only install the plugin on >=Vista.

[RJ Skerry-Ryan (rryan)]

Also, just to make sure I'm right here -- is the mempassing branch now fully merged into this one or should I also review that branch?

[William Good (bkgood)]

Yeah, I think it's good to go. We really could be sloppy with it and
install it anywhere as if Mixxx can't load the DLL (due to unresolved
symbols) it'll happily continue on. It's also possible that a user
could install Mixxx, and then install the necessary update that gives
Vista the AAC decoder, and they ought not have to reinstall Mixxx if
possible.

On Wed, Oct 19, 2011 at 11:57 AM, RJ Ryan <email address hidden> wrote:
> Hey Bill,
>
> What's the status of the branch? Do you think it's stable enough to be in 1.10?
>
> If so, I'd like to figure out how to get it packaged for the beta so we can work out the kinks. It only works for Vista onwards because of the WMF dependency right? We may need Sean's help updating the NSIS to only install the plugin on >=Vista.
> --
> https://code.launchpad.net/~mixxxdevelopers/mixxx/features_m4a_win7_plugin/+merge/78777
> You proposed lp:~mixxxdevelopers/mixxx/features_m4a_win7_plugin for merging.
>

[William Good (bkgood)]

mempassing hasn't been merged and needs review, it needs to be merged
before this branch is.

On Wed, Oct 19, 2011 at 11:58 AM, RJ Ryan <email address hidden> wrote:
> Also, just to make sure I'm right here -- is the mempassing branch now fully merged into this one or should I also review that branch?
> --
> https://code.launchpad.net/~mixxxdevelopers/mixxx/features_m4a_win7_plugin/+merge/78777
> You proposed lp:~mixxxdevelopers/mixxx/features_m4a_win7_plugin for merging.
>

[RJ Skerry-Ryan (rryan)]

In seek(): If the original setCurrentPosition fails, in other SoundSources I think we generally return the current position (i.e. the current location of the reader) to indicate that the seek failed.

Also, could you define a "const static bool sDebug" at the top of the soundsourcemediafoundation.cpp and then guard all qDebug()'s with that? It could be useful to be able to turn all of those debugs on with a single flag if something needs debugging in the future.

[RJ Skerry-Ryan (rryan)]

It all looks pretty good to me. I didn't delve much into the API and its edge cases since I assume you and Albert both did that. In favor of getting quick feedback I'm merging this in before the 1.10 beta. We'll fix any problems that crop up on the fly. Thanks Bill!

review: Approve

=== modified file 'mixxx/SConstruct'
--- mixxx/SConstruct	2011-10-07 14:33:18 +0000
+++ mixxx/SConstruct	2011-10-11 02:00:31 +0000
@@ -36,6 +36,7 @@
                       features.MIDIScript,
                       features.Mad,
                       features.CoreAudio,
+                      features.MediaFoundation,
                       features.HSS1394,
                       features.VinylControl,
                       features.Shoutcast,
@@ -77,6 +78,7 @@
 # and link properly. This sucks but it's the best way I can find -- bkgood
 VariantDir("plugins/soundsourcem4a", "src", duplicate=0)
 VariantDir("plugins/soundsourcewv", "src", duplicate=0)
+VariantDir("plugins/soundsourcemediafoundation", "src", duplicate=0)
 
 # Build our soundsource plugins
 soundsource_plugins = SConscript(

=== modified file 'mixxx/build/depends.py'
--- mixxx/build/depends.py	2011-10-07 06:02:31 +0000
+++ mixxx/build/depends.py	2011-10-11 02:00:31 +0000
@@ -97,7 +97,6 @@
     def sources(self, build):
         return ['soundsourceflac.cpp',]
 
-
 class Qt(Dependence):
     DEFAULT_QTDIRS = {'linux': '/usr/share/qt4',
                       'bsd': '/usr/local/lib/qt4',
@@ -740,7 +739,7 @@
 
     def depends(self, build):
         return [SoundTouch, KissFFT, ReplayGain, PortAudio, PortMIDI, Qt,
-                FidLib, SndFile, FLAC, OggVorbis, OpenGL, TagLib]
+                FidLib, SndFile, FLAC, OggVorbis, OpenGL, TagLib,]
 
     def post_dependency_check_configure(self, build, conf):
         """Sets up additional things in the Environment that must happen

=== modified file 'mixxx/build/features.py'
--- mixxx/build/features.py	2011-10-07 06:02:31 +0000
+++ mixxx/build/features.py	2011-10-11 02:00:31 +0000
@@ -104,6 +104,38 @@
         return ['soundsourcecoreaudio.cpp',
                 '#lib/apple/CAStreamBasicDescription.h']
 
+class MediaFoundation(Feature):
+    FLAG = 'mediafoundation'
+    def description(self):
+        return "Media Foundation AAC Decoder Plugin"
+    def enabled(self, build):
+        build.flags[self.FLAG] = util.get_flags(build.env, self.FLAG, 0)
+        if int(build.flags[self.FLAG]):
+            return True
+        return False
+    def add_options(self, build, vars):
+        vars.Add(self.FLAG, "Set to 1 to enable the Media Foundation AAC decoder plugin (Windows Vista with KB2117917 or Windows 7 required)", 0)
+    def configure(self, build, conf):
+        if not self.enabled(build):
+            return
+        if not build.platform_is_windows:
+            raise Exception("Media Foundation is only supported on Windows!")
+        # need to look into this, SDK 6 might be ok?
+        try:
+            include_path = os.path.join(os.environ["MSSdk"], "Include")
+        except KeyError:
+            raise Exception("MSSdk environment variable not set, have you run setenv?")
+        build.env.Append(CPPPATH=[include_path])
+        if not conf.CheckLib('Ole32'):
+            raise Exception('Did not find Ole32.lib - exiting!')
+        if not conf.CheckLib(['Mfuuid']):
+            raise Exception('Did not find Mfuuid.lib - exiting!')
+        if not conf.CheckLib(['Mfplat']):
+            raise Exception('Did not find Mfplat.lib - exiting!')
+        if not conf.CheckLib(['Mfreadwrite']): #Only available on Windows 7 and up, or properly updated Vista
+            raise Exception('Did not find Mfreadwrite.lib - exiting!')
+        build.env.Append(CPPDEFINES='__MEDIAFOUNDATION__')
+        return
 
 class MIDIScript(Feature):
     def description(self):

=== modified file 'mixxx/plugins/SConscript'
--- mixxx/plugins/SConscript	2011-10-07 18:45:59 +0000
+++ mixxx/plugins/SConscript	2011-10-11 02:00:31 +0000
@@ -17,4 +17,10 @@
     duplicate=0, exports=['build'])
 plugins.extend(soundsourcewv)
 
+soundsourcemediafoundation = SConscript(
+    File('soundsourcemediafoundation/SConscript'),
+    build_dir=Dir(build.build_dir + "/mediafoundation"),
+    duplicate=0, exports=['build'])
+plugins.extend(soundsourcemediafoundation)
+
 Return("plugins")

=== added directory 'mixxx/plugins/soundsourcemediafoundation'
=== added file 'mixxx/plugins/soundsourcemediafoundation/SConscript'
--- mixxx/plugins/soundsourcemediafoundation/SConscript	1970-01-01 00:00:00 +0000
+++ mixxx/plugins/soundsourcemediafoundation/SConscript	2011-10-11 02:00:31 +0000
@@ -0,0 +1,22 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+import os
+import sys
+import SCons
+import shutil
+
+Import('build')
+
+if int(build.flags['mediafoundation']):
+    env = build.env.Clone()
+    conf = Configure(env)
+    env = conf.Finish()
+    env["LINKFLAGS"].remove("/entry:mainCRTStartup")
+    env["LINKFLAGS"].remove("/subsystem:windows")
+    ssmediafoundation_bin = env.SharedLibrary('soundsourcemediafoundation',
+        ['soundsource.cpp', 'soundsourcemediafoundation.cpp'],
+        LINKCOM  = [env['LINKCOM'],
+            'mt.exe -nologo -manifest ${TARGET}.manifest -outputresource:$TARGET;1'])
+    Return("ssmediafoundation_bin")
+else:
+    Return("")
\ No newline at end of file

=== added file 'mixxx/plugins/soundsourcemediafoundation/soundsourcemediafoundation.cpp'
--- mixxx/plugins/soundsourcemediafoundation/soundsourcemediafoundation.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/plugins/soundsourcemediafoundation/soundsourcemediafoundation.cpp	2011-10-11 02:00:31 +0000
@@ -0,0 +1,551 @@
+/**
+ * \file soundsourcemediafoundation.cpp
+ * \author Bill Good <bkgood at gmail dot com>
+ * \author Albert Santoni <alberts at mixxx dot org>
+ * \date Jan 10, 2011
+ * \note This file uses COM interfaces defined in Windows 7 and later added to
+ * Vista and Server 2008 via the "Platform Update Supplement for Windows Vista
+ * and for Windows Server 2008" (http://support.microsoft.com/kb/2117917).
+ * Earlier versions of Vista (and possibly Server 2008) have some Media
+ * Foundation interfaces but not the required IMFSourceReader, and are missing
+ * the Microsoft-provided AAC decoder. XP does not include Media Foundation.
+ */
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include <QtDebug>
+#include <taglib/mp4file.h>
+#include <windows.h>
+#include <mfapi.h>
+#include <mfidl.h>
+#include <mfreadwrite.h>
+#include <mferror.h>
+#include <propvarutil.h>
+
+#include "soundsourcemediafoundation.h"
+
+const int kBitsPerSample = 16;
+const int kNumChannels = 2;
+const int kSampleRate = 44100;
+const int kLeftoverSize = 4096; // in int16's, this seems to be the size MF AAC
+// decoder likes to give
+
+/** Microsoft examples use this snippet often. */
+template<class T> static void safeRelease(T **ppT)
+{
+    if (*ppT) {
+        (*ppT)->Release();
+        *ppT = NULL;
+    }
+}
+
+SoundSourceMediaFoundation::SoundSourceMediaFoundation(QString filename)
+    : SoundSource(filename)
+    , m_file(filename)
+    , m_pReader(NULL)
+    , m_pAudioType(NULL)
+    , m_wcFilename(NULL)
+    , m_nextFrame(0)
+    , m_leftoverBuffer(NULL)
+    , m_leftoverBufferSize(0)
+    , m_leftoverBufferLength(0)
+    , m_leftoverBufferPosition(0)
+    , m_mfDuration(0)
+    , m_dead(false)
+    , m_seeking(false)
+{
+    // these are always the same, might as well just stick them here
+    // -bkgood
+    m_iChannels = kNumChannels;
+    m_iSampleRate = kSampleRate;
+
+    // http://social.msdn.microsoft.com/Forums/en/netfxbcl/thread/35c6a451-3507-40c8-9d1c-8d4edde7c0cc
+    // gives maximum path + file length as 248 + 260, using that -bkgood
+    m_wcFilename = new wchar_t[248 + 260];
+}
+
+SoundSourceMediaFoundation::~SoundSourceMediaFoundation()
+{
+    delete [] m_wcFilename;
+    delete [] m_leftoverBuffer;
+
+    safeRelease(&m_pReader);
+    safeRelease(&m_pAudioType);
+    MFShutdown();
+    CoUninitialize();
+}
+
+int SoundSourceMediaFoundation::open()
+{
+    QString qurlStr(m_qFilename);
+    int wcFilenameLength(m_qFilename.toWCharArray(m_wcFilename));
+    // toWCharArray does not append a null terminator to the string!
+    m_wcFilename[wcFilenameLength] = '\0';
+
+    HRESULT hr(S_OK);
+    // Initialize the COM library.
+    hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE);
+    if (FAILED(hr)) {
+        qWarning() << "SSMF: failed to initialize COM";
+        return ERR;
+    }
+
+    // Initialize the Media Foundation platform.
+    hr = MFStartup(MF_VERSION);
+    if (FAILED(hr)) {
+        qWarning() << "SSMF: failed to initialize Media Foundation";
+        return ERR;
+    }
+
+    // Create the source reader to read the input file.
+    hr = MFCreateSourceReaderFromURL(m_wcFilename, NULL, &m_pReader);
+    if (FAILED(hr)) {
+        qWarning() << "SSMF: Error opening input file:" << m_qFilename;
+        return ERR;
+    }
+
+    hr = configureAudioStream();
+    if (FAILED(hr)) {
+        qWarning() << "SSMF: Error configuring audio stream.";
+        return ERR;
+    }
+
+    if (!readProperties()) {
+        qWarning() << "SSMF::readProperties failed";
+        return ERR;
+    }
+
+    //Seek to position 0, which forces us to skip over all the header frames.
+    //This makes sure we're ready to just let the Analyser rip and it'll
+    //get the number of samples it expects (ie. no header frames).
+    seek(0);
+
+    return OK;
+}
+
+long SoundSourceMediaFoundation::seek(long filepos)
+{
+    PROPVARIANT prop;
+    HRESULT hr(S_OK);
+    qint64 seekTarget(filepos / kNumChannels);
+    qint64 mfSeekTarget(mfFromFrame(seekTarget) - 1);
+    // minus 1 here seems to make our seeking work properly, otherwise we will
+    // (more often than not, maybe always) seek a bit too far (although not
+    // enough for our calculatedFrameFromMF <= nextFrame assertion in ::read).
+    // Has something to do with 100ns MF units being much smaller than most
+    // frame offsets (in seconds) -bkgood
+
+    if (m_dead) {
+        return filepos;
+    }
+
+    // this doesn't fail, see MS's implementation
+    hr = InitPropVariantFromInt64(mfSeekTarget < 0 ? 0 : mfSeekTarget, &prop);
+
+    // http://msdn.microsoft.com/en-us/library/dd374668(v=VS.85).aspx
+    hr = m_pReader->SetCurrentPosition(GUID_NULL, prop);
+    if (FAILED(hr)) {
+        // nothing we can do here as we can't fail (no facility to other than
+        // crashing mixxx)
+        qWarning() << "SSMF: failed to seek" << (
+            hr == MF_E_INVALIDREQUEST ? "Sample requests still pending" : "");
+    } else {
+        hr = m_pReader->Flush(MF_SOURCE_READER_FIRST_AUDIO_STREAM);
+        if (FAILED(hr)) {
+            qWarning() << "SSMF: failed to flush after seek";
+        }
+    }
+    PropVariantClear(&prop);
+
+    // record the next frame so that we can make sure we're there the next
+    // time we get a buffer from MFSourceReader
+    m_nextFrame = seekTarget;
+    m_seeking = true;
+
+    return filepos;
+}
+
+unsigned int SoundSourceMediaFoundation::read(unsigned long size,
+    const SAMPLE *destination)
+{
+    SAMPLE *destBuffer(const_cast<SAMPLE*>(destination));
+    size_t framesRequested(size / kNumChannels);
+    size_t framesNeeded(framesRequested);
+
+    // first, copy frames from leftover buffer IF the leftover buffer is at
+    // the correct frame
+    if (m_leftoverBufferLength > 0 && m_leftoverBufferPosition == m_nextFrame) {
+        copyFrames(destBuffer, &framesNeeded, m_leftoverBuffer,
+            m_leftoverBufferLength);
+        if (m_leftoverBufferLength > 0) {
+            Q_ASSERT(framesNeeded == 0); // make sure CopyFrames worked
+            m_leftoverBufferPosition += framesRequested;
+        }
+    } else {
+        // leftoverBuffer already empty or in the wrong position, clear it
+        m_leftoverBufferLength = 0;
+    }
+
+    while (!m_dead && framesNeeded > 0) {
+        HRESULT hr(S_OK);
+        DWORD dwFlags(0);
+        qint64 timestamp(0);
+        IMFSample *pSample(NULL);
+        bool error(false); // set to true to break after releasing
+
+        hr = m_pReader->ReadSample(
+            MF_SOURCE_READER_FIRST_AUDIO_STREAM, // [in] DWORD dwStreamIndex,
+            0,                                   // [in] DWORD dwControlFlags,
+            NULL,                                // [out] DWORD *pdwActualStreamIndex,
+            &dwFlags,                            // [out] DWORD *pdwStreamFlags,
+            &timestamp,                          // [out] LONGLONG *pllTimestamp,
+            &pSample);                           // [out] IMFSample **ppSample
+        if (FAILED(hr)) break;
+        if (dwFlags & MF_SOURCE_READERF_ERROR) {
+            // our source reader is now dead, according to the docs
+            qWarning() << "SSMF: ReadSample set ERROR, SourceReader is now dead";
+            m_dead = true;
+            break;
+        } else if (dwFlags & MF_SOURCE_READERF_ENDOFSTREAM) {
+            qDebug() << "SSMF: End of input file.";
+            break;
+        } else if (dwFlags & MF_SOURCE_READERF_CURRENTMEDIATYPECHANGED) {
+            qWarning() << "SSMF: Type change";
+            break;
+        } else if (pSample == NULL) {
+            // generally this will happen when dwFlags contains ENDOFSTREAM,
+            // so it'll be caught before now -bkgood
+            qWarning() << "SSMF: No sample";
+            continue;
+        } // we now own a ref to the instance at pSample
+
+        IMFMediaBuffer *pMBuffer(NULL);
+        // I know this does at least a memcopy and maybe a malloc, if we have
+        // xrun issues with this we might want to look into using
+        // IMFSample::GetBufferByIndex (although MS doesn't recommend this)
+        if (FAILED(hr = pSample->ConvertToContiguousBuffer(&pMBuffer))) {
+            error = true;
+            goto releaseSample;
+        }
+        qint16 *buffer(NULL);
+        size_t bufferLength(0);
+        hr = pMBuffer->Lock(reinterpret_cast<quint8**>(&buffer), NULL,
+            reinterpret_cast<DWORD*>(&bufferLength));
+        if (FAILED(hr)) {
+            error = true;
+            goto releaseMBuffer;
+        }
+        bufferLength /= (kBitsPerSample / 8 * kNumChannels); // now in frames
+
+        if (m_seeking) {
+            qint64 bufferPosition(frameFromMF(timestamp));
+            Q_ASSERT(m_nextFrame >= bufferPosition); // we can never go
+            // backwards here in ::read, so if the seek didn't manage to take
+            // us far back it's important to fail
+            if (m_nextFrame == bufferPosition) {
+                m_seeking = false;
+            } else if (m_nextFrame < bufferPosition + bufferLength) {
+                // nextFrame is in this buffer
+                buffer += (m_nextFrame - bufferPosition) * kNumChannels;
+                bufferLength -= m_nextFrame - bufferPosition;
+                m_seeking = false;
+            } else { // we need to keep going forward
+                goto releaseRawBuffer;
+            }
+        }
+
+        Q_ASSERT(bufferLength * kNumChannels <= m_leftoverBufferSize);
+        copyFrames(destBuffer + (size - framesNeeded * kNumChannels),
+            &framesNeeded, buffer, bufferLength);
+
+releaseRawBuffer:
+        hr = pMBuffer->Unlock();
+        // I'm ignoring this, MSDN for IMFMediaBuffer::Unlock stipulates
+        // nothing about the state of the instance if this fails so might as
+        // well just let it be released.
+        //if (FAILED(hr)) break;
+releaseMBuffer:
+        safeRelease(&pMBuffer);
+releaseSample:
+        safeRelease(&pSample);
+        if (error) break;
+    }
+
+    m_nextFrame += framesRequested - framesNeeded;
+    if (m_leftoverBufferLength > 0) {
+        Q_ASSERT(framesNeeded == 0); // make sure CopyFrames worked
+        m_leftoverBufferPosition = m_nextFrame;
+    }
+    return size - framesNeeded * kNumChannels;
+}
+
+inline unsigned long SoundSourceMediaFoundation::length()
+{
+    unsigned long len(secondsFromMF(m_mfDuration) * kSampleRate * kNumChannels);
+    return len % kNumChannels == 0 ? len : len + 1;
+}
+
+int SoundSourceMediaFoundation::parseHeader()
+{
+    setType("m4a");
+
+    TagLib::MP4::File f(getFilename().toLocal8Bit().constData());
+    bool result = processTaglibFile(f);
+    TagLib::MP4::Tag* tag = f.tag();
+
+    if (tag) {
+        processMP4Tag(tag);
+    }
+
+    if (result)
+        return OK;
+    return ERR;
+}
+
+
+// static
+QList<QString> SoundSourceMediaFoundation::supportedFileExtensions()
+{
+    QList<QString> list;
+    list.push_back("m4a");
+    list.push_back("mp4");
+    return list;
+}
+
+
+//-------------------------------------------------------------------
+// configureAudioStream
+//
+// Selects an audio stream from the source file, and configures the
+// stream to deliver decoded PCM audio.
+//-------------------------------------------------------------------
+
+/** Cobbled together from:
+    http://msdn.microsoft.com/en-us/library/dd757929(v=vs.85).aspx
+    and http://msdn.microsoft.com/en-us/library/dd317928(VS.85).aspx
+    -- Albert
+    If anything in here fails, just bail. I'm not going to decode HRESULTS.
+    -- Bill
+    */
+bool SoundSourceMediaFoundation::configureAudioStream()
+{
+    HRESULT hr(S_OK);
+
+    // deselect all streams, we only want the first
+    hr = m_pReader->SetStreamSelection(MF_SOURCE_READER_ALL_STREAMS, false);
+    if (FAILED(hr)) {
+        qWarning() << "SSMF: failed to deselect all streams";
+        return false;
+    }
+
+    hr = m_pReader->SetStreamSelection(MF_SOURCE_READER_FIRST_AUDIO_STREAM, true);
+    if (FAILED(hr)) {
+        qWarning() << "SSMF: failed to select first audio stream";
+        return false;
+    }
+
+    hr = MFCreateMediaType(&m_pAudioType);
+    if (FAILED(hr)) {
+        qWarning() << "SSMF: failed to create media type";
+        return false;
+    }
+
+    hr = m_pAudioType->SetGUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio);
+    if (FAILED(hr)) {
+        qWarning() << "SSMF: failed to set major type";
+        return false;
+    }
+
+    hr = m_pAudioType->SetGUID(MF_MT_SUBTYPE, MFAudioFormat_PCM);
+    if (FAILED(hr)) {
+        qWarning() << "SSMF: failed to set subtype";
+        return false;
+    }
+
+    hr = m_pAudioType->SetUINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, true);
+    if (FAILED(hr)) {
+        qWarning() << "SSMF: failed to set samples independent";
+        return false;
+    }
+
+    hr = m_pAudioType->SetUINT32(MF_MT_FIXED_SIZE_SAMPLES, true);
+    if (FAILED(hr)) {
+        qWarning() << "SSMF: failed to set fixed size samples";
+        return false;
+    }
+
+    hr = m_pAudioType->SetUINT32(MF_MT_SAMPLE_SIZE, kLeftoverSize);
+    if (FAILED(hr)) {
+        qWarning() << "SSMF: failed to set sample size";
+        return false;
+    }
+
+    // MSDN for this attribute says that if bps is 8, samples are unsigned.
+    // Otherwise, they're signed (so they're signed for us as 16 bps). Why
+    // chose to hide this rather useful tidbit here is beyond me -bkgood
+    hr = m_pAudioType->SetUINT32(MF_MT_AUDIO_BITS_PER_SAMPLE, kBitsPerSample);
+    if (FAILED(hr)) {
+        qWarning() << "SSMF: failed to set bits per sample";
+        return false;
+    }
+
+    hr = m_pAudioType->SetUINT32(MF_MT_AUDIO_BLOCK_ALIGNMENT,
+        kNumChannels * (kBitsPerSample / 8));
+    if (FAILED(hr)) {
+        qWarning() << "SSMF: failed to set block alignment";
+        return false;
+    }
+
+    hr = m_pAudioType->SetUINT32(MF_MT_AUDIO_NUM_CHANNELS, kNumChannels);
+    if (FAILED(hr)) {
+        qWarning() << "SSMF: failed to set number of channels";
+        return false;
+    }
+
+    hr = m_pAudioType->SetUINT32(MF_MT_AUDIO_SAMPLES_PER_SECOND, kSampleRate);
+    if (FAILED(hr)) {
+        qWarning() << "SSMF: failed to set sample rate";
+        return false;
+    }
+
+    // Set this type on the source reader. The source reader will
+    // load the necessary decoder.
+    hr = m_pReader->SetCurrentMediaType(
+        MF_SOURCE_READER_FIRST_AUDIO_STREAM,
+        NULL, m_pAudioType);
+
+    // the reader has the media type now, free our reference so we can use our
+    // pointer for other purposes. Do this before checking for failure so we
+    // don't dangle.
+    safeRelease(&m_pAudioType);
+    if (FAILED(hr)) {
+        qWarning() << "SSMF: failed to set media type";
+        return false;
+    }
+
+    // Get the complete uncompressed format.
+    hr = m_pReader->GetCurrentMediaType(
+        MF_SOURCE_READER_FIRST_AUDIO_STREAM,
+        &m_pAudioType);
+    if (FAILED(hr)) {
+        qWarning() << "SSMF: failed to retrieve completed media type";
+        return false;
+    }
+
+    // Ensure the stream is selected.
+    hr = m_pReader->SetStreamSelection(
+        MF_SOURCE_READER_FIRST_AUDIO_STREAM,
+        true);
+    if (FAILED(hr)) {
+        qWarning() << "SSMF: failed to select first audio stream (again)";
+        return false;
+    }
+
+    // this may not be safe on all platforms as m_leftoverBufferSize is a
+    // size_t and this function is writing a uint32. However, on 32-bit
+    // Windows 7, size_t is defined as uint which is 32-bits, so we're safe
+    // for all supported platforms -bkgood
+    hr = m_pAudioType->GetUINT32(MF_MT_SAMPLE_SIZE, &m_leftoverBufferSize);
+    if (FAILED(hr)) {
+        qWarning() << "SSMF: failed to get buffer size";
+        return false;
+    }
+    m_leftoverBufferSize /= 2; // convert size in bytes to size in int16s
+    m_leftoverBuffer = new qint16[m_leftoverBufferSize];
+
+    return true;
+}
+
+bool SoundSourceMediaFoundation::readProperties()
+{
+    PROPVARIANT prop;
+    HRESULT hr = S_OK;
+
+    //Get the duration, provided as a 64-bit integer of 100-nanosecond units
+    hr = m_pReader->GetPresentationAttribute(MF_SOURCE_READER_MEDIASOURCE,
+        MF_PD_DURATION, &prop);
+    if (FAILED(hr)) {
+        qWarning() << "SSMF: error getting duration";
+        return false;
+    }
+    // QuadPart isn't available on compilers that don't support _int64. Visual
+    // Studio 6.0 introduced the type in 1998, so I think we're safe here
+    // -bkgood
+    m_iDuration = secondsFromMF(prop.hVal.QuadPart);
+    m_mfDuration = prop.hVal.QuadPart;
+    qDebug() << "SSMF: Duration:" << m_iDuration;
+    PropVariantClear(&prop);
+
+    // presentation attribute MF_PD_AUDIO_ENCODING_BITRATE only exists for
+    // presentation descriptors, one of which MFSourceReader is not.
+    // Therefore, we calculate it ourselves.
+    m_iBitrate = kBitsPerSample * kSampleRate * kNumChannels;
+
+    return true;
+}
+
+/**
+ * Copies min(destFrames, srcFrames) frames to dest from src. Anything leftover
+ * is moved to the beginning of m_leftoverBuffer, so empty it first (possibly
+ * with this method). If src and dest overlap, I'll hurt you.
+ */
+void SoundSourceMediaFoundation::copyFrames(
+    qint16 *dest, size_t *destFrames, const qint16 *src, size_t srcFrames)
+{
+    if (srcFrames > *destFrames) {
+        int samplesToCopy(*destFrames * kNumChannels);
+        memcpy(dest, src, samplesToCopy * sizeof(*src));
+        srcFrames -= *destFrames;
+        memmove(m_leftoverBuffer,
+            src + samplesToCopy,
+            srcFrames * kNumChannels * sizeof(*src));
+        *destFrames = 0;
+        m_leftoverBufferLength = srcFrames;
+    } else {
+        int samplesToCopy(srcFrames * kNumChannels);
+        memcpy(dest, src, samplesToCopy * sizeof(*src));
+        *destFrames -= srcFrames;
+        if (src == m_leftoverBuffer) {
+            m_leftoverBufferLength = 0;
+        }
+    }
+}
+
+/**
+ * Convert a 100ns Media Foundation value to a number of seconds.
+ */
+inline qreal SoundSourceMediaFoundation::secondsFromMF(qint64 mf)
+{
+    return static_cast<qreal>(mf) / 1e7;
+}
+
+/**
+ * Convert a number of seconds to a 100ns Media Foundation value.
+ */
+inline qint64 SoundSourceMediaFoundation::mfFromSeconds(qreal sec)
+{
+    return sec * 1e7;
+}
+
+/**
+ * Convert a 100ns Media Foundation value to a frame offset.
+ */
+inline qint64 SoundSourceMediaFoundation::frameFromMF(qint64 mf)
+{
+    return static_cast<qreal>(mf) * kSampleRate / 1e7;
+}
+
+/**
+ * Convert a frame offset to a 100ns Media Foundation value.
+ */
+inline qint64 SoundSourceMediaFoundation::mfFromFrame(qint64 frame)
+{
+    return static_cast<qreal>(frame) / kSampleRate * 1e7;
+}
\ No newline at end of file

=== added file 'mixxx/plugins/soundsourcemediafoundation/soundsourcemediafoundation.h'
--- mixxx/plugins/soundsourcemediafoundation/soundsourcemediafoundation.h	1970-01-01 00:00:00 +0000
+++ mixxx/plugins/soundsourcemediafoundation/soundsourcemediafoundation.h	2011-10-11 02:00:31 +0000
@@ -0,0 +1,111 @@
+/**
+ * \file soundsourcemediafoundation.h
+ * \class SoundSourceMediaFoundation
+ * \brief Decodes MPEG4/AAC audio using the SourceReader interface of the
+ * Media Foundation framework included in Windows 7.
+ * \author Bill Good <bkgood at gmail dot com>
+ * \author Albert Santoni <alberts at mixxx dot org>
+ * \date Jan 10, 2011
+ */
+
+/***************************************************************************
+ *                                                                         *
+ *   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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef SOUNDSOURCEMEDIAFOUNDATION_H
+#define SOUNDSOURCEMEDIAFOUNDATION_H
+
+#include <QFile>
+#include <QString>
+
+#include "defs.h"
+#include "defs_version.h"
+#include "soundsource.h"
+
+#ifdef Q_WS_WIN
+#define MY_EXPORT __declspec(dllexport)
+#else
+#define MY_EXPORT
+#endif
+
+class IMFSourceReader;
+class IMFMediaType;
+class IMFMediaSource;
+
+class SoundSourceMediaFoundation : public Mixxx::SoundSource {
+public:
+    SoundSourceMediaFoundation(QString filename);
+    ~SoundSourceMediaFoundation();
+    int open();
+    long seek(long filepos);
+    unsigned read(unsigned long size, const SAMPLE *buffer);
+    inline long unsigned length();
+    int parseHeader();
+    static QList<QString> supportedFileExtensions();
+
+private:
+    bool configureAudioStream();
+    bool readProperties();
+    void copyFrames(qint16 *dest, size_t *destFrames, const qint16 *src,
+        size_t srcFrames);
+    static inline qreal secondsFromMF(qint64 mf);
+    static inline qint64 mfFromSeconds(qreal sec);
+    static inline qint64 frameFromMF(qint64 mf);
+    static inline qint64 mfFromFrame(qint64 frame);
+    QFile m_file;
+    IMFSourceReader *m_pReader;
+    IMFMediaType *m_pAudioType;
+    wchar_t *m_wcFilename;
+    int m_nextFrame;
+    qint16 *m_leftoverBuffer;
+    size_t m_leftoverBufferSize;
+    size_t m_leftoverBufferLength;
+    int m_leftoverBufferPosition;
+    qint64 m_mfDuration;
+    bool m_dead;
+    bool m_seeking;
+};
+
+extern "C" MY_EXPORT const char* getMixxxVersion()
+{
+    return VERSION;
+}
+
+extern "C" MY_EXPORT int getSoundSourceAPIVersion()
+{
+    return MIXXX_SOUNDSOURCE_API_VERSION;
+}
+
+extern "C" MY_EXPORT Mixxx::SoundSource* getSoundSource(QString filename)
+{
+    return new SoundSourceMediaFoundation(filename);
+}
+
+extern "C" MY_EXPORT char** supportedFileExtensions()
+{
+    QList<QString> exts = SoundSourceMediaFoundation::supportedFileExtensions();
+    //Convert to C string array.
+    char** c_exts = (char**)malloc((exts.count() + 1) * sizeof(char*));
+    for (int i = 0; i < exts.count(); i++)
+    {
+        QByteArray qba = exts[i].toUtf8();
+        c_exts[i] = strdup(qba.constData());
+        qDebug() << c_exts[i];
+    }
+    c_exts[exts.count()] = NULL; //NULL terminate the list
+
+    return c_exts;
+}
+
+extern "C" MY_EXPORT void freeFileExtensions(char **exts)
+{
+    for (int i(0); exts[i]; ++i) free(exts[i]);
+    free(exts);
+}
+
+#endif // ifndef SOUNDSOURCEMEDIAFOUNDATION_H