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

[William Good]

Implements MP4/AAC decoding using Media Foundation with MS-provided AAC decoder in Windows 7+, and Vista/Server 2008 with KB2117917.

RJ mentioned merging this into release-1.10 so I'm proposing the merge to that branch. The decoder has tested stable for me, although it doesn't seem particularly fast, unfortunately (this seems to be a deficiency of Media Foundation -- although if anyone spots performance issues in the soundsource, I'd be interested). Build with mediafoundation=1 to enable. Windows SDK 7 is required, although it's installable on Vista.

[William Good (bkgood)]

I missed this last night so I'll reply here:
[00:42] <Pegasus_RPG> just for my own knowledge, what would it take to make it a plugin?
Not much, it's a few build system changes and adding a handful of plugin metadata-providing statics.

[00:48] <Pegasus_RPG> (we could even pack in the Vista platform upgrade and auto-install that if needed)
It's a 5MB update for i386 and 12MB for x86-64, quite large.

Also, reminder to myself:
[00:32] <Pegasus_RPG> ok. Also, can you change the path to the SDK to use a variable? A bunch get set in the build env.
[00:33] <Pegasus_RPG> I'm not sure what they are though
[00:33] <Pegasus_RPG> check setenv.bat
[00:33] <Pegasus_RPG> something like %SDKPATH%
[00:38] <bkgood> Pegasus_RPG: %MSSdk% seems to point in the right direction, is there a more standard one?
[00:38] <bkgood> (that's in my SetEnv.cmd file)
[00:38] <Pegasus_RPG> I don't know. That sounds good

[Sean M. Pappalardo (pegasus-renegadetech)]

Let me first formally say here: thank you for your work on this, Bill!

Yeah, I saw the update sizes after I said that. We can (and should) provide a pop-up box with links to the updates when ppl click on the M4A build/plugin on the downloads page (like we did for PortAudio on Ubuntu 8.04.)

Also, I strongly recommend making this a plugin rather than a separate build for supportability and less confusion. That way, no matter where people get Mixxx, they can just download the plugin (and the OS update if needed) and they're good to go. And we can even ship the plugin with Mixxx (if it's legal to do so and it will just silently not load or do nothing on a system that doesn't have the OS support.)

[lp:~mixxxdevelopers/mixxx/features_m4a_win7]

2846. By William Good on 2011-07-17

Addressed some issues brought up in review; lengthened filename buffer to maximum allowed by Windows (was probably too short previously).

2847. By William Good on 2011-07-20

Use Windows SDK path from environment.

2848. By William Good on 2011-07-20

Clean up description for build a bit

[William Good (bkgood)]

I've pushed a branch (lp:~mixxxdevelopers/mixxx/features_m4a_win7_plugin) with the necessary changes to make this a plugin if that's really want we want to do, and fixed that fixed-path in the build script.

[William Good (bkgood)]

And for my last bit of spam for the moment, soundsource plugins allocate a array of cstrings which are then filled and returned to the caller (SoundSourceProxy), which then owns the memory and must free it; this is how plugins communicate the file name extensions of the respective file types they support. I tried using the plugin I built with my branch with the 1.9 distribution (figured I could post a link to it to mixxx-devel for people to try out) and it's failing because of this malloc/free across dll boundaries (different msvcrt versions linked between mixxx.exe and soundsourcemediafoundation.dll). IMO the plugin API needs to be modified such that it frees its own memory (and stupid stuff like this is why I don't really want to deal with plugins).

[Sean M. Pappalardo (pegasus-renegadetech)]

Yick...well IIRC the whole plugin system was knocked out very quickly by Albert in an effort to get M4A support to users as quickly as possible, so there's probably room for improvement. Mind filing a bug for that?

In the meantime, I can build the plugin for 1.9 since I did the main Mixxx binary. Just let me know.

[William Good (bkgood)]

Hey Sean- yeah, if you wouldn't mind building the plugin to match the 1.9 msvcrt links, I'd appreciate it. I'm thinking we're still a bit out from 1.10 so maybe we could push this on 1.9 (forum and ml I guess) users and see if there are any bugs in the code needing quashed before it gets put in a release.

Thanks!

[Sean M. Pappalardo (pegasus-renegadetech)]

Hrm, Mfreadwrite.lib is not in the Windows 6.0 (Vista) SDK (the one I use for 1.9.x) so I can't build the plugin for 1.9. I guess this will have to wait until 1.10.

Bill: Doesn't Media Foundation allow us to use WMA and other kinds of file types in addition to M4A? If so, how much work would be involved in adding all of them that we don't currently support? What about just WMA/ASF?

We still need an official decision on whether or not to do this as a plugin. So the questions are:
1) Can we legally distribute the MediaFoundation-using binary without cost or restriction?
2) Will a Mixxx binary that has it built-in (as opposed to a plugin) still run fine (just without M4A/WMA support) on systems without the required system libraries, such as Windows 2000 & XP?

