mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 04:01:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

Disable channel when exiting from the capture/output thread

Browse source
This commit is contained in:
Sebastian Dröge 2021-08-27 15:12:07 +03:00
parent d61b415230
commit 22c0b9ed41
2 changed files with 34 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
gstajasink.cpp
View file

@ -684,20 +684,6 @@ static gboolean gst_aja_sink_set_caps(GstBaseSink *bsink, GstCaps *caps) {
(int)reference_source); (int)reference_source);
self->device->device->SetFramePulseReference(reference_source); self->device->device->SetFramePulseReference(reference_source);
if (!self->device->device->EnableChannel(self->channel)) {
GST_ERROR_OBJECT(self, "Failed to enable channel");
return FALSE;
}
if (self->quad_mode) {
for (int i = 1; i < 4; i++) {
if (!self->device->device->EnableChannel(
(NTV2Channel)(self->channel + i))) {
GST_ERROR_OBJECT(self, "Failed to enable channel");
return FALSE;
}
}
}
self->device->device->DMABufferAutoLock(false, true, 0); self->device->device->DMABufferAutoLock(false, true, 0);
if (::NTV2DeviceHasBiDirectionalSDI(self->device_id)) if (::NTV2DeviceHasBiDirectionalSDI(self->device_id))
@ -1725,6 +1711,26 @@ restart:
self->device->device->AutoCirculateStop(self->channel); self->device->device->AutoCirculateStop(self->channel);
if (!self->device->device->EnableChannel(self->channel)) {
GST_ERROR_OBJECT(self, "Failed to enable channel");
g_mutex_lock(&self->queue_lock);
GST_ELEMENT_ERROR(self, STREAM, FAILED, (NULL),
("Failed to configure device"));
goto out;
}
if (self->quad_mode) {
for (int i = 1; i < 4; i++) {
if (!self->device->device->EnableChannel(
(NTV2Channel)(self->channel + i))) {
GST_ERROR_OBJECT(self, "Failed to enable channel");
g_mutex_lock(&self->queue_lock);
GST_ELEMENT_ERROR(self, STREAM, FAILED, (NULL),
("Failed to configure device"));
goto out;
}
}
}
self->device->device->EnableOutputInterrupt(self->channel); self->device->device->EnableOutputInterrupt(self->channel);
self->device->device->SubscribeOutputVerticalEvent(self->channel); self->device->device->SubscribeOutputVerticalEvent(self->channel);
@ -2007,6 +2013,13 @@ out : {
self->device->device->AutoCirculateStop(self->channel); self->device->device->AutoCirculateStop(self->channel);
self->device->device->UnsubscribeOutputVerticalEvent(self->channel); self->device->device->UnsubscribeOutputVerticalEvent(self->channel);
self->device->device->DisableOutputInterrupt(self->channel); self->device->device->DisableOutputInterrupt(self->channel);
self->device->device->DisableChannel(self->channel);
if (self->quad_mode) {
for (int i = 1; i < 4; i++) {
self->device->device->DisableChannel((NTV2Channel)(self->channel + i));
}
}
} }
if ((!self->playing || self->draining) && !self->shutdown) goto restart; if ((!self->playing || self->draining) && !self->shutdown) goto restart;

7
gstajasrc.cpp
View file

@ -2139,6 +2139,13 @@ out : {
self->device->device->AutoCirculateStop(self->channel); self->device->device->AutoCirculateStop(self->channel);
self->device->device->UnsubscribeInputVerticalEvent(self->channel); self->device->device->UnsubscribeInputVerticalEvent(self->channel);
self->device->device->DisableInputInterrupt(self->channel); self->device->device->DisableInputInterrupt(self->channel);
self->device->device->DisableChannel(self->channel);
if (self->quad_mode) {
for (int i = 1; i < 4; i++) {
self->device->device->DisableChannel((NTV2Channel)(self->channel + i));
}
}
} }
if (!self->playing && !self->shutdown) goto restart; if (!self->playing && !self->shutdown) goto restart;