mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 09:25:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Media Foundation-based code refactoring.

Browse Source 
I* + SafeRelease -> ComPtr.
This commit is contained in:
Alexander Smorkalov 2013-05-15 06:09:03 -07:00
parent e94cc0b5ee
commit 0c9d776083
1 changed files with 86 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

191
modules/highgui/src/cap_msmf.cpp
View File

@ -53,7 +53,7 @@
#include <Mfapi.h> #include <Mfapi.h>
#include <mfplay.h> #include <mfplay.h>
#include <mfobjects.h> #include <mfobjects.h>
#include "Strsafe.h" #include <strsafe.h>
#include <wrl/client.h> #include <wrl/client.h>
#include <Mfreadwrite.h> #include <Mfreadwrite.h>
#include <new> #include <new>
@ -72,6 +72,8 @@
#pragma comment(lib, "Mfreadwrite") #pragma comment(lib, "Mfreadwrite")
#pragma comment(lib, "MinCore_Downlevel") #pragma comment(lib, "MinCore_Downlevel")
using namespace Microsoft::WRL;
struct IMFMediaType; struct IMFMediaType;
struct IMFActivate; struct IMFActivate;
struct IMFMediaSource; struct IMFMediaSource;
@ -894,12 +896,12 @@ ImageGrabber::~ImageGrabber(void)
HRESULT ImageGrabber::initImageGrabber(IMFMediaSource *pSource, GUID VideoFormat) HRESULT ImageGrabber::initImageGrabber(IMFMediaSource *pSource, GUID VideoFormat)
{ {
IMFActivate *pSinkActivate = NULL; ComPtr<IMFActivate> pSinkActivate = NULL;
IMFMediaType *pType = NULL; ComPtr<IMFMediaType> pType = NULL;
IMFPresentationDescriptor *pPD = NULL; ComPtr<IMFPresentationDescriptor> pPD = NULL;
IMFStreamDescriptor *pSD = NULL; ComPtr<IMFStreamDescriptor> pSD = NULL;
IMFMediaTypeHandler *pHandler = NULL; ComPtr<IMFMediaTypeHandler> pHandler = NULL;
IMFMediaType *pCurrentType = NULL; ComPtr<IMFMediaType> pCurrentType = NULL;
HRESULT hr = S_OK; HRESULT hr = S_OK;
MediaType MT; MediaType MT;
// Clean up. // Clean up.
@ -940,13 +942,9 @@ HRESULT ImageGrabber::initImageGrabber(IMFMediaSource *pSource, GUID VideoFormat
printf("Error GetCurrentMediaType()\n"); printf("Error GetCurrentMediaType()\n");
goto err; goto err;
} }
MT = FormatReader::Read(pCurrentType); MT = FormatReader::Read(pCurrentType.Get());
} }
err: err:
SafeRelease(&pPD);
SafeRelease(&pSD);
SafeRelease(&pHandler);
SafeRelease(&pCurrentType);
unsigned int sizeRawImage = 0; unsigned int sizeRawImage = 0;
if(VideoFormat == MFVideoFormat_RGB24) if(VideoFormat == MFVideoFormat_RGB24)
{ {
@ -966,17 +964,17 @@ err:
// Configure the media type that the Sample Grabber will receive. // Configure the media type that the Sample Grabber will receive.
// Setting the major and subtype is usually enough for the topology loader // Setting the major and subtype is usually enough for the topology loader
// to resolve the topology. // to resolve the topology.
CHECK_HR(hr = MFCreateMediaType(&pType)); CHECK_HR(hr = MFCreateMediaType(pType.GetAddressOf()));
CHECK_HR(hr = pType->SetGUID(MF_MT_MAJOR_TYPE, MFMediaType_Video)); CHECK_HR(hr = pType->SetGUID(MF_MT_MAJOR_TYPE, MFMediaType_Video));
CHECK_HR(hr = pType->SetGUID(MF_MT_SUBTYPE, VideoFormat)); CHECK_HR(hr = pType->SetGUID(MF_MT_SUBTYPE, VideoFormat));
// Create the sample grabber sink. // Create the sample grabber sink.
CHECK_HR(hr = MFCreateSampleGrabberSinkActivate(pType, this, &pSinkActivate)); CHECK_HR(hr = MFCreateSampleGrabberSinkActivate(pType.Get(), this, pSinkActivate.GetAddressOf()));
// To run as fast as possible, set this attribute (requires Windows 7): // To run as fast as possible, set this attribute (requires Windows 7):
CHECK_HR(hr = pSinkActivate->SetUINT32(MF_SAMPLEGRABBERSINK_IGNORE_CLOCK, TRUE)); CHECK_HR(hr = pSinkActivate->SetUINT32(MF_SAMPLEGRABBERSINK_IGNORE_CLOCK, TRUE));
// Create the Media Session. // Create the Media Session.
CHECK_HR(hr = MFCreateMediaSession(NULL, &ig_pSession)); CHECK_HR(hr = MFCreateMediaSession(NULL, &ig_pSession));
// Create the topology. // Create the topology.
CHECK_HR(hr = CreateTopology(pSource, pSinkActivate, &ig_pTopology)); CHECK_HR(hr = CreateTopology(pSource, pSinkActivate.Get(), &ig_pTopology));
done: done:
// Clean up. // Clean up.
if (FAILED(hr)) if (FAILED(hr))
@ -988,8 +986,7 @@ done:
SafeRelease(&ig_pSession); SafeRelease(&ig_pSession);
SafeRelease(&ig_pTopology); SafeRelease(&ig_pTopology);
} }
SafeRelease(&pSinkActivate);
SafeRelease(&pType);
return hr; return hr;
} }
@ -1004,7 +1001,7 @@ void ImageGrabber::stopGrabbing()
HRESULT ImageGrabber::startGrabbing(void) HRESULT ImageGrabber::startGrabbing(void)
{ {
DebugPrintOut *DPO = &DebugPrintOut::getInstance(); DebugPrintOut *DPO = &DebugPrintOut::getInstance();
IMFMediaEvent *pEvent = NULL; ComPtr<IMFMediaEvent> pEvent = NULL;
PROPVARIANT var; PROPVARIANT var;
PropVariantInit(&var); PropVariantInit(&var);
HRESULT hr = S_OK; HRESULT hr = S_OK;
@ -1058,7 +1055,6 @@ HRESULT ImageGrabber::startGrabbing(void)
DPO->printOut(L"IMAGEGRABBER VIDEODEVICE %i: MEVideoCaptureDeviceRemoved \n", ig_DeviceID); DPO->printOut(L"IMAGEGRABBER VIDEODEVICE %i: MEVideoCaptureDeviceRemoved \n", ig_DeviceID);
break; break;
} }
SafeRelease(&pEvent);
} }
if (ig_Synchronous) if (ig_Synchronous)
@ -1069,7 +1065,6 @@ HRESULT ImageGrabber::startGrabbing(void)
DPO->printOut(L"IMAGEGRABBER VIDEODEVICE %i: Finish startGrabbing \n", ig_DeviceID); DPO->printOut(L"IMAGEGRABBER VIDEODEVICE %i: Finish startGrabbing \n", ig_DeviceID);
done: done:
SafeRelease(&pEvent);
SafeRelease(&ig_pSession); SafeRelease(&ig_pSession);
SafeRelease(&ig_pTopology); SafeRelease(&ig_pTopology);
@ -1086,16 +1081,16 @@ void ImageGrabber::resumeGrabbing()
HRESULT ImageGrabber::CreateTopology(IMFMediaSource *pSource, IMFActivate *pSinkActivate, IMFTopology **ppTopo) HRESULT ImageGrabber::CreateTopology(IMFMediaSource *pSource, IMFActivate *pSinkActivate, IMFTopology **ppTopo)
{ {
IMFTopology *pTopology = NULL; ComPtr<IMFTopology> pTopology = NULL;
IMFPresentationDescriptor *pPD = NULL; ComPtr<IMFPresentationDescriptor> pPD = NULL;
IMFStreamDescriptor *pSD = NULL; ComPtr<IMFStreamDescriptor> pSD = NULL;
IMFMediaTypeHandler *pHandler = NULL; ComPtr<IMFMediaTypeHandler> pHandler = NULL;
IMFTopologyNode *pNode1 = NULL; ComPtr<IMFTopologyNode> pNode1 = NULL;
IMFTopologyNode *pNode2 = NULL; ComPtr<IMFTopologyNode> pNode2 = NULL;
HRESULT hr = S_OK; HRESULT hr = S_OK;
DWORD cStreams = 0; DWORD cStreams = 0;
CHECK_HR(hr = MFCreateTopology(&pTopology)); CHECK_HR(hr = MFCreateTopology(pTopology.GetAddressOf()));
CHECK_HR(hr = pSource->CreatePresentationDescriptor(&pPD)); CHECK_HR(hr = pSource->CreatePresentationDescriptor(pPD.GetAddressOf()));
CHECK_HR(hr = pPD->GetStreamDescriptorCount(&cStreams)); CHECK_HR(hr = pPD->GetStreamDescriptorCount(&cStreams));
for (DWORD i = 0; i < cStreams; i++) for (DWORD i = 0; i < cStreams; i++)
{ {
@ -1107,29 +1102,20 @@ HRESULT ImageGrabber::CreateTopology(IMFMediaSource *pSource, IMFActivate *pSink
CHECK_HR(hr = pHandler->GetMajorType(&majorType)); CHECK_HR(hr = pHandler->GetMajorType(&majorType));
if (majorType == MFMediaType_Video && fSelected) if (majorType == MFMediaType_Video && fSelected)
{ {
CHECK_HR(hr = AddSourceNode(pTopology, pSource, pPD, pSD, &pNode1)); CHECK_HR(hr = AddSourceNode(pTopology.Get(), pSource, pPD.Get(), pSD.Get(), pNode1.GetAddressOf()));
CHECK_HR(hr = AddOutputNode(pTopology, pSinkActivate, 0, &pNode2)); CHECK_HR(hr = AddOutputNode(pTopology.Get(), pSinkActivate, 0, pNode2.GetAddressOf()));
CHECK_HR(hr = pNode1->ConnectOutput(0, pNode2, 0)); CHECK_HR(hr = pNode1->ConnectOutput(0, pNode2.Get(), 0));
break; break;
} }
else else
{ {
CHECK_HR(hr = pPD->DeselectStream(i)); CHECK_HR(hr = pPD->DeselectStream(i));
} }
SafeRelease(&pSD);
SafeRelease(&pHandler);
} }
*ppTopo = pTopology; *ppTopo = pTopology.Get();
(*ppTopo)->AddRef(); (*ppTopo)->AddRef();
done: done:
SafeRelease(&pTopology);
SafeRelease(&pNode1);
SafeRelease(&pNode2);
SafeRelease(&pPD);
SafeRelease(&pSD);
SafeRelease(&pHandler);
return hr; return hr;
} }
@ -1140,20 +1126,18 @@ HRESULT ImageGrabber::AddSourceNode(
IMFStreamDescriptor *pSD, // Stream descriptor. IMFStreamDescriptor *pSD, // Stream descriptor.
IMFTopologyNode **ppNode) // Receives the node pointer. IMFTopologyNode **ppNode) // Receives the node pointer.
{ {
IMFTopologyNode *pNode = NULL; ComPtr<IMFTopologyNode> pNode = NULL;
HRESULT hr = S_OK; HRESULT hr = S_OK;
CHECK_HR(hr = MFCreateTopologyNode(MF_TOPOLOGY_SOURCESTREAM_NODE, &pNode)); CHECK_HR(hr = MFCreateTopologyNode(MF_TOPOLOGY_SOURCESTREAM_NODE, pNode.GetAddressOf()));
CHECK_HR(hr = pNode->SetUnknown(MF_TOPONODE_SOURCE, pSource)); CHECK_HR(hr = pNode->SetUnknown(MF_TOPONODE_SOURCE, pSource));
CHECK_HR(hr = pNode->SetUnknown(MF_TOPONODE_PRESENTATION_DESCRIPTOR, pPD)); CHECK_HR(hr = pNode->SetUnknown(MF_TOPONODE_PRESENTATION_DESCRIPTOR, pPD));
CHECK_HR(hr = pNode->SetUnknown(MF_TOPONODE_STREAM_DESCRIPTOR, pSD)); CHECK_HR(hr = pNode->SetUnknown(MF_TOPONODE_STREAM_DESCRIPTOR, pSD));
CHECK_HR(hr = pTopology->AddNode(pNode)); CHECK_HR(hr = pTopology->AddNode(pNode.Get()));
// Return the pointer to the caller. // Return the pointer to the caller.
*ppNode = pNode; *ppNode = pNode.Get();
(*ppNode)->AddRef(); (*ppNode)->AddRef();
done: done:
SafeRelease(&pNode);
return hr; return hr;
} }
@ -1163,20 +1147,18 @@ HRESULT ImageGrabber::AddOutputNode(
DWORD dwId, // Identifier of the stream sink. DWORD dwId, // Identifier of the stream sink.
IMFTopologyNode **ppNode) // Receives the node pointer. IMFTopologyNode **ppNode) // Receives the node pointer.
{ {
IMFTopologyNode *pNode = NULL; ComPtr<IMFTopologyNode> pNode = NULL;
HRESULT hr = S_OK; HRESULT hr = S_OK;
CHECK_HR(hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, &pNode)); CHECK_HR(hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, pNode.GetAddressOf()));
CHECK_HR(hr = pNode->SetObject(pActivate)); CHECK_HR(hr = pNode->SetObject(pActivate));
CHECK_HR(hr = pNode->SetUINT32(MF_TOPONODE_STREAMID, dwId)); CHECK_HR(hr = pNode->SetUINT32(MF_TOPONODE_STREAMID, dwId));
CHECK_HR(hr = pNode->SetUINT32(MF_TOPONODE_NOSHUTDOWN_ON_REMOVE, FALSE)); CHECK_HR(hr = pNode->SetUINT32(MF_TOPONODE_NOSHUTDOWN_ON_REMOVE, FALSE));
CHECK_HR(hr = pTopology->AddNode(pNode)); CHECK_HR(hr = pTopology->AddNode(pNode.Get()));
// Return the pointer to the caller. // Return the pointer to the caller.
*ppNode = pNode; *ppNode = pNode.Get();
(*ppNode)->AddRef(); (*ppNode)->AddRef();
done: done:
SafeRelease(&pNode);
return hr; return hr;
} }
@ -1457,9 +1439,9 @@ Media_Foundation::~Media_Foundation(void)
bool Media_Foundation::buildListOfDevices() bool Media_Foundation::buildListOfDevices()
{ {
HRESULT hr = S_OK; HRESULT hr = S_OK;
IMFAttributes *pAttributes = NULL; ComPtr<IMFAttributes> pAttributes = NULL;
CoInitialize(NULL); CoInitialize(NULL);
hr = MFCreateAttributes(&pAttributes, 1); hr = MFCreateAttributes(pAttributes.GetAddressOf(), 1);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
{ {
hr = pAttributes->SetGUID( hr = pAttributes->SetGUID(
@ -1470,14 +1452,14 @@ bool Media_Foundation::buildListOfDevices()
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
{ {
videoDevices *vDs = &videoDevices::getInstance(); videoDevices *vDs = &videoDevices::getInstance();
hr = vDs->initDevices(pAttributes); hr = vDs->initDevices(pAttributes.Get());
} }
else else
{ {
DebugPrintOut *DPO = &DebugPrintOut::getInstance(); DebugPrintOut *DPO = &DebugPrintOut::getInstance();
DPO->printOut(L"MEDIA FOUNDATION: The access to the video cameras denied\n"); DPO->printOut(L"MEDIA FOUNDATION: The access to the video cameras denied\n");
} }
SafeRelease(&pAttributes);
return (SUCCEEDED(hr)); return (SUCCEEDED(hr));
} }
@ -1721,14 +1703,15 @@ long videoDevice::checkDevice(IMFAttributes *pAttributes, IMFActivate **pDevice)
} }
return hr; return hr;
} }
long videoDevice::initDevice() long videoDevice::initDevice()
{ {
HRESULT hr = -1; HRESULT hr = -1;
IMFAttributes *pAttributes = NULL; ComPtr<IMFAttributes> pAttributes = NULL;
IMFActivate * vd_pActivate= NULL; IMFActivate *vd_pActivate = NULL;
DebugPrintOut *DPO = &DebugPrintOut::getInstance(); DebugPrintOut *DPO = &DebugPrintOut::getInstance();
CoInitialize(NULL); CoInitialize(NULL);
hr = MFCreateAttributes(&pAttributes, 1); hr = MFCreateAttributes(pAttributes.GetAddressOf(), 1);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
{ {
hr = pAttributes->SetGUID( hr = pAttributes->SetGUID(
@ -1738,7 +1721,7 @@ long videoDevice::initDevice()
} }
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
{ {
hr = checkDevice(pAttributes, &vd_pActivate); hr = checkDevice(pAttributes.Get(), &vd_pActivate);
if (SUCCEEDED(hr) && vd_pActivate) if (SUCCEEDED(hr) && vd_pActivate)
{ {
SafeRelease(&vd_pSource); SafeRelease(&vd_pSource);
@ -1760,9 +1743,10 @@ long videoDevice::initDevice()
{ {
DPO->printOut(L"VIDEODEVICE %i: The attribute of video cameras cannot be getting \n", vd_CurrentNumber); DPO->printOut(L"VIDEODEVICE %i: The attribute of video cameras cannot be getting \n", vd_CurrentNumber);
} }
SafeRelease(&pAttributes);
return hr; return hr;
} }
MediaType videoDevice::getFormat(unsigned int id) MediaType videoDevice::getFormat(unsigned int id)
{ {
if(id < vd_CurrentFormats.size()) if(id < vd_CurrentFormats.size())
@ -1887,45 +1871,45 @@ void videoDevice::buildLibraryofTypes()
count++; count++;
} }
} }
long videoDevice::setDeviceFormat(IMFMediaSource *pSource, unsigned long dwFormatIndex) long videoDevice::setDeviceFormat(IMFMediaSource *pSource, unsigned long dwFormatIndex)
{ {
IMFPresentationDescriptor *pPD = NULL; ComPtr<IMFPresentationDescriptor> pPD = NULL;
IMFStreamDescriptor *pSD = NULL; ComPtr<IMFStreamDescriptor> pSD = NULL;
IMFMediaTypeHandler *pHandler = NULL; ComPtr<IMFMediaTypeHandler> pHandler = NULL;
IMFMediaType *pType = NULL; ComPtr<IMFMediaType> pType = NULL;
HRESULT hr = pSource->CreatePresentationDescriptor(&pPD); HRESULT hr = pSource->CreatePresentationDescriptor(pPD.GetAddressOf());
if (FAILED(hr)) if (FAILED(hr))
{ {
goto done; goto done;
} }
BOOL fSelected; BOOL fSelected;
hr = pPD->GetStreamDescriptorByIndex(0, &fSelected, &pSD); hr = pPD->GetStreamDescriptorByIndex(0, &fSelected, pSD.GetAddressOf());
if (FAILED(hr)) if (FAILED(hr))
{ {
goto done; goto done;
} }
hr = pSD->GetMediaTypeHandler(&pHandler); hr = pSD->GetMediaTypeHandler(pHandler.GetAddressOf());
if (FAILED(hr)) if (FAILED(hr))
{ {
goto done; goto done;
} }
hr = pHandler->GetMediaTypeByIndex((DWORD)dwFormatIndex, &pType); hr = pHandler->GetMediaTypeByIndex((DWORD)dwFormatIndex, pType.GetAddressOf());
if (FAILED(hr)) if (FAILED(hr))
{ {
goto done; goto done;
} }
hr = pHandler->SetCurrentMediaType(pType); hr = pHandler->SetCurrentMediaType(pType.Get());
done: done:
SafeRelease(&pPD);
SafeRelease(&pSD);
SafeRelease(&pHandler);
SafeRelease(&pType);
return hr; return hr;
} }
bool videoDevice::isDeviceSetup() bool videoDevice::isDeviceSetup()
{ {
return vd_IsSetuped; return vd_IsSetuped;
} }
RawImage * videoDevice::getRawImageOut() RawImage * videoDevice::getRawImageOut()
{ {
if(!vd_IsSetuped) return NULL; if(!vd_IsSetuped) return NULL;
@ -1938,6 +1922,7 @@ RawImage * videoDevice::getRawImageOut()
} }
return NULL; return NULL;
} }
bool videoDevice::isFrameNew() bool videoDevice::isFrameNew()
{ {
if(!vd_IsSetuped) return false; if(!vd_IsSetuped) return false;
@ -1962,16 +1947,19 @@ bool videoDevice::isFrameNew()
} }
return false; return false;
} }
bool videoDevice::isDeviceMediaSource() bool videoDevice::isDeviceMediaSource()
{ {
if(vd_LockOut == MediaSourceLock) return true; if(vd_LockOut == MediaSourceLock) return true;
return false; return false;
} }
bool videoDevice::isDeviceRawDataSource() bool videoDevice::isDeviceRawDataSource()
{ {
if(vd_LockOut == RawDataLock) return true; if(vd_LockOut == RawDataLock) return true;
return false; return false;
} }
bool videoDevice::setupDevice(unsigned int id) bool videoDevice::setupDevice(unsigned int id)
{ {
DebugPrintOut *DPO = &DebugPrintOut::getInstance(); DebugPrintOut *DPO = &DebugPrintOut::getInstance();
@ -2002,15 +1990,18 @@ bool videoDevice::setupDevice(unsigned int id)
return false; return false;
} }
} }
bool videoDevice::setupDevice(unsigned int w, unsigned int h, unsigned int idealFramerate) bool videoDevice::setupDevice(unsigned int w, unsigned int h, unsigned int idealFramerate)
{ {
unsigned int id = findType(w * h, idealFramerate); unsigned int id = findType(w * h, idealFramerate);
return setupDevice(id); return setupDevice(id);
} }
wchar_t *videoDevice::getName() wchar_t *videoDevice::getName()
{ {
return vd_pFriendlyName; return vd_pFriendlyName;
} }
videoDevice::~videoDevice(void) videoDevice::~videoDevice(void)
{ {
closeDevice(); closeDevice();
@ -2018,24 +2009,25 @@ videoDevice::~videoDevice(void)
if(vd_pFriendlyName) if(vd_pFriendlyName)
CoTaskMemFree(vd_pFriendlyName); CoTaskMemFree(vd_pFriendlyName);
} }
long videoDevice::enumerateCaptureFormats(IMFMediaSource *pSource) long videoDevice::enumerateCaptureFormats(IMFMediaSource *pSource)
{ {
IMFPresentationDescriptor *pPD = NULL; ComPtr<IMFPresentationDescriptor> pPD = NULL;
IMFStreamDescriptor *pSD = NULL; ComPtr<IMFStreamDescriptor> pSD = NULL;
IMFMediaTypeHandler *pHandler = NULL; ComPtr<IMFMediaTypeHandler> pHandler = NULL;
IMFMediaType *pType = NULL; ComPtr<IMFMediaType> pType = NULL;
HRESULT hr = pSource->CreatePresentationDescriptor(&pPD); HRESULT hr = pSource->CreatePresentationDescriptor(pPD.GetAddressOf());
if (FAILED(hr)) if (FAILED(hr))
{ {
goto done; goto done;
} }
BOOL fSelected; BOOL fSelected;
hr = pPD->GetStreamDescriptorByIndex(0, &fSelected, &pSD); hr = pPD->GetStreamDescriptorByIndex(0, &fSelected, pSD.GetAddressOf());
if (FAILED(hr)) if (FAILED(hr))
{ {
goto done; goto done;
} }
hr = pSD->GetMediaTypeHandler(&pHandler); hr = pSD->GetMediaTypeHandler(pHandler.GetAddressOf());
if (FAILED(hr)) if (FAILED(hr))
{ {
goto done; goto done;
@ -2048,20 +2040,16 @@ long videoDevice::enumerateCaptureFormats(IMFMediaSource *pSource)
} }
for (DWORD i = 0; i < cTypes; i++) for (DWORD i = 0; i < cTypes; i++)
{ {
hr = pHandler->GetMediaTypeByIndex(i, &pType); hr = pHandler->GetMediaTypeByIndex(i, pType.GetAddressOf());
if (FAILED(hr)) if (FAILED(hr))
{ {
goto done; goto done;
} }
MediaType MT = FormatReader::Read(pType); MediaType MT = FormatReader::Read(pType.Get());
vd_CurrentFormats.push_back(MT); vd_CurrentFormats.push_back(MT);
SafeRelease(&pType);
} }
done: done:
SafeRelease(&pPD);
SafeRelease(&pSD);
SafeRelease(&pHandler);
SafeRelease(&pType);
return hr; return hr;
} }
@ -3366,11 +3354,11 @@ void CvCaptureFile_MSMF::processPixels(unsigned char * src, unsigned char * dst,
long CvCaptureFile_MSMF::enumerateCaptureFormats(IMFMediaSource *pSource) long CvCaptureFile_MSMF::enumerateCaptureFormats(IMFMediaSource *pSource)
{ {
IMFPresentationDescriptor *pPD = NULL; ComPtr<IMFPresentationDescriptor> pPD = NULL;
IMFStreamDescriptor *pSD = NULL; ComPtr<IMFStreamDescriptor> pSD = NULL;
IMFMediaTypeHandler *pHandler = NULL; ComPtr<IMFMediaTypeHandler> pHandler = NULL;
IMFMediaType *pType = NULL; ComPtr<IMFMediaType> pType = NULL;
HRESULT hr = pSource->CreatePresentationDescriptor(&pPD); HRESULT hr = pSource->CreatePresentationDescriptor(pPD.GetAddressOf());
if (FAILED(hr)) if (FAILED(hr))
{ {
goto done; goto done;
@ -3383,12 +3371,12 @@ long CvCaptureFile_MSMF::enumerateCaptureFormats(IMFMediaSource *pSource)
printf("Stream count: %d\n", cnt); printf("Stream count: %d\n", cnt);
BOOL fSelected; BOOL fSelected;
hr = pPD->GetStreamDescriptorByIndex(0, &fSelected, &pSD); hr = pPD->GetStreamDescriptorByIndex(0, &fSelected, pSD.GetAddressOf());
if (FAILED(hr)) if (FAILED(hr))
{ {
goto done; goto done;
} }
hr = pSD->GetMediaTypeHandler(&pHandler); hr = pSD->GetMediaTypeHandler(pHandler.GetAddressOf());
if (FAILED(hr)) if (FAILED(hr))
{ {
goto done; goto done;
@ -3401,21 +3389,16 @@ long CvCaptureFile_MSMF::enumerateCaptureFormats(IMFMediaSource *pSource)
} }
for (DWORD i = 0; i < cTypes; i++) for (DWORD i = 0; i < cTypes; i++)
{ {
hr = pHandler->GetMediaTypeByIndex(i, &pType); hr = pHandler->GetMediaTypeByIndex(i, pType.GetAddressOf());
if (FAILED(hr)) if (FAILED(hr))
{ {
goto done; goto done;
} }
MediaType MT = FormatReader::Read(pType); MediaType MT = FormatReader::Read(pType.Get());
captureFormats.push_back(MT); captureFormats.push_back(MT);
SafeRelease(&pType);
} }
done: done:
SafeRelease(&pPD);
SafeRelease(&pSD);
SafeRelease(&pHandler);
SafeRelease(&pType);
return hr; return hr;
} }
@ -3452,8 +3435,6 @@ CvCapture* cvCreateFileCapture_MSMF (const char* filename)
// //
// //
using namespace Microsoft::WRL;
class CvVideoWriter_MSMF : public CvVideoWriter class CvVideoWriter_MSMF : public CvVideoWriter
{ {
public: public: