FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

decklink: Correctly indent everything

Browse Source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1721>
This commit is contained in:
Sebastian Dröge 2020-10-25 13:32:26 +02:00
parent 56b2130300
commit 60b7bd23a8
5 changed files with 78 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
sys/decklink/gstdecklink.cpp
View File

@ -88,11 +88,16 @@ gst_decklink_mode_get_type (void)
{GST_DECKLINK_MODE_2160p5994, "4k 59.94p", "2160p5994"}, {GST_DECKLINK_MODE_2160p5994, "4k 59.94p", "2160p5994"},
{GST_DECKLINK_MODE_2160p60, "4k 60p", "2160p60"}, {GST_DECKLINK_MODE_2160p60, "4k 60p", "2160p60"},
{GST_DECKLINK_MODE_NTSC_WIDESCREEN, "NTSC SD 60i Widescreen", "ntsc-widescreen"}, {GST_DECKLINK_MODE_NTSC_WIDESCREEN, "NTSC SD 60i Widescreen",
{GST_DECKLINK_MODE_NTSC2398_WIDESCREEN, "NTSC SD 60i Widescreen (24 fps)", "ntsc2398-widescreen"}, "ntsc-widescreen"},
{GST_DECKLINK_MODE_PAL_WIDESCREEN, "PAL SD 50i Widescreen", "pal-widescreen"}, {GST_DECKLINK_MODE_NTSC2398_WIDESCREEN, "NTSC SD 60i Widescreen (24 fps)",
{GST_DECKLINK_MODE_NTSC_P_WIDESCREEN, "NTSC SD 60p Widescreen", "ntsc-p-widescreen"}, "ntsc2398-widescreen"},
{GST_DECKLINK_MODE_PAL_P_WIDESCREEN, "PAL SD 50p Widescreen", "pal-p-widescreen"}, {GST_DECKLINK_MODE_PAL_WIDESCREEN, "PAL SD 50i Widescreen",
"pal-widescreen"},
{GST_DECKLINK_MODE_NTSC_P_WIDESCREEN, "NTSC SD 60p Widescreen",
"ntsc-p-widescreen"},
{GST_DECKLINK_MODE_PAL_P_WIDESCREEN, "PAL SD 50p Widescreen",
"pal-p-widescreen"},
{0, NULL, NULL} {0, NULL, NULL}
}; };
@ -174,12 +179,18 @@ gst_decklink_profile_id_get_type (void)
{ {
static gsize id = 0; static gsize id = 0;
static const GEnumValue types[] = { static const GEnumValue types[] = {
{GST_DECKLINK_PROFILE_ID_DEFAULT, "Default, don't change profile", "default"}, {GST_DECKLINK_PROFILE_ID_DEFAULT, "Default, don't change profile",
{GST_DECKLINK_PROFILE_ID_ONE_SUB_DEVICE_FULL_DUPLEX, "One sub-device, Full-Duplex", "one-sub-device-full"}, "default"},
{GST_DECKLINK_PROFILE_ID_ONE_SUB_DEVICE_HALF_DUPLEX, "One sub-device, Half-Duplex", "one-sub-device-half"}, {GST_DECKLINK_PROFILE_ID_ONE_SUB_DEVICE_FULL_DUPLEX,
{GST_DECKLINK_PROFILE_ID_TWO_SUB_DEVICES_FULL_DUPLEX, "Two sub-devices, Full-Duplex", "two-sub-devices-full"}, "One sub-device, Full-Duplex", "one-sub-device-full"},
{GST_DECKLINK_PROFILE_ID_TWO_SUB_DEVICES_HALF_DUPLEX, "Two sub-devices, Half-Duplex", "two-sub-devices-half"}, {GST_DECKLINK_PROFILE_ID_ONE_SUB_DEVICE_HALF_DUPLEX,
{GST_DECKLINK_PROFILE_ID_FOUR_SUB_DEVICES_HALF_DUPLEX, "Four sub-devices, Half-Duplex", "four-sub-devices-half"}, "One sub-device, Half-Duplex", "one-sub-device-half"},
{GST_DECKLINK_PROFILE_ID_TWO_SUB_DEVICES_FULL_DUPLEX,
"Two sub-devices, Full-Duplex", "two-sub-devices-full"},
{GST_DECKLINK_PROFILE_ID_TWO_SUB_DEVICES_HALF_DUPLEX,
"Two sub-devices, Half-Duplex", "two-sub-devices-half"},
{GST_DECKLINK_PROFILE_ID_FOUR_SUB_DEVICES_HALF_DUPLEX,
"Four sub-devices, Half-Duplex", "four-sub-devices-half"},
{0, NULL, NULL} {0, NULL, NULL}
}; };
@ -853,8 +864,8 @@ struct _Device
GstDecklinkDevice *devices[4]; GstDecklinkDevice *devices[4];
}; };
static ProfileSetOperationResult gst_decklink_configure_profile (Device * device, static ProfileSetOperationResult gst_decklink_configure_profile (Device *
GstDecklinkProfileId profile_id); device, GstDecklinkProfileId profile_id);
class GStreamerDecklinkInputCallback:public IDeckLinkInputCallback class GStreamerDecklinkInputCallback:public IDeckLinkInputCallback
{ {
@ -934,7 +945,8 @@ public:
/* Reset any timestamp observations we might've made */ /* Reset any timestamp observations we might've made */
if (m_input->videosrc) { if (m_input->videosrc) {
GstDecklinkVideoSrc *videosrc = GST_DECKLINK_VIDEO_SRC (m_input->videosrc); GstDecklinkVideoSrc *videosrc =
GST_DECKLINK_VIDEO_SRC (m_input->videosrc);
g_mutex_lock (&videosrc->lock); g_mutex_lock (&videosrc->lock);
videosrc->window_fill = 0; videosrc->window_fill = 0;
@ -1104,7 +1116,7 @@ private:
while ((buf = (uint8_t *) gst_queue_array_pop_head (m_buffers))) { while ((buf = (uint8_t *) gst_queue_array_pop_head (m_buffers))) {
uint8_t offset = *(buf - 1); uint8_t offset = *(buf - 1);
void *alloc_buf = buf - 128 + offset; void *alloc_buf = buf - 128 + offset;
g_free (alloc_buf); g_free (alloc_buf);
} }
} }
@ -1544,8 +1556,7 @@ init_devices (gpointer data)
bool tmp_bool = false; bool tmp_bool = false;
int64_t tmp_int = 2; int64_t tmp_int = 2;
dev->input.attributes->GetInt (BMDDeckLinkMaximumAudioChannels, dev->input.attributes->GetInt (BMDDeckLinkMaximumAudioChannels, &tmp_int);
&tmp_int);
dev->input.attributes->GetFlag (BMDDeckLinkSupportsInputFormatDetection, dev->input.attributes->GetFlag (BMDDeckLinkSupportsInputFormatDetection,
&tmp_bool); &tmp_bool);
supports_format_detection = tmp_bool; supports_format_detection = tmp_bool;
@ -1795,7 +1806,8 @@ gst_decklink_release_nth_input (gint n, GstElement * src, gboolean is_audio)
} }
static ProfileSetOperationResult static ProfileSetOperationResult
gst_decklink_configure_profile (Device * device, GstDecklinkProfileId profile_id) gst_decklink_configure_profile (Device * device,
GstDecklinkProfileId profile_id)
{ {
HRESULT res; HRESULT res;
@ -1806,7 +1818,8 @@ gst_decklink_configure_profile (Device * device, GstDecklinkProfileId profile_id
IDeckLink *decklink = input->device; IDeckLink *decklink = input->device;
IDeckLinkProfileManager *manager = NULL; IDeckLinkProfileManager *manager = NULL;
if (decklink->QueryInterface(IID_IDeckLinkProfileManager, (void **)&manager) == S_OK) { if (decklink->QueryInterface (IID_IDeckLinkProfileManager,
(void **) &manager) == S_OK) {
BMDProfileID bmd_profile_id; BMDProfileID bmd_profile_id;
switch (profile_id) { switch (profile_id) {
@ -1832,25 +1845,24 @@ gst_decklink_configure_profile (Device * device, GstDecklinkProfileId profile_id
} }
IDeckLinkProfile *profile = NULL; IDeckLinkProfile *profile = NULL;
res = manager->GetProfile(bmd_profile_id, &profile); res = manager->GetProfile (bmd_profile_id, &profile);
if (res == S_OK && profile) { if (res == S_OK && profile) {
res = profile->SetActive(); res = profile->SetActive ();
profile->Release(); profile->Release ();
} }
manager->Release(); manager->Release ();
if (res == S_OK) { if (res == S_OK) {
GST_DEBUG("Successfully set profile.\n"); GST_DEBUG ("Successfully set profile.\n");
return PROFILE_SET_SUCCESS; return PROFILE_SET_SUCCESS;
} } else {
else { GST_ERROR ("Failed to set profile.\n");
GST_ERROR("Failed to set profile.\n");
return PROFILE_SET_FAILURE; return PROFILE_SET_FAILURE;
} }
} else { } else {
GST_DEBUG("Device has only one profile.\n"); GST_DEBUG ("Device has only one profile.\n");
return PROFILE_SET_UNSUPPORTED; return PROFILE_SET_UNSUPPORTED;
} }
} }
@ -1962,14 +1974,21 @@ plugin_init (GstPlugin * plugin)
gst_device_provider_register (plugin, "decklinkdeviceprovider", gst_device_provider_register (plugin, "decklinkdeviceprovider",
GST_RANK_PRIMARY, GST_TYPE_DECKLINK_DEVICE_PROVIDER); GST_RANK_PRIMARY, GST_TYPE_DECKLINK_DEVICE_PROVIDER);
gst_type_mark_as_plugin_api (GST_TYPE_DECKLINK_AUDIO_CHANNELS, (GstPluginAPIFlags) 0); gst_type_mark_as_plugin_api (GST_TYPE_DECKLINK_AUDIO_CHANNELS,
gst_type_mark_as_plugin_api (GST_TYPE_DECKLINK_AUDIO_CONNECTION, (GstPluginAPIFlags) 0); (GstPluginAPIFlags) 0);
gst_type_mark_as_plugin_api (GST_TYPE_DECKLINK_PROFILE_ID, (GstPluginAPIFlags) 0); gst_type_mark_as_plugin_api (GST_TYPE_DECKLINK_AUDIO_CONNECTION,
gst_type_mark_as_plugin_api (GST_TYPE_DECKLINK_KEYER_MODE, (GstPluginAPIFlags) 0); (GstPluginAPIFlags) 0);
gst_type_mark_as_plugin_api (GST_TYPE_DECKLINK_PROFILE_ID,
(GstPluginAPIFlags) 0);
gst_type_mark_as_plugin_api (GST_TYPE_DECKLINK_KEYER_MODE,
(GstPluginAPIFlags) 0);
gst_type_mark_as_plugin_api (GST_TYPE_DECKLINK_MODE, (GstPluginAPIFlags) 0); gst_type_mark_as_plugin_api (GST_TYPE_DECKLINK_MODE, (GstPluginAPIFlags) 0);
gst_type_mark_as_plugin_api (GST_TYPE_DECKLINK_TIMECODE_FORMAT, (GstPluginAPIFlags) 0); gst_type_mark_as_plugin_api (GST_TYPE_DECKLINK_TIMECODE_FORMAT,
gst_type_mark_as_plugin_api (GST_TYPE_DECKLINK_VIDEO_FORMAT, (GstPluginAPIFlags) 0); (GstPluginAPIFlags) 0);
gst_type_mark_as_plugin_api (GST_TYPE_DECKLINK_CONNECTION, (GstPluginAPIFlags) 0); gst_type_mark_as_plugin_api (GST_TYPE_DECKLINK_VIDEO_FORMAT,
(GstPluginAPIFlags) 0);
gst_type_mark_as_plugin_api (GST_TYPE_DECKLINK_CONNECTION,
(GstPluginAPIFlags) 0);
return TRUE; return TRUE;
} }

