diff options
Diffstat (limited to 'src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.cpp')
| -rw-r--r-- | src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.cpp | 38 |
1 files changed, 3 insertions, 35 deletions
diff --git a/src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.cpp b/src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.cpp index 58f143ca3..10cb71e1c 100644 --- a/src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.cpp +++ b/src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.cpp @@ -1,7 +1,7 @@ /*
* $Id$
*
- * (C) 2006-2010 see AUTHORS
+ * (C) 2006-2011 see AUTHORS
*
* This file is part of mplayerc.
*
@@ -1082,7 +1082,7 @@ HRESULT CEVRAllocatorPresenter::GetMediaTypeMerit(IMFMediaType* pType, int* pMer // We only support RGB mixer output surface formats
switch (Format) {
case D3DFMT_A2R10G10B10:
- if (m_bHighColorResolution || m_bForceInputHighColorResolution || m_bFullFloatingPointProcessing) {
+ if (m_bHighColorResolution || m_bForceInputHighColorResolution || m_bHalfFloatingPointProcessing || m_bFullFloatingPointProcessing) {
*pMerit = 950;
} else {
*pMerit = 650;
@@ -1090,15 +1090,6 @@ HRESULT CEVRAllocatorPresenter::GetMediaTypeMerit(IMFMediaType* pType, int* pMer break;
- case D3DFMT_A2B10G10R10:
- if (m_bHighColorResolution || m_bForceInputHighColorResolution || m_bFullFloatingPointProcessing) {
- *pMerit = 900;
- } else {
- *pMerit = 600;
- }
-
- break;
-
case D3DFMT_X8R8G8B8:
if (m_bForceInputHighColorResolution) {
*pMerit = 800;
@@ -1117,23 +1108,6 @@ HRESULT CEVRAllocatorPresenter::GetMediaTypeMerit(IMFMediaType* pType, int* pMer break;
- case D3DFMT_X8B8G8R8:
- if (m_bForceInputHighColorResolution) {
- *pMerit = 700;
- } else {
- *pMerit = 750;
- }
-
- break;
-
- case D3DFMT_A8B8G8R8:
- if (m_bForceInputHighColorResolution) {
- *pMerit = 750;
- } else {
- *pMerit = 700;
- }
- break;
-
default:
// Unsupported format
*pMerit = 0;
@@ -1651,13 +1625,7 @@ STDMETHODIMP CEVRAllocatorPresenter::InitializeDevice(IMFMediaType* pMediaType) }
if (SUCCEEDED(hr)) {
- if (m_bForceInputHighColorResolution)
- // May crash or not work correctly!
- {
- hr = AllocSurfaces(D3DFMT_A2R10G10B10);
- } else {
- hr = AllocSurfaces(Format);
- }
+ hr = AllocSurfaces();
}
if (SUCCEEDED(hr)) {
|