If the answer to both is yes, and RJ has no issues, I'd say let's go ahead and merge this for 1.10.

[William Good (bkgood)]

Note to self : look into dynamic load of the mf DLL. I'll reply in full when
I'm not on my phone.
On Oct 4, 2011 8:57 AM, "Sean M. Pappalardo" <email address hidden> wrote:
> Hrm, Mfreadwrite.lib is not in the Windows 6.0 (Vista) SDK (the one I use
for 1.9.x) so I can't build the plugin for 1.9. I guess this will have to
wait until 1.10.
>
> Bill: Doesn't Media Foundation allow us to use WMA and other kinds of file
types in addition to M4A? If so, how much work would be involved in adding
all of them that we don't currently support? What about just WMA/ASF?
>
> We still need an official decision on whether or not to do this as a
plugin. So the questions are:
> 1) Can we legally distribute the MediaFoundation-using binary without cost
or restriction?
> 2) Will a Mixxx binary that has it built-in (as opposed to a plugin) still
run fine (just without M4A/WMA support) on systems without the required
system libraries, such as Windows 2000 & XP?
>
> If the answer to both is yes, and RJ has no issues, I'd say let's go ahead
and merge this for 1.10.
> --
>
https://code.launchpad.net/~mixxxdevelopers/mixxx/features_m4a_win7/+merge/67111
> Your team Mixxx Development Team is requested to review the proposed merge
of lp:~mixxxdevelopers/mixxx/features_m4a_win7 into lp:mixxx/1.10.

[William Good (bkgood)]

> Bill: Doesn't Media Foundation allow us to use WMA and other kinds of file types in addition to M4A? If so, how much work would be involved in adding all of them that we don't currently support? What about just WMA/ASF?

Media Foundation supports: http://msdn.microsoft.com/en-us/library/windows/desktop/dd757927(v=vs.85).aspx. It would have the same minimum requirements as the AAC/m4a functionality because all systems having the necessary SourceReader interface also have the AAC decoder (and vice versa). I don't think the amount of work would be overwhelming but as we don't even have a wishlist bug for wma support I don't know that it's worth the time.

> 1) Can we legally distribute the MediaFoundation-using binary without cost or restriction?

Yes, it's the same situation as the Core Audio SoundSource. We're just calling an OS interface. They've paid for the AAC codec.

> 2) Will a Mixxx binary that has it built-in (as opposed to a plugin) still run fine (just without M4A/WMA support) on systems without the required system libraries, such as Windows 2000 & XP?

In short, no. Vista/2008 without the "Platform Update Supplement" and earlier versions of Windows will fail at run-time linking because they're missing either Media Foundation itself or the SourceReader interface. If a system were to exist with the SourceReader interface but not have the AAC decoder, Mixxx would run and simply fail to decode AAC, although I'm not aware of any situations in which this can occur.

[Sean M. Pappalardo (pegasus-renegadetech)]

Then we have to do this as a plugin since we support Windows 2000 and up. (MANY of our users are on XP.) So maybe void this merge request and submit one on the plugin branch.

