yair/gst-plugin-linescan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pleorasrc: add support for compiling against eBUS SDK 5

Browse Source 
Unfortunately eBUS SDK 5 breaks API, but only in a few minor ways.
This commit is contained in:
Joshua M. Doe 2019-10-02 10:55:24 -04:00
parent 5ef38d0833
commit a7f4657547
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/pleora/gstpleorasrc.cpp
View File

@ -43,6 +43,7 @@
#include <PvDeviceGEV.h> #include <PvDeviceGEV.h>
#include <PvStreamGEV.h> #include <PvStreamGEV.h>
#include <PvSystem.h> #include <PvSystem.h>
#include <PvVersion.h>
GST_DEBUG_CATEGORY_STATIC (gst_pleorasrc_debug); GST_DEBUG_CATEGORY_STATIC (gst_pleorasrc_debug);
#define GST_CAT_DEFAULT gst_pleorasrc_debug #define GST_CAT_DEFAULT gst_pleorasrc_debug
@ -384,12 +385,18 @@ gst_pleorasrc_print_device_info (GstPleoraSrc * src,
const PvUSBHostController * >(device_info->GetInterface ()); const PvUSBHostController * >(device_info->GetInterface ());
if (iface_nic != NULL) { if (iface_nic != NULL) {
const char *ip, *subnet;
#if VERSION_MAJOR == 4
ip = iface_nic->GetIPAddress ().GetAscii ();
subnet = iface_nic->GetSubnetMask ().GetAscii ();
#else
ip = iface_nic->GetIPAddress (0).GetAscii ();
subnet = iface_nic->GetSubnetMask (0).GetAscii ();
#endif
GST_DEBUG_OBJECT (src, GST_DEBUG_OBJECT (src,
"Device found on network interface '%s', MAC: %s, IP: %s, Subnet: %s", "Device found on network interface '%s', MAC: %s, IP: %s, Subnet: %s",
iface_nic->GetDescription ().GetAscii (), iface_nic->GetDescription ().GetAscii (),
iface_nic->GetMACAddress ().GetAscii (), iface_nic->GetMACAddress ().GetAscii (), ip, subnet);
iface_nic->GetIPAddress (0).GetAscii (),
iface_nic->GetSubnetMask (0).GetAscii ());
} else if (iface_usb != NULL) { } else if (iface_usb != NULL) {
GST_DEBUG_OBJECT (src, GST_DEBUG_OBJECT (src,
"Device found on USB interface, VEN_%04X&DEV_%04X&SUBSYS_%08X&REV_%02X, '%s', %s Speed", "Device found on USB interface, VEN_%04X&DEV_%04X&SUBSYS_%08X&REV_%02X, '%s', %s Speed",
@ -574,7 +581,11 @@ gst_pleorasrc_setup_device (GstPleoraSrc * src)
/* if acting as a GigE controller configure stream */ /* if acting as a GigE controller configure stream */
PvDeviceGEV *lDeviceGEV = dynamic_cast < PvDeviceGEV * >(src->device); PvDeviceGEV *lDeviceGEV = dynamic_cast < PvDeviceGEV * >(src->device);
if (!src->receiver_only && lDeviceGEV != NULL) { if (!src->receiver_only && lDeviceGEV != NULL) {
#if VERSION_MAJOR == 4
PvStreamGEV *lStreamGEV = static_cast < PvStreamGEV * >(src->stream); PvStreamGEV *lStreamGEV = static_cast < PvStreamGEV * >(src->stream);
#else
const PvStreamGEV *lStreamGEV = static_cast < PvStreamGEV * >(src->stream);
#endif
// Negotiate packet size // Negotiate packet size
lDeviceGEV->NegotiatePacketSize (); lDeviceGEV->NegotiatePacketSize ();