Remove the old wmv9 dmo decoder in favor of using the MFT decoder everywhere

The primary reason for the DMO was Windows XP, any newer Windows
supports the MFT interface.

7 files changed, 3 insertions, 719 deletions

diff --git a/decoder/LAVVideo/DecodeManager.cpp b/decoder/LAVVideo/DecodeManager.cpp
index 1178742e..fcebdb4e 100644
--- a/decoder/LAVVideo/DecodeManager.cpp
+++ b/decoder/LAVVideo/DecodeManager.cpp
@@ -111,10 +111,7 @@ softwaredec:
     DbgLog((LOG_TRACE, 10, L"-> No HW Codec, using Software"));
     m_bHWDecoder = FALSE;
     if (m_pLAVVideo->GetUseMSWMV9Decoder() && (codec == AV_CODEC_ID_VC1 || codec == AV_CODEC_ID_WMV3) && !m_bWMV9Failed) {
-      if (IsWindows7OrNewer())
-        m_pDecoder = CreateDecoderWMV9MFT();
-      else
-        m_pDecoder = CreateDecoderWMV9();
+      m_pDecoder = CreateDecoderWMV9MFT();
       bWMV9 = TRUE;
     } else if (codec == AV_CODEC_ID_H264_MVC) {
       m_pDecoder = CreateDecoderMSDKMVC();
@@ -144,7 +141,7 @@ done:
       goto softwaredec;
     }
     if (bWMV9) {
-      DbgLog((LOG_TRACE, 10, L"-> WMV9 DMO decoder failed, trying avcodec instead..."));
+      DbgLog((LOG_TRACE, 10, L"-> WMV9 MFT decoder failed, trying avcodec instead..."));
       m_bWMV9Failed = TRUE;
       bWMV9 = FALSE;
       goto softwaredec;
diff --git a/decoder/LAVVideo/LAVVideo.rc b/decoder/LAVVideo/LAVVideo.rc
index 3313ea29..4c94d117 100644
--- a/decoder/LAVVideo/LAVVideo.rc
+++ b/decoder/LAVVideo/LAVVideo.rc
@@ -155,7 +155,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x0
 BEGIN
     LTEXT           "Select which formats LAV Video should decode:",IDC_LBL_FORMATS,8,10,378,10
     CONTROL         "",IDC_CODECS,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,20,387,193
-    CONTROL         "Use Microsoft WMV9 DMO decoder for WMV3 and VC-1",IDC_CODECS_MSWMVDMO,
+    CONTROL         "Use Microsoft WMV9 MFT decoder for WMV3 and VC-1",IDC_CODECS_MSWMVDMO,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,230,352,10
     CONTROL         "Enable DVD Video support",IDC_DVD_VIDEO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,217,313,10
 END
diff --git a/decoder/LAVVideo/LAVVideo.vcxproj b/decoder/LAVVideo/LAVVideo.vcxproj
index 0c35a3b9..aad07241 100644
--- a/decoder/LAVVideo/LAVVideo.vcxproj
+++ b/decoder/LAVVideo/LAVVideo.vcxproj
@@ -110,7 +110,6 @@
     <ClCompile Include="decoders\msdk_mvc.cpp" />
     <ClCompile Include="decoders\pixfmt.cpp" />
     <ClCompile Include="decoders\quicksync.cpp" />
-    <ClCompile Include="decoders\wmv9.cpp" />
     <ClCompile Include="decoders\wmv9mft.cpp" />
     <ClCompile Include="DecodeManager.cpp" />
     <ClCompile Include="dllmain.cpp" />
@@ -160,7 +159,6 @@
     <ClInclude Include="decoders\ILAVDecoder.h" />
     <ClInclude Include="decoders\msdk_mvc.h" />
     <ClInclude Include="decoders\quicksync.h" />
-    <ClInclude Include="decoders\wmv9.h" />
     <ClInclude Include="decoders\wmv9mft.h" />
     <ClInclude Include="DecodeManager.h" />
     <ClInclude Include="LAVPixFmtConverter.h" />
diff --git a/decoder/LAVVideo/LAVVideo.vcxproj.filters b/decoder/LAVVideo/LAVVideo.vcxproj.filters
index a334d4f0..d1b59655 100644
--- a/decoder/LAVVideo/LAVVideo.vcxproj.filters
+++ b/decoder/LAVVideo/LAVVideo.vcxproj.filters
@@ -126,9 +126,6 @@
     <ClCompile Include="decoders\dxva2\DXVA2SurfaceAllocator.cpp">
       <Filter>Source Files\decoders\dxva2</Filter>
     </ClCompile>
-    <ClCompile Include="decoders\wmv9.cpp">
-      <Filter>Source Files\decoders</Filter>
-    </ClCompile>
     <ClCompile Include="subtitles\LAVSubtitleProvider.cpp">
       <Filter>Source Files\subtitles</Filter>
     </ClCompile>
@@ -242,9 +239,6 @@
     <ClInclude Include="decoders\dxva2\DXVA2SurfaceAllocator.h">
       <Filter>Header Files\decoders\dxva2</Filter>
     </ClInclude>
-    <ClInclude Include="decoders\wmv9.h">
-      <Filter>Header Files\decoders</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\common\includes\SubRenderIntf.h">
       <Filter>Header Files\subtitles</Filter>
     </ClInclude>
diff --git a/decoder/LAVVideo/decoders/ILAVDecoder.h b/decoder/LAVVideo/decoders/ILAVDecoder.h
index 17f36c67..ef2499c2 100644
--- a/decoder/LAVVideo/decoders/ILAVDecoder.h
+++ b/decoder/LAVVideo/decoders/ILAVDecoder.h
@@ -432,7 +432,6 @@ interface ILAVDecoder
  * They are listed here so that including their header files is not required
  */
 ILAVDecoder *CreateDecoderAVCodec();
-ILAVDecoder *CreateDecoderWMV9();
 ILAVDecoder *CreateDecoderWMV9MFT();
 ILAVDecoder *CreateDecoderCUVID();
 ILAVDecoder *CreateDecoderQuickSync();
diff --git a/decoder/LAVVideo/decoders/wmv9.cpp b/decoder/LAVVideo/decoders/wmv9.cpp
deleted file mode 100644
index e4dba4b5..00000000
--- a/decoder/LAVVideo/decoders/wmv9.cpp
+++ /dev/null
@@ -1,616 +0,0 @@
-/*
- *      Copyright (C) 2010-2017 Hendrik Leppkes
- *      http://www.1f0.de
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "stdafx.h"
-#include "wmv9.h"
-
-#include <wmsdk.h>
-#include <wmcodecdsp.h>
-
-#include "parsers/VC1HeaderParser.h"
-#include "registry.h"
-
-EXTERN_GUID(CLSID_CWMVDecMediaObject,
-    0x82d353df, 0x90bd, 0x4382, 0x8b, 0xc2, 0x3f, 0x61, 0x92, 0xb7, 0x6e, 0x34);
-
-////////////////////////////////////////////////////////////////////////////////
-// Constructor
-////////////////////////////////////////////////////////////////////////////////
-
-ILAVDecoder *CreateDecoderWMV9() {
-  return new CDecWMV9();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// WMV9 IMediaBuffer implementation
-////////////////////////////////////////////////////////////////////////////////
-
-class CMediaBuffer : public IMediaBuffer, public INSSBuffer3
-{
-public:
-  CMediaBuffer(BYTE *pData, DWORD dwLength, bool bNSSBuffer) : m_cRef(1), m_bNSSBuffer(bNSSBuffer), m_pData(pData), m_dwLength(dwLength), m_dwMaxLength(dwLength), m_ContentType(0) {}
-  virtual ~CMediaBuffer() {}
-
-  // IUnknown
-  HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void **ppvObject)
-  {
-    if (riid == IID_IUnknown) {
-      AddRef();
-      *ppvObject = this;
-    } else if (riid == IID_IMediaBuffer) {
-      AddRef();
-      *ppvObject = (IMediaBuffer *)this;
-    } else if (riid == IID_INSSBuffer3 && m_bNSSBuffer) {
-      AddRef();
-      *ppvObject = (INSSBuffer3 *)this;
-    } else {
-      return E_NOINTERFACE;
-    }
-    return S_OK;
-  }
-  ULONG STDMETHODCALLTYPE AddRef() { LONG lRef = InterlockedIncrement( &m_cRef ); return max(ULONG(lRef),1ul); }
-  ULONG STDMETHODCALLTYPE Release() { LONG lRef = InterlockedDecrement( &m_cRef ); if (lRef == 0) { m_cRef++; delete this; return 0; } return max(ULONG(lRef),1ul); }
-
-  // IMediaBuffer
-  HRESULT STDMETHODCALLTYPE SetLength(DWORD cbLength) { if (cbLength <= m_dwMaxLength) { m_dwLength = cbLength; return S_OK; } return E_INVALIDARG; }
-  HRESULT STDMETHODCALLTYPE GetMaxLength(DWORD *pcbMaxLength) { CheckPointer(pcbMaxLength, E_POINTER); *pcbMaxLength = m_dwMaxLength; return S_OK; }
-  HRESULT STDMETHODCALLTYPE GetBufferAndLength(BYTE **ppBuffer, DWORD *pcbLength) { if (ppBuffer) *ppBuffer = m_pData; if (pcbLength) *pcbLength = m_dwLength; return S_OK; }
-
-  // INSSBuffer3
-  HRESULT STDMETHODCALLTYPE GetLength(DWORD *pdwLength) { CheckPointer(pdwLength, E_POINTER); *pdwLength = m_dwLength; return S_OK; }
-  HRESULT STDMETHODCALLTYPE GetBuffer(BYTE **ppdwBuffer) { CheckPointer(ppdwBuffer, E_POINTER); *ppdwBuffer = m_pData; return S_OK; }
-  HRESULT STDMETHODCALLTYPE GetSampleProperties(DWORD cbProperties, BYTE *pbProperties) { return E_NOTIMPL; }
-  HRESULT STDMETHODCALLTYPE SetSampleProperties(DWORD cbProperties, BYTE *pbProperties) { return E_NOTIMPL; }
-  HRESULT STDMETHODCALLTYPE SetProperty(GUID guidBufferProperty, void *pvBufferProperty, DWORD dwBufferPropertySize)
-  {
-    CheckPointer(pvBufferProperty, E_INVALIDARG);
-    if (dwBufferPropertySize == 0)
-      return E_INVALIDARG;
-
-    if (guidBufferProperty == WM_SampleExtensionGUID_ContentType) {
-      m_ContentType = *(uint8_t *)pvBufferProperty;
-    }
-    return S_OK;
-  }
-
-  HRESULT STDMETHODCALLTYPE GetProperty(GUID guidBufferProperty, void *pvBufferProperty, DWORD *pdwBufferPropertySize)
-  {
-    CheckPointer(pdwBufferPropertySize, E_POINTER);
-    if (guidBufferProperty == WM_SampleExtensionGUID_ContentType) {
-      DWORD dwReqSize = WM_SampleExtension_ContentType_Size;
-      if (pvBufferProperty != nullptr && *pdwBufferPropertySize >= dwReqSize)
-        *((uint8_t*)pvBufferProperty) = m_ContentType;
-
-      *pdwBufferPropertySize = dwReqSize;
-      return S_OK;
-    }
-    return NS_E_UNSUPPORTED_PROPERTY;
-  }
-
-protected:
-  HRESULT SetBuffer(BYTE *pData, DWORD dwLen) { m_pData = pData; m_dwLength = m_dwMaxLength = dwLen; return S_OK; }
-private:
-  ULONG m_cRef;
-  bool  m_bNSSBuffer;
-  BYTE *m_pData;
-  DWORD m_dwLength;
-  DWORD m_dwMaxLength;
-
-  struct _prop {
-    void *pPropValue;
-    DWORD dwPropSize;
-  };
-
-  uint8_t m_ContentType;
-};
-
-class CMediaBufferDecode : public CMediaBuffer
-{
-public:
-  CMediaBufferDecode(const BYTE *pData, DWORD dwLength) 
-    : CMediaBuffer(nullptr, 0, false)
-  {
-    m_pBuffer = (BYTE *)av_malloc(dwLength + FF_INPUT_BUFFER_PADDING_SIZE);
-    memcpy(m_pBuffer, pData, dwLength);
-    SetBuffer(m_pBuffer, dwLength);
-  }
-
-  ~CMediaBufferDecode() {
-    av_freep(&m_pBuffer);
-  }
-
-private:
-  BYTE *m_pBuffer;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// WMV9 decoder implementation
-////////////////////////////////////////////////////////////////////////////////
-
-CDecWMV9::CDecWMV9(void)
-  : CDecBase()
-{
-}
-
-CDecWMV9::~CDecWMV9(void)
-{
-  DestroyDecoder(true);
-}
-
-STDMETHODIMP CDecWMV9::DestroyDecoder(bool bFull)
-{
-  SAFE_DELETE(m_vc1Header);
-  {
-    CAutoLock lock(&m_BufferCritSec);
-    for (auto it = m_BufferQueue.begin(); it != m_BufferQueue.end(); it++) {
-      av_free((*it)->buffer);
-      delete (*it);
-    }
-    m_BufferQueue.clear();
-  }
-  m_pRawBufferSize = 0;
-  if (bFull) {
-    SafeRelease(&m_pDMO);
-  }
-  return S_OK;
-}
-
-BYTE *CDecWMV9::GetBuffer(size_t size)
-{
-  CAutoLock lock(&m_BufferCritSec);
-
-  Buffer *buffer = nullptr;
-  for (auto it = m_BufferQueue.begin(); it != m_BufferQueue.end(); it++) {
-    if (!(*it)->used) {
-      buffer = *it;
-      break;
-    }
-  }
-  if (buffer) {
-    // Validate Size
-    if (buffer->size < size) {
-      av_freep(&buffer->buffer);
-      buffer->buffer = (BYTE *)av_malloc(size + FF_INPUT_BUFFER_PADDING_SIZE);
-      buffer->size = size;
-    }
-  } else {
-    // Create a new buffer
-    DbgLog((LOG_TRACE, 10, L"Allocating new buffer for WMV9"));
-    buffer = new Buffer();
-    buffer->buffer = (BYTE *)av_malloc(size + FF_INPUT_BUFFER_PADDING_SIZE);
-    buffer->size = size;
-    m_BufferQueue.push_back(buffer);
-  }
-  buffer->used = 1;
-  return buffer->buffer;
-}
-
-void CDecWMV9::ReleaseBuffer(BYTE *buffer)
-{
-  CAutoLock lock(&m_BufferCritSec);
-  Buffer *b = nullptr;
-  for (auto it = m_BufferQueue.begin(); it != m_BufferQueue.end(); it++) {
-    if ((*it)->buffer == buffer) {
-      b = *it;
-      break;
-    }
-  }
-  ASSERT(b);
-  b->used = 0;
-}
-
-// ILAVDecoder
-STDMETHODIMP CDecWMV9::Init()
-{
-  DbgLog((LOG_TRACE, 10, L"CDecWMV9::Init(): Trying to open WMV9 DMO decoder"));
-  HRESULT hr = S_OK;
-
-  // Disable deinterlacing setting in the registry
-  // Apparently required on XP
-  CreateRegistryKey(HKEY_CURRENT_USER, L"Software\\Microsoft\\Scrunch");
-  CRegistry reg = CRegistry(HKEY_CURRENT_USER, L"Software\\Microsoft\\Scrunch", hr);
-  if (SUCCEEDED(hr)) {
-    reg.ReadDWORD(L"Deinterlace.old", hr);
-    if (FAILED(hr)) {
-      DWORD dwValue = reg.ReadDWORD(L"Deinterlace", hr);
-      if (FAILED(hr))
-        dwValue = 0;
-      reg.WriteDWORD(L"Deinterlace.old", dwValue);
-      reg.WriteDWORD(L"Deinterlace", 0);
-    }
-  }
-
-  hr = CoCreateInstance(CLSID_CWMVDecMediaObject, nullptr, CLSCTX_INPROC_SERVER, IID_IMediaObject, (void **)&m_pDMO);
-  if (FAILED(hr)) {
-    DbgLog((LOG_TRACE, 10, L"-> Failed to create DMO object"));
-    return hr;
-  }
-
-  // Force decoder deinterlacing to off
-  IPropertyBag *pProp = nullptr;
-  hr = m_pDMO->QueryInterface(&pProp);
-  if (SUCCEEDED(hr)) {
-    VARIANT var = {0};
-    var.vt = VT_BOOL;
-    var.boolVal = FALSE;
-    pProp->Write(g_wszWMVCDecoderDeinterlacing, &var);
-    SafeRelease(&pProp);
-  }
-
-  return S_OK;
-}
-
-static GUID VerifySubtype(AVCodecID codec, GUID subtype)
-{
-  if (codec == AV_CODEC_ID_WMV3) {
-    return MEDIASUBTYPE_WMV3;
-  } else {
-    if ( subtype == MEDIASUBTYPE_WVC1
-      || subtype == MEDIASUBTYPE_wvc1
-      || subtype == MEDIASUBTYPE_WMVA
-      || subtype == MEDIASUBTYPE_wmva) {
-        return subtype;
-    }
-    return MEDIASUBTYPE_WVC1;
-  }
-}
-
-STDMETHODIMP CDecWMV9::InitDecoder(AVCodecID codec, const CMediaType *pmt)
-{
-  HRESULT hr = S_OK;
-  DbgLog((LOG_TRACE, 10, L"CDecWMV9::InitDecoder(): Initializing WMV9 DMO decoder"));
-
-  DestroyDecoder(false);
-
-  BITMAPINFOHEADER *pBMI = nullptr;
-  REFERENCE_TIME rtAvg = 0;
-  DWORD dwARX = 0, dwARY = 0;
-  videoFormatTypeHandler(*pmt, &pBMI, &rtAvg, &dwARX, &dwARY);
-  
-  size_t extralen = 0;
-  BYTE *extra = nullptr;
-  getExtraData(*pmt, nullptr, &extralen);
-  if (extralen > 0) {
-    extra = (BYTE *)av_mallocz(extralen + FF_INPUT_BUFFER_PADDING_SIZE);
-    getExtraData(*pmt, extra, &extralen);
-  }
-
-  if (codec == AV_CODEC_ID_VC1 && extralen) {
-    size_t i = 0;
-    for (i = 0; i < (extralen - 4); i++) {
-      uint32_t code = AV_RB32(extra+i);
-      if ((code & ~0xFF) == 0x00000100)
-        break;
-    }
-    if (i == 0) {
-      memmove(extra+1, extra, extralen);
-      *extra = 0;
-      extralen++;
-    } else if (i > 1) {
-      DbgLog((LOG_TRACE, 10, L"-> VC-1 Header at position %u (should be 0 or 1)", i));
-    }
-  }
-
-  /* Create input type */
-
-  GUID subtype = VerifySubtype(codec, pmt->subtype);
-  m_nCodecId = codec;
-
-  mtIn.SetType(&MEDIATYPE_Video);
-  mtIn.SetSubtype(&subtype);
-  mtIn.SetFormatType(&FORMAT_VideoInfo);
-  mtIn.SetTemporalCompression(TRUE);
-  mtIn.SetSampleSize(0);
-  mtIn.SetVariableSize();
-  
-  VIDEOINFOHEADER *vih = (VIDEOINFOHEADER *)mtIn.AllocFormatBuffer((ULONG)(sizeof(VIDEOINFOHEADER) + extralen));
-  memset(vih, 0, sizeof(VIDEOINFOHEADER));
-  vih->bmiHeader.biWidth       = pBMI->biWidth;
-  vih->bmiHeader.biHeight      = pBMI->biHeight;
-  vih->bmiHeader.biPlanes      = 1;
-  vih->bmiHeader.biBitCount    = 24;
-  vih->bmiHeader.biSizeImage   = pBMI->biWidth * pBMI->biHeight * 3 / 2;
-  vih->bmiHeader.biSize        = (DWORD)(sizeof(BITMAPINFOHEADER) + extralen);
-  vih->bmiHeader.biCompression = subtype.Data1;
-  vih->AvgTimePerFrame = rtAvg;
-  SetRect(&vih->rcSource, 0, 0, pBMI->biWidth, pBMI->biHeight);
-  vih->rcTarget = vih->rcSource;
-  
-  if (extralen > 0) {
-    memcpy((BYTE *)vih + sizeof(VIDEOINFOHEADER), extra, extralen);
-    av_freep(&extra);
-    extra = (BYTE *)vih + sizeof(VIDEOINFOHEADER);
-  }
-
-  hr = m_pDMO->SetInputType(0, &mtIn, 0);
-  if (FAILED(hr)) {
-    DbgLog((LOG_TRACE, 10, L"-> Failed to set input type on DMO"));
-    return hr;
-  }
-
-  /* Create output type */
-  int idx = 0;
-  while(SUCCEEDED(hr = m_pDMO->GetOutputType(0, idx++, &mtOut))) {
-    if (mtOut.subtype == MEDIASUBTYPE_NV12) {
-      hr = m_pDMO->SetOutputType(0, &mtOut, 0);
-      m_OutPixFmt = LAVPixFmt_NV12;
-      break;
-    } else if (mtOut.subtype == MEDIASUBTYPE_YV12) {
-      hr = m_pDMO->SetOutputType(0, &mtOut, 0);
-      m_OutPixFmt = LAVPixFmt_YUV420;
-      break;
-    }
-  }
-
-  if (FAILED(hr)) {
-    DbgLog((LOG_TRACE, 10, L"-> Failed to set output type on DMO"));
-    return hr;
-  }
-
-  videoFormatTypeHandler(mtOut, &pBMI);
-  m_pRawBufferSize = pBMI->biSizeImage + FF_INPUT_BUFFER_PADDING_SIZE;
-
-  m_bInterlaced = FALSE;
-  memset(&m_StreamAR, 0, sizeof(m_StreamAR));
-  if (extralen > 0) {
-    m_vc1Header = new CVC1HeaderParser(extra, extralen, codec);
-    if (m_vc1Header->hdr.valid) {
-      m_bInterlaced = m_vc1Header->hdr.interlaced;
-      m_StreamAR = m_vc1Header->hdr.ar;
-    }
-  }
-
-  m_bManualReorder = (codec == AV_CODEC_ID_VC1) && !(m_pCallback->GetDecodeFlags() & LAV_VIDEO_DEC_FLAG_ONLY_DTS);
-
-  return S_OK;
-}
-
-STDMETHODIMP CDecWMV9::Decode(const BYTE *buffer, int buflen, REFERENCE_TIME rtStart, REFERENCE_TIME rtStop, BOOL bSyncPoint, BOOL bDiscontinuity, IMediaSample *pSample)
-{
-  HRESULT hr = S_OK;
-  DWORD dwStatus = 0;
-
-  hr = m_pDMO->GetInputStatus(0, &dwStatus);
-  if (FAILED(hr)) {
-    DbgLog((LOG_TRACE, 10, L"-> GetInputStatus() failed with hr: 0x%x", hr));
-    return S_FALSE;
-  }
-  if (!(dwStatus & DMO_INPUT_STATUSF_ACCEPT_DATA))
-    return S_FALSE;
-  
-  DWORD dwFlags = 0;
-  if (bSyncPoint)
-    dwFlags |= DMO_INPUT_DATA_BUFFERF_SYNCPOINT;
-  if (rtStart != AV_NOPTS_VALUE)
-    dwFlags |= DMO_INPUT_DATA_BUFFERF_TIME;
-  if (rtStop != AV_NOPTS_VALUE)
-    dwFlags |= DMO_INPUT_DATA_BUFFERF_TIMELENGTH;
-
-  if (m_vc1Header && (m_bManualReorder || m_bNeedKeyFrame)) {
-    AVPictureType pictype = m_vc1Header->ParseVC1PictureType(buffer, buflen);
-    if (m_bManualReorder) {
-      if (pictype == AV_PICTURE_TYPE_I || pictype == AV_PICTURE_TYPE_P) {
-        if (m_bReorderBufferValid)
-          m_timestampQueue.push(m_rtReorderBuffer);
-        m_rtReorderBuffer = rtStart;
-        m_bReorderBufferValid = TRUE;
-      } else {
-        m_timestampQueue.push(rtStart);
-      }
-    }
-
-    if (m_bNeedKeyFrame) {
-      if (pictype != AV_PICTURE_TYPE_I) {
-        if (m_bManualReorder)
-          m_timestampQueue.pop();
-        return S_OK;
-      } else {
-        m_bNeedKeyFrame = FALSE;
-        dwFlags |= DMO_INPUT_DATA_BUFFERF_SYNCPOINT;
-      }
-    }
-  }
-
-  CMediaBuffer *pInBuffer = new CMediaBufferDecode(buffer, buflen);
-  hr = m_pDMO->ProcessInput(0, pInBuffer, dwFlags, rtStart, rtStop - rtStart);
-  SafeRelease(&pInBuffer);
-
-  if (FAILED(hr)) {
-    DbgLog((LOG_TRACE, 10, L"-> ProcessInput failed with hr: 0x%x", hr));
-    return E_FAIL;
-  }
-  if (S_FALSE == hr)
-    return S_FALSE;
-
-  return ProcessOutput();
-}
-
-static void memcpy_plane(BYTE *dst, const BYTE *src, ptrdiff_t width, ptrdiff_t stride, int height)
-{
-  for (int i = 0; i < height; i++) {
-    memcpy(dst, src, width);
-    dst += stride;
-    src += width;
-  }
-}
-
-void CDecWMV9::wmv9_buffer_destruct(LAVFrame *pFrame)
-{
-  CDecWMV9 *pDec = (CDecWMV9 *)pFrame->priv_data;
-  pDec->ReleaseBuffer(pFrame->data[0]);
-}
-
-STDMETHODIMP CDecWMV9::ProcessOutput()
-{
-  HRESULT hr = S_OK;
-  DWORD dwStatus = 0;
-
-  BYTE *pBuffer = GetBuffer(m_pRawBufferSize);
-  CMediaBuffer *pOutBuffer = new CMediaBuffer(pBuffer, m_pRawBufferSize, true);
-  pOutBuffer->SetLength(0);
-
-  DMO_OUTPUT_DATA_BUFFER OutputBufferStructs[1];
-  memset(&OutputBufferStructs[0], 0, sizeof(DMO_OUTPUT_DATA_BUFFER));
-  OutputBufferStructs[0].pBuffer  = pOutBuffer;
-
-  hr = m_pDMO->ProcessOutput(0, 1, OutputBufferStructs, &dwStatus);
-  if (FAILED(hr)) {
-    ReleaseBuffer(pBuffer);
-    DbgLog((LOG_TRACE, 10, L"-> ProcessOutput failed with hr: %x", hr));
-    return S_FALSE;
-  }
-  if (hr == S_FALSE) {
-    ReleaseBuffer(pBuffer);
-    return S_FALSE;
-  }
-
-  LAVFrame *pFrame = nullptr;
-  AllocateFrame(&pFrame);
-
-  BITMAPINFOHEADER *pBMI = nullptr;
-  videoFormatTypeHandler(mtOut, &pBMI);
-  pFrame->width     = pBMI->biWidth;
-  pFrame->height    = pBMI->biHeight;
-  pFrame->format    = m_OutPixFmt;
-  pFrame->key_frame = (OutputBufferStructs[0].dwStatus & DMO_OUTPUT_DATA_BUFFERF_SYNCPOINT);
-
-  AVRational display_aspect_ratio;
-  int64_t num = (int64_t)m_StreamAR.num * pBMI->biWidth;
-  int64_t den = (int64_t)m_StreamAR.den * pBMI->biHeight;
-  av_reduce(&display_aspect_ratio.num, &display_aspect_ratio.den, num, den, INT_MAX);
-
-  BYTE contentType = 0;
-  DWORD dwPropSize = 1;
-  pOutBuffer->GetProperty(WM_SampleExtensionGUID_ContentType, &contentType, &dwPropSize);
-  pFrame->interlaced = !!(contentType & WM_CT_INTERLACED);
-  pFrame->repeat     = !!(contentType & WM_CT_REPEAT_FIRST_FIELD);
-
-  LAVDeintFieldOrder fo = m_pSettings->GetDeintFieldOrder();
-  pFrame->tff           = (fo == DeintFieldOrder_Auto) ? !!(contentType & WM_CT_TOP_FIELD_FIRST) : (fo == DeintFieldOrder_TopFieldFirst);
-
-  if (pFrame->interlaced && !m_bInterlaced)
-    m_bInterlaced = TRUE;
-
-  pFrame->interlaced = (pFrame->interlaced || (m_bInterlaced && m_pSettings->GetDeinterlacingMode() == DeintMode_Aggressive) || m_pSettings->GetDeinterlacingMode() == DeintMode_Force) && !(m_pSettings->GetDeinterlacingMode() == DeintMode_Disable);
-
-  if (m_bManualReorder) {
-    if (!m_timestampQueue.empty()) {
-      pFrame->rtStart = m_timestampQueue.front();
-      m_timestampQueue.pop();
-      if (OutputBufferStructs[0].dwStatus & DMO_OUTPUT_DATA_BUFFERF_TIMELENGTH) {
-        pFrame->rtStop = pFrame->rtStart + OutputBufferStructs[0].rtTimelength;
-      }
-    }
-  } else {
-    if (OutputBufferStructs[0].dwStatus & DMO_OUTPUT_DATA_BUFFERF_TIME) {
-      pFrame->rtStart = OutputBufferStructs[0].rtTimestamp;
-      if (OutputBufferStructs[0].dwStatus & DMO_OUTPUT_DATA_BUFFERF_TIMELENGTH) {
-        pFrame->rtStop = pFrame->rtStart + OutputBufferStructs[0].rtTimelength;
-      }
-    }
-  }
-
-  // Check alignment
-  // If not properly aligned, we need to make the data aligned.
-  int alignment = (m_OutPixFmt == LAVPixFmt_NV12) ? 16 : 32;
-  if ((pFrame->width % alignment) != 0) {
-    hr = AllocLAVFrameBuffers(pFrame);
-    if (FAILED(hr)) {
-      ReleaseBuffer(pBuffer);
-      SafeRelease(&pOutBuffer);
-      return hr;
-    }
-
-    size_t ySize = pFrame->width * pFrame->height;
-    memcpy_plane(pFrame->data[0], pBuffer, pFrame->width, pFrame->stride[0], pFrame->height);
-    if (m_OutPixFmt == LAVPixFmt_NV12) {
-      memcpy_plane(pFrame->data[1], pBuffer+ySize, pFrame->width, pFrame->stride[1], pFrame->height / 2);
-    } else if (m_OutPixFmt == LAVPixFmt_YUV420) {
-      size_t uvSize = ySize / 4;
-      memcpy_plane(pFrame->data[2], pBuffer+ySize, pFrame->width / 2, pFrame->stride[2], pFrame->height / 2);
-      memcpy_plane(pFrame->data[1], pBuffer+ySize+uvSize, pFrame->width / 2, pFrame->stride[1], pFrame->height / 2);
-    }
-    ReleaseBuffer(pBuffer);
-  } else {
-    if (m_OutPixFmt == LAVPixFmt_NV12) {
-      pFrame->data[0] = pBuffer;
-      pFrame->data[1] = pBuffer + pFrame->width * pFrame->height;
-      pFrame->stride[0] = pFrame->stride[1] = pFrame->width;
-    } else if (m_OutPixFmt == LAVPixFmt_YUV420) {
-      pFrame->data[0] = pBuffer;
-      pFrame->data[2] = pBuffer + pFrame->width * pFrame->height;
-      pFrame->data[1] = pFrame->data[2] + (pFrame->width / 2) * (pFrame->height / 2);
-      pFrame->stride[0] = pFrame->width;
-      pFrame->stride[1] = pFrame->stride[2] = pFrame->width / 2;
-    }
-    pFrame->destruct = wmv9_buffer_destruct;
-    pFrame->priv_data = this;
-  }
-  pFrame->flags |= LAV_FRAME_FLAG_BUFFER_MODIFY;
-  Deliver(pFrame);
-
-  SafeRelease(&pOutBuffer);
-
-  if (OutputBufferStructs[0].dwStatus & DMO_OUTPUT_DATA_BUFFERF_INCOMPLETE)
-    return ProcessOutput();
-  return hr;
-}
-
-STDMETHODIMP CDecWMV9::Flush()
-{
-  DbgLog((LOG_TRACE, 10, L"CDecWMV9::Flush(): Flushing WMV9 decoder"));
-  m_pDMO->Flush();
-
-  std::queue<REFERENCE_TIME>().swap(m_timestampQueue);
-  m_rtReorderBuffer = AV_NOPTS_VALUE;
-  m_bReorderBufferValid = FALSE;
-  m_bNeedKeyFrame = TRUE;
-
-  return __super::Flush();
-}
-
-STDMETHODIMP CDecWMV9::EndOfStream()
-{
-  if (m_bReorderBufferValid)
-    m_timestampQueue.push(m_rtReorderBuffer);
-  m_bReorderBufferValid = FALSE;
-  m_rtReorderBuffer = AV_NOPTS_VALUE;
-  m_pDMO->Discontinuity(0);
-  ProcessOutput();
-  return S_OK;
-}
-
-STDMETHODIMP CDecWMV9::GetPixelFormat(LAVPixelFormat *pPix, int *pBpp)
-{
-  if (pPix)
-    *pPix = (m_OutPixFmt != LAVPixFmt_None) ? m_OutPixFmt : LAVPixFmt_NV12;
-  if (pBpp)
-    *pBpp = 8;
-  return S_OK;
-}
-
-STDMETHODIMP_(REFERENCE_TIME) CDecWMV9::GetFrameDuration()
-{
-  return 0;
-}
-
-STDMETHODIMP_(BOOL) CDecWMV9::IsInterlaced(BOOL bAllowGuess)
-{
-  return (m_bInterlaced || m_pSettings->GetDeinterlacingMode() == DeintMode_Force);
-}
diff --git a/decoder/LAVVideo/decoders/wmv9.h b/decoder/LAVVideo/decoders/wmv9.h
deleted file mode 100644
index 4ea97718..00000000
--- a/decoder/LAVVideo/decoders/wmv9.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- *      Copyright (C) 2010-2017 Hendrik Leppkes
- *      http://www.1f0.de
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#pragma once
-#include "DecBase.h"
-
-#include <dmo.h>
-
-#include <vector>
-#include <queue>
-
-class CVC1HeaderParser;
-
-class CDecWMV9 : public CDecBase
-{
-  typedef struct _Buffer {
-    BYTE *buffer = nullptr;
-    size_t size  = 0;
-    bool used    = false;
-  } Buffer;
-
-public:
-  CDecWMV9(void);
-  virtual ~CDecWMV9(void);
-
-  // ILAVDecoder
-  STDMETHODIMP InitDecoder(AVCodecID codec, const CMediaType *pmt);
-  STDMETHODIMP Decode(const BYTE *buffer, int buflen, REFERENCE_TIME rtStart, REFERENCE_TIME rtStop, BOOL bSyncPoint, BOOL bDiscontinuity, IMediaSample *pSample);
-  STDMETHODIMP Flush();
-  STDMETHODIMP EndOfStream();
-  STDMETHODIMP GetPixelFormat(LAVPixelFormat *pPix, int *pBpp);
-  STDMETHODIMP_(REFERENCE_TIME) GetFrameDuration();
-  STDMETHODIMP_(BOOL) IsInterlaced(BOOL bAllowGuess);
-  STDMETHODIMP_(const WCHAR*) GetDecoderName() { return L"wmv9 dmo"; }
-  STDMETHODIMP HasThreadSafeBuffers() { return S_OK; }
-
-  // CDecBase
-  STDMETHODIMP Init();
-
-private:
-  STDMETHODIMP DestroyDecoder(bool bFull);
-  STDMETHODIMP ProcessOutput();
-
-  static void wmv9_buffer_destruct(LAVFrame *pFrame);
-
-  BYTE *GetBuffer(size_t size);
-  void ReleaseBuffer(BYTE *buffer);
-
-private:
-  IMediaObject *m_pDMO = nullptr;
-  CMediaType mtIn;
-  CMediaType mtOut;
-
-  DWORD m_pRawBufferSize = 0;
-
-  BOOL m_bInterlaced     = TRUE;
-  AVRational m_StreamAR = AVRational{0, 0};
-
-  LAVPixelFormat m_OutPixFmt = LAVPixFmt_None;
-  AVCodecID m_nCodecId       = AV_CODEC_ID_NONE;
-
-  CCritSec m_BufferCritSec;
-  std::vector<Buffer *> m_BufferQueue;
-
-  BOOL m_bNeedKeyFrame             = FALSE;
-  BOOL m_bManualReorder            = FALSE;
-  BOOL m_bReorderBufferValid       = FALSE;
-  REFERENCE_TIME m_rtReorderBuffer = AV_NOPTS_VALUE;
-  std::queue<REFERENCE_TIME> m_timestampQueue;
-
-  CVC1HeaderParser *m_vc1Header = nullptr;
-};