mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-04-16 12:37:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

decklink: Use ComPtr for variables

Browse Source 
This makes sure Decklink variables are automatically released.

Closes https://github.com/obsproject/obs-studio/pull/5508
This commit is contained in:
cg2121
2022-02-20 14:14:24 -06:00
committed by Jim
parent 3df2f3e069
commit efce0f41d0
7 changed files with 19 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
plugins/decklink/decklink-device-instance.cpp
View File

@@ -142,14 +142,14 @@ void DeckLinkDeviceInstance::HandleVideoFrame(
if (videoFrame == nullptr)
return;
IDeckLinkVideoFrameAncillaryPackets *packets;
ComPtr<IDeckLinkVideoFrameAncillaryPackets> packets;
if (videoFrame->QueryInterface(IID_IDeckLinkVideoFrameAncillaryPackets,
(void **)&packets) == S_OK) {
IDeckLinkAncillaryPacketIterator *iterator;
ComPtr<IDeckLinkAncillaryPacketIterator> iterator;
packets->GetPacketIterator(&iterator);
IDeckLinkAncillaryPacket *packet;
ComPtr<IDeckLinkAncillaryPacket> packet;
iterator->Next(&packet);
if (packet) {
@@ -160,18 +160,13 @@ void DeckLinkDeviceInstance::HandleVideoFrame(
if (did == 0x61 && sdid == 0x01) {
this->HandleCaptionPacket(packet, timestamp);
}
packet->Release();
}
iterator->Release();
packets->Release();
}
IDeckLinkVideoFrame *frame;
ComPtr<IDeckLinkVideoFrame> frame;
if (videoFrame->GetPixelFormat() != convertFrame->GetPixelFormat()) {
IDeckLinkVideoConversion *frameConverter =
CreateVideoConversionInstance();
ComPtr<IDeckLinkVideoConversion> frameConverter;
frameConverter.Set(CreateVideoConversionInstance());
frameConverter->ConvertFrame(videoFrame, convertFrame);
@@ -373,7 +368,7 @@ bool DeckLinkDeviceInstance::StartCapture(DeckLinkDeviceMode *mode_,
if (!device->GetInput(&input))
return false;
IDeckLinkConfiguration *deckLinkConfiguration = NULL;
ComPtr<IDeckLinkConfiguration> deckLinkConfiguration;
HRESULT result = input->QueryInterface(IID_IDeckLinkConfiguration,
(void **)&deckLinkConfiguration);
if (result != S_OK) {
@@ -526,7 +521,7 @@ bool DeckLinkDeviceInstance::StartOutput(DeckLinkDeviceMode *mode_)
int keyerMode = device->GetKeyerMode();
IDeckLinkKeyer *deckLinkKeyer = nullptr;
ComPtr<IDeckLinkKeyer> deckLinkKeyer;
if (device->GetKeyer(&deckLinkKeyer)) {
if (keyerMode) {
deckLinkKeyer->Enable(keyerMode == 1);
@@ -574,10 +569,8 @@ bool DeckLinkDeviceInstance::StopOutput()
output->DisableVideoOutput();
output->DisableAudioOutput();
if (decklinkOutputFrame != nullptr) {
decklinkOutputFrame->Release();
if (decklinkOutputFrame != nullptr)
decklinkOutputFrame = nullptr;
}
return true;
}