review: Needs Resubmitting

[William Good (bkgood)]

Continued at https://code.launchpad.net/~mixxxdevelopers/mixxx/features_m4a_win7_plugin/+merge/78777

review: Disapprove

=== modified file 'mixxx/SConstruct'
--- mixxx/SConstruct	2011-06-13 01:37:30 +0000
+++ mixxx/SConstruct	2011-07-20 02:13:34 +0000
@@ -36,6 +36,7 @@
                       features.MIDIScript,
                       features.Mad,
                       features.CoreAudio,
+                      features.MediaFoundation,
                       features.HSS1394,
                       features.VinylControl,
                       features.Shoutcast,

=== modified file 'mixxx/build/depends.py'
--- mixxx/build/depends.py	2011-07-19 18:12:33 +0000
+++ mixxx/build/depends.py	2011-07-20 02:13:34 +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',
@@ -739,7 +738,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-06-12 20:55:47 +0000
+++ mixxx/build/features.py	2011-07-20 02:13:34 +0000
@@ -104,6 +104,40 @@
         return ['soundsourcecoreaudio.cpp',
                 '#lib/apple/CAStreamBasicDescription.h']
 
+class MediaFoundation(Feature):
+    FLAG = 'mediafoundation'
+    def description(self):
+        return "Media Foundation AAC Decoder"
+    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 Media Foundation AAC decoder support (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
+    def sources(self, build):
+        return ['soundsourcemediafoundation.cpp']
 
 class MIDIScript(Feature):
     def description(self):

=== added file 'mixxx/src/soundsourcemediafoundation.cpp'
--- mixxx/src/soundsourcemediafoundation.cpp	1970-01-01 00:00:00 +0000
+++ mixxx/src/soundsourcemediafoundation.cpp	2011-07-20 02:13:34 +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/src/soundsourcemediafoundation.h'
--- mixxx/src/soundsourcemediafoundation.h	1970-01-01 00:00:00 +0000
+++ mixxx/src/soundsourcemediafoundation.h	2011-07-20 02:13:34 +0000
@@ -0,0 +1,67 @@
+/**
+ * \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 "soundsource.h"
+
+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;
+};
+
+#endif // ifndef SOUNDSOURCEMEDIAFOUNDATION_H

=== modified file 'mixxx/src/soundsourceproxy.cpp'
--- mixxx/src/soundsourceproxy.cpp	2011-03-27 00:50:47 +0000
+++ mixxx/src/soundsourceproxy.cpp	2011-07-20 02:13:34 +0000
@@ -25,6 +25,9 @@
 #ifdef __COREAUDIO__
 #include "soundsourcecoreaudio.h"
 #endif
+#ifdef __MEDIAFOUNDATION__
+#include "soundsourcemediafoundation.h"
+#endif
 #ifdef __SNDFILE__
 #include "soundsourcesndfile.h"
 #endif
@@ -131,6 +134,10 @@
     } else if (SoundSourceCoreAudio::supportedFileExtensions().contains(extension)) {
         return new SoundSourceCoreAudio(qFilename);
 #endif
+#ifdef __MEDIAFOUNDATION__
+    } else if (SoundSourceMediaFoundation::supportedFileExtensions().contains(extension)) {
+        return new SoundSourceMediaFoundation(qFilename);
+#endif
     } else if (m_extensionsSupportedByPlugins.contains(extension)) {
         getSoundSourceFunc getter = m_extensionsSupportedByPlugins.value(extension);
         if (getter)
@@ -333,6 +340,9 @@
 #ifdef __COREAUDIO__
     supportedFileExtensions.append(SoundSourceCoreAudio::supportedFileExtensions());
 #endif
+#ifdef __MEDIAFOUNDATION__
+    supportedFileExtensions.append(SoundSourceMediaFoundation::supportedFileExtensions());
+#endif
     supportedFileExtensions.append(m_extensionsSupportedByPlugins.keys());
 
     return supportedFileExtensions;