14
sys/decklink/gstdecklinkaudiosink.cpp
View File

@ -684,7 +684,8 @@ gst_decklink_audio_sink_render (GstBaseSink * bsink, GstBuffer * buffer)
GST_TIME_ARGS (buffered_time), buffered_samples); GST_TIME_ARGS (buffered_time), buffered_samples);
{ {
GstClockTimeDiff buffered_ahead_of_clock_ahead = GST_CLOCK_DIFF (clock_ahead, buffered_time); GstClockTimeDiff buffered_ahead_of_clock_ahead =
GST_CLOCK_DIFF (clock_ahead, buffered_time);
GST_DEBUG_OBJECT (self, "driver is %" GST_STIME_FORMAT " ahead of the " GST_DEBUG_OBJECT (self, "driver is %" GST_STIME_FORMAT " ahead of the "
"expected clock", GST_STIME_ARGS (buffered_ahead_of_clock_ahead)); "expected clock", GST_STIME_ARGS (buffered_ahead_of_clock_ahead));
@ -693,9 +694,11 @@ gst_decklink_audio_sink_render (GstBaseSink * bsink, GstBuffer * buffer)
* own synchronisation. It seems to count samples instead. */ * own synchronisation. It seems to count samples instead. */
/* FIXME: do we need to split buffers? */ /* FIXME: do we need to split buffers? */
if (buffered_ahead_of_clock_ahead > 0 && if (buffered_ahead_of_clock_ahead > 0 &&
buffered_ahead_of_clock_ahead > gst_base_sink_get_max_lateness (bsink)) { buffered_ahead_of_clock_ahead >
GST_DEBUG_OBJECT (self, "Dropping buffer that is %" GST_STIME_FORMAT gst_base_sink_get_max_lateness (bsink)) {
" too late", GST_STIME_ARGS (buffered_ahead_of_clock_ahead)); GST_DEBUG_OBJECT (self,
"Dropping buffer that is %" GST_STIME_FORMAT " too late",
GST_STIME_ARGS (buffered_ahead_of_clock_ahead));
if (self->resampler) if (self->resampler)
gst_audio_resampler_reset (self->resampler); gst_audio_resampler_reset (self->resampler);
flow_ret = GST_FLOW_OK; flow_ret = GST_FLOW_OK;
@ -710,7 +713,8 @@ gst_decklink_audio_sink_render (GstBaseSink * bsink, GstBuffer * buffer)
GST_DEBUG_OBJECT (self, GST_DEBUG_OBJECT (self,
"Buffered enough, wait for preroll or the clock or flushing. " "Buffered enough, wait for preroll or the clock or flushing. "
"Configured buffer time: %" GST_TIME_FORMAT, GST_TIME_ARGS (self->buffer_time)); "Configured buffer time: %" GST_TIME_FORMAT,
GST_TIME_ARGS (self->buffer_time));
if (wait_time < self->buffer_time) if (wait_time < self->buffer_time)
wait_time = 0; wait_time = 0;

12
sys/decklink/gstdecklinkaudiosrc.cpp
View File

@ -547,20 +547,20 @@ gst_decklink_audio_src_got_packet (GstElement * element,
} }
if (self->skipped_last == 0 && skipped_packets > 0) { if (self->skipped_last == 0 && skipped_packets > 0) {
GST_WARNING_OBJECT (self, "Starting to drop audio packets"); GST_WARNING_OBJECT (self, "Starting to drop audio packets");
} }
if (skipped_packets == 0 && self->skipped_last > 0) { if (skipped_packets == 0 && self->skipped_last > 0) {
GST_ELEMENT_WARNING_WITH_DETAILS (self, GST_ELEMENT_WARNING_WITH_DETAILS (self,
STREAM, FAILED, STREAM, FAILED,
("Dropped %u old packets from %" GST_TIME_FORMAT " to %" ("Dropped %u old packets from %" GST_TIME_FORMAT " to %"
GST_TIME_FORMAT, self->skipped_last, GST_TIME_FORMAT, self->skipped_last,
GST_TIME_ARGS (self->skip_from_timestamp), GST_TIME_ARGS (self->skip_from_timestamp),
GST_TIME_ARGS (self->skip_to_timestamp)), GST_TIME_ARGS (self->skip_to_timestamp)),
(NULL), (NULL),
("dropped", G_TYPE_UINT, self->skipped_last, ("dropped", G_TYPE_UINT, self->skipped_last,
"from", G_TYPE_UINT64, self->skip_from_timestamp, "from", G_TYPE_UINT64, self->skip_from_timestamp,
"to", G_TYPE_UINT64, self->skip_to_timestamp, NULL)); "to", G_TYPE_UINT64, self->skip_to_timestamp, NULL));
self->skipped_last = 0; self->skipped_last = 0;
} }
self->skipped_last += skipped_packets; self->skipped_last += skipped_packets;

6
sys/decklink/gstdecklinkvideosink.cpp
View File

@ -1623,7 +1623,8 @@ gst_decklink_video_sink_change_state (GstElement * element,
self->internal_time_offset = self->internal_base_time; self->internal_time_offset = self->internal_base_time;
} else if (GST_CLOCK_TIME_IS_VALID (self->internal_pause_time)) { } else if (GST_CLOCK_TIME_IS_VALID (self->internal_pause_time)) {
self->internal_time_offset += self->internal_time_offset +=
gst_clock_get_internal_time (self->output->clock) - self->internal_pause_time; gst_clock_get_internal_time (self->output->clock) -
self->internal_pause_time;
} }
GST_INFO_OBJECT (self, "clock has been set to %" GST_PTR_FORMAT GST_INFO_OBJECT (self, "clock has been set to %" GST_PTR_FORMAT
@ -1687,7 +1688,8 @@ gst_decklink_video_sink_change_state (GstElement * element,
case GST_STATE_CHANGE_PAUSED_TO_PLAYING: case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
break; break;
case GST_STATE_CHANGE_PLAYING_TO_PAUSED: case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
self->internal_pause_time = gst_clock_get_internal_time (self->output->clock); self->internal_pause_time =
gst_clock_get_internal_time (self->output->clock);
break; break;
default: default:
break; break;

10
sys/decklink/gstdecklinkvideosrc.cpp
View File

@ -863,13 +863,13 @@ gst_decklink_video_src_got_frame (GstElement * element,
GST_ELEMENT_WARNING_WITH_DETAILS (self, GST_ELEMENT_WARNING_WITH_DETAILS (self,
STREAM, FAILED, STREAM, FAILED,
("Dropped %u old frames from %" GST_TIME_FORMAT " to %" ("Dropped %u old frames from %" GST_TIME_FORMAT " to %"
GST_TIME_FORMAT, self->skipped_last, GST_TIME_FORMAT, self->skipped_last,
GST_TIME_ARGS (self->skip_from_timestamp), GST_TIME_ARGS (self->skip_from_timestamp),
GST_TIME_ARGS (self->skip_to_timestamp)), GST_TIME_ARGS (self->skip_to_timestamp)),
(NULL), (NULL),
("dropped", G_TYPE_UINT, self->skipped_last, ("dropped", G_TYPE_UINT, self->skipped_last,
"from", G_TYPE_UINT64, self->skip_from_timestamp, "from", G_TYPE_UINT64, self->skip_from_timestamp,
"to", G_TYPE_UINT64, self->skip_to_timestamp, NULL)); "to", G_TYPE_UINT64, self->skip_to_timestamp, NULL));
self->skipped_last = 0; self->skipped_last = 0;
} }