mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 16:50:47 +00:00
Code Issues 1 Projects Releases Wiki Activity

decklink: Fix indentation

Browse source
This commit is contained in:
Sebastian Dröge 2017-01-27 19:24:03 +02:00
parent 861cb49895
commit 4cdd234add
3 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sys/decklink/gstdecklink.cpp
View file

@ -451,7 +451,7 @@ gst_decklink_timecode_format_to_enum (BMDTimecodeFormat f)
} }
static const BMDVideoConnection connections[] = { static const BMDVideoConnection connections[] = {
(BMDVideoConnection)0, /* auto */ (BMDVideoConnection) 0, /* auto */
bmdVideoConnectionSDI, bmdVideoConnectionSDI,
bmdVideoConnectionHDMI, bmdVideoConnectionHDMI,
bmdVideoConnectionOpticalSDI, bmdVideoConnectionOpticalSDI,
@ -757,7 +757,7 @@ public:
void (*got_video_frame) (GstElement * videosrc, void (*got_video_frame) (GstElement * videosrc,
IDeckLinkVideoInputFrame * frame, GstDecklinkModeEnum mode, IDeckLinkVideoInputFrame * frame, GstDecklinkModeEnum mode,
GstClockTime capture_time, GstClockTime stream_time, GstClockTime capture_time, GstClockTime stream_time,
GstClockTime stream_duration, IDeckLinkTimecode *dtc, gboolean GstClockTime stream_duration, IDeckLinkTimecode * dtc, gboolean
no_signal) = NULL; no_signal) = NULL;
void (*got_audio_packet) (GstElement * videosrc, void (*got_audio_packet) (GstElement * videosrc,
IDeckLinkAudioInputPacket * packet, GstClockTime capture_time, IDeckLinkAudioInputPacket * packet, GstClockTime capture_time,
@ -967,9 +967,9 @@ init_devices (gpointer data)
GST_DEBUG ("Input %d supports:", i); GST_DEBUG ("Input %d supports:", i);
while ((ret = mode_iter->Next (&mode)) == S_OK) { while ((ret = mode_iter->Next (&mode)) == S_OK) {
const char* name; const char *name;
mode->GetName ((COMSTR_T *) &name); mode->GetName ((COMSTR_T *) & name);
CONVERT_COM_STRING (name); CONVERT_COM_STRING (name);
GST_DEBUG (" %s mode: 0x%08x width: %ld height: %ld" GST_DEBUG (" %s mode: 0x%08x width: %ld height: %ld"
" fields: 0x%08x flags: 0x%08x", name, " fields: 0x%08x flags: 0x%08x", name,
@ -1007,7 +1007,7 @@ init_devices (gpointer data)
while ((ret = mode_iter->Next (&mode)) == S_OK) { while ((ret = mode_iter->Next (&mode)) == S_OK) {
const char *name; const char *name;
mode->GetName ((COMSTR_T *) &name); mode->GetName ((COMSTR_T *) & name);
CONVERT_COM_STRING (name); CONVERT_COM_STRING (name);
GST_DEBUG (" %s mode: 0x%08x width: %ld height: %ld" GST_DEBUG (" %s mode: 0x%08x width: %ld height: %ld"
" fields: 0x%08x flags: 0x%08x", name, " fields: 0x%08x flags: 0x%08x", name,

4
sys/decklink/gstdecklink.h
View file

@ -42,8 +42,8 @@
#define FREE_COM_STRING(s) delete[] s; #define FREE_COM_STRING(s) delete[] s;
#define CONVERT_COM_STRING(s) BSTR _s = (BSTR)s; s = _com_util::ConvertBSTRToString(_s); ::SysFreeString(_s); #define CONVERT_COM_STRING(s) BSTR _s = (BSTR)s; s = _com_util::ConvertBSTRToString(_s); ::SysFreeString(_s);
#else #else
#define COMSTR_T char* #define COMSTR_T const char*
#define FREE_COM_STRING(s) free ((void *) s) #define FREE_COM_STRING(s)
#define CONVERT_COM_STRING(s) #define CONVERT_COM_STRING(s)
#endif /* _MSC_VER */ #endif /* _MSC_VER */

9
sys/decklink/gstdecklinkvideosrc.cpp
View file

@ -601,8 +601,7 @@ static void
gst_decklink_video_src_got_frame (GstElement * element, gst_decklink_video_src_got_frame (GstElement * element,
IDeckLinkVideoInputFrame * frame, GstDecklinkModeEnum mode, IDeckLinkVideoInputFrame * frame, GstDecklinkModeEnum mode,
GstClockTime capture_time, GstClockTime stream_time, GstClockTime capture_time, GstClockTime stream_time,
GstClockTime stream_duration, IDeckLinkTimecode *dtc, GstClockTime stream_duration, IDeckLinkTimecode * dtc, gboolean no_signal)
gboolean no_signal)
{ {
GstDecklinkVideoSrc *self = GST_DECKLINK_VIDEO_SRC_CAST (element); GstDecklinkVideoSrc *self = GST_DECKLINK_VIDEO_SRC_CAST (element);
GstClockTime timestamp, duration; GstClockTime timestamp, duration;
@ -680,7 +679,7 @@ gst_decklink_video_src_got_frame (GstElement * element,
} else { } else {
bflags = dtc->GetFlags (); bflags = dtc->GetFlags ();
GST_DEBUG_OBJECT (self, "Got timecode %02d:%02d:%02d:%02d", GST_DEBUG_OBJECT (self, "Got timecode %02d:%02d:%02d:%02d",
hours, minutes, seconds, frames); hours, minutes, seconds, frames);
bmode = gst_decklink_get_mode (mode); bmode = gst_decklink_get_mode (mode);
if (bmode->interlaced) { if (bmode->interlaced) {
flags = flags =
@ -696,8 +695,8 @@ gst_decklink_video_src_got_frame (GstElement * element,
(GstVideoTimeCodeFlags) (flags | (GstVideoTimeCodeFlags) (flags |
GST_VIDEO_TIME_CODE_FLAGS_DROP_FRAME); GST_VIDEO_TIME_CODE_FLAGS_DROP_FRAME);
f->tc = f->tc =
gst_video_time_code_new (bmode->fps_n, bmode->fps_d, NULL, flags, hours, gst_video_time_code_new (bmode->fps_n, bmode->fps_d, NULL, flags,
minutes, seconds, frames, field_count); hours, minutes, seconds, frames, field_count);
} }
dtc->Release (); dtc->Release ();
} else { } else {