michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Camera modifications : CheckDeviceCaps( ), CameraBinaryFiles2, etc, ver. 3.5.1997

Browse Source
This commit is contained in:
Milan Hanajik 2022-12-15 10:35:42 +01:00
parent 62e9f612fc
commit 1c6488d621
14 changed files with 57 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
TBF/CameraBinaryFiles2/DiscoveryDaemon Normal file
View File

Binary file not shown.

BIN
TBF/CameraBinaryFiles2/GrabImage Normal file
View File

Binary file not shown.

BIN
TBF/CameraBinaryFiles2/Measurement Normal file
View File

Binary file not shown.

BIN
TBF/CameraBinaryFiles2/RoiDetection Normal file
View File

Binary file not shown.

1
TBF/CameraBinaryFiles2/hrlivestream.sh Normal file
View File

@ -0,0 +1 @@
/opt/vc/bin/raspivid -o - -t 0 | /usr/bin/cvlc stream:///dev/stdin --sout "#rtp{sdp=rtsp://:8554/}" :demux=h264

1
TBF/CameraBinaryFiles2/livestream.sh Normal file
View File

@ -0,0 +1 @@
/opt/vc/bin/raspivid -w 640 -h 480 -fps 30 -o - -t 0 | /usr/bin/cvlc stream:///dev/stdin --sout "#rtp{sdp=rtsp://:8554/}" :demux=h264

2
TBF/CameraBinaryFiles2/mjpegrtpstream.sh Normal file
View File

@ -0,0 +1,2 @@
/opt/vc/bin/raspivid -t 0 -cd MJPEG -w 1280 -h 960 -fps 30 -b 8000000 -o - | gst-launch-1.0 fdsrc ! "image/jpeg,framerate=40/1" ! jpegparse ! rtpjpegpay ! udpsink host=192.168.0.200 port=20000

4
TBF/Properties/AssemblyInfo.cs
View File

@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.5.1993.0")]
[assembly: AssemblyFileVersion("3.5.1993.0")]
[assembly: AssemblyVersion("3.5.1997.0")]
[assembly: AssemblyFileVersion("3.5.1997.0")]

6
TBF/Rig/Network/Camera/CLP1611/Camera.cs
View File

@ -156,8 +156,6 @@ namespace TBF.Rig.Network.Camera.CLP1611
NetAdapter = TbfComponents.FindComponent(cfg.ParentName, components) as GenericDevices.INetworkAdapter;
if (NetAdapter == null) throw new ArgumentNullException("no network adapter");
log.Warn(this.ToString());
}
@ -222,12 +220,12 @@ namespace TBF.Rig.Network.Camera.CLP1611
Telnet.Enqueue(new Telnet.Command(Network.Telnet.CmdAction.CLEAR_RESPONSE));
Telnet.Enqueue(new Telnet.Command(Network.Telnet.CmdAction.SEND_COMMAND, "sha1sum clp/*"));
log.FatalFormat("'{0}' with address {1} detected, IP = {2}, SD = {3}", Name, CameraCfg.HardwareAddress, ipAddress, sdCardVer);
log.FatalFormat("'{0}' detected: Id={1} addr={2} IP={3} SD={4}", Name, CameraIdx, CameraCfg.HardwareAddress, ipAddress, sdCardVer);
}
else
{
UiBridge.Bridge.OnCameraInfo(this.cameraIdx, string.Format("{0} s/n {1} was not detected", Name, CameraCfg.HardwareAddress));
log.FatalFormat("'{0}' with address {1} not detected", Name, CameraCfg.HardwareAddress);
log.FatalFormat("'{0}' NOT detected: Id={1} addr={2}", Name, CameraIdx, CameraCfg.HardwareAddress);
}
}

11
TBF/Rig/TestMethods/GrabImage/Component.cs
View File

@ -17,6 +17,10 @@ namespace TBF.Rig.TestMethods.GrabImage
public bool CanTest(MetersKind meters) { return true; }
public bool DoTransitions() { return false; }
public bool CheckDeviceCaps(Test test, OutputPath devices, out string message)
{
return GrabImageSeq.CheckDeviceCaps(test, devices, out message);
}
readonly GrabImageCfg cfg;
@ -51,13 +55,6 @@ namespace TBF.Rig.TestMethods.GrabImage
#endregion Configuration Change Handling
public bool CheckDeviceCaps(Test test, OutputPath devices, out string message)
{
message = string.Format("{0}: CheckDeviceCaps() is not implemented yet", Name);
return false;
}
public Component() { }
///
public Component(Generic.IComponentCfg cfg)

10
TBF/Rig/TestMethods/GrabImage/GrabImageSeq.cs
View File

@ -14,6 +14,16 @@ namespace TBF.Rig.TestMethods.GrabImage
{
private static readonly ILog log = LogManager.GetLogger(typeof(GrabImageSeq));
/// <summary>
/// Check capabilities of devces in the output path required for this test method
/// </summary>
/// <param name="devices">Devices</param>
/// <returns>true when capabilities of devices are OK</returns>
public static bool CheckDeviceCaps(Config.Entities.Test test, OutputPath devices, out string message)
{
message = string.Empty;
return true;
}
public IList<Event> Execute( Test test, GrabImageCfg cfg)
{

8
TBF/Rig/TestMethods/LiveStream/Component.cs
View File

@ -17,15 +17,13 @@ namespace TBF.Rig.TestMethods.LiveStream
public bool CanTest(MetersKind meters) { return true; }
public bool DoTransitions() { return false; }
readonly LiveStreamCfg myCfg;
public bool CheckDeviceCaps(Test test, OutputPath devices, out string message)
{
message = string.Format("{0}: CheckDeviceCaps() is not implemented yet", Name);
return false;
return LiveStreamSeq.CheckDeviceCaps(test, devices, out message);
}
readonly LiveStreamCfg myCfg;
public Component() { }
///
public Component(Generic.IComponentCfg cfg)

10
TBF/Rig/TestMethods/LiveStream/LiveStreamSeq.cs
View File

@ -13,6 +13,16 @@ namespace TBF.Rig.TestMethods.LiveStream
{
private static readonly ILog log = LogManager.GetLogger(typeof(LiveStreamSeq));
/// <summary>
/// Check capabilities of devces in the output path required for this test method
/// </summary>
/// <param name="devices">Devices</param>
/// <returns>true when capabilities of devices are OK</returns>
public static bool CheckDeviceCaps(Config.Entities.Test test, OutputPath devices, out string message)
{
message = string.Empty;
return true;
}
public IList<Event> Execute(Test test, LiveStreamCfg cfg)
{

25
TBF/TBF.csproj
View File

@ -3334,6 +3334,27 @@
<Content Include="CameraBinaryFiles\DiscoveryDaemon">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="CameraBinaryFiles2\DiscoveryDaemon">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="CameraBinaryFiles2\GrabImage">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="CameraBinaryFiles2\hrlivestream.sh">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="CameraBinaryFiles2\livestream.sh">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="CameraBinaryFiles2\Measurement">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="CameraBinaryFiles2\mjpegrtpstream.sh">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="CameraBinaryFiles2\RoiDetection">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<None Include="packages.config" />
<None Include="Properties\app.manifest">
<SubType>Designer</SubType>
@ -3481,9 +3502,7 @@
<Name>Results</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="CameraBinaryFiles2\" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.