Skip to content

Commit ddba6cb

Browse files
committed
Fix decklink element name and add connection property
1 parent 05330c7 commit ddba6cb

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

Daemons/vmpserverd/config.plist.in

+1
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@
171171
- The type specifies the type of the channel.
172172
- The properties are specific to the channel type:
173173
- "v4l2": device (required)
174+
- "decklink": deviceNumber (required), connection (required)
174175
- "pulse": device (required)
175176
- "videoTest": width (required), height (required)
176177
- "audioTest": channels (required)

Daemons/vmpserverd/profiles/com.hugomelder.software.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<key>v4l2</key>
6767
<string>v4l2src device={V4L2DEV} ! videoconvertscale add-borders=1 ! video/x-raw, width=1920, height=1080 ! queue ! intervideosink channel={VIDEOCHANNEL.0}</string>
6868
<key>decklink</key>
69-
<string>decklinksrc device-number={DEV} ! videoconvert ! videoscale ! videorate ! video/x-raw, width=1920, height=1080 ! intervideosink channel={VIDEOCHANNEL.0}</string>
69+
<string>decklinkvideosrc device-number={DEV} connection={CON} ! videoconvert ! videoscale ! videorate ! video/x-raw, width=1920, height=1080 ! intervideosink channel={VIDEOCHANNEL.0}</string>
7070
<key>videoTest</key>
7171
<string>videotestsrc is-live=1 ! video/x-raw,width={WIDTH},height={HEIGHT},format=NV12 !
7272
intervideosink channel={VIDEOCHANNEL.0}</string>

Daemons/vmpserverd/profiles/com.hugomelder.vaapi.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
-->
9999
<string>v4l2src device={V4L2DEV} ! videoconvertscale add-borders=1 ! video/x-raw, width=1920, height=1080 ! intervideosink channel={VIDEOCHANNEL.0}</string>
100100
<key>decklink</key>
101-
<string>decklinksrc device-number={DEV} ! videoconvert ! videoscale ! videorate ! video/x-raw, width=1920, height=1080 ! intervideosink channel={VIDEOCHANNEL.0}</string>
101+
<string>decklinkvideosrc device-number={DEV} connection={CON} ! videoconvert ! videoscale ! videorate ! video/x-raw, width=1920, height=1080 ! intervideosink channel={VIDEOCHANNEL.0}</string>
102102
<key>videoTest</key>
103103
<string>videotestsrc is-live=1 ! video/x-raw,width={WIDTH},height={HEIGHT},format=NV12 ! intervideosink channel={VIDEOCHANNEL.0}</string>
104104
</dict>

Daemons/vmpserverd/src/VMPRTSPServer.m

+6-4
Original file line numberDiff line numberDiff line change
@@ -367,12 +367,14 @@ - (BOOL)_startChannelPipelinesWithError:(NSError **)error {
367367
CONFIG_ERROR(error, @"decklink channel is missing 'deviceNumber' property")
368368
return NO;
369369
}
370+
NSString *connection = properties[@"connection"];
371+
if (!connection) {
372+
CONFIG_ERROR(error, @"decklink channel is missing 'connection' property");
373+
return NO;
374+
}
370375

371376
// Substitution dictionary for pipeline template
372-
vars = @{
373-
@"VIDEOCHANNEL.0" : name,
374-
@"DEV" : [device stringValue],
375-
};
377+
vars = @{@"VIDEOCHANNEL.0" : name, @"DEV" : [device stringValue], @"CON" : connection};
376378
}
377379

378380
// Skip pipeline creation if type is unknown

0 commit comments

Comments
 (0)