pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-02-13 11:44:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(wip): updates stream cec implementation to handle switchers with multiple outputs

Browse Source
This commit is contained in:
Jason DeVito
2023-09-12 10:09:37 -05:00
parent 4e33743f50
commit 27bac4e83d
1 changed files with 43 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
essentials-framework/Essentials DM/Essentials_DM/Chassis/HdPsXxxController.cs
View File

@@ -15,7 +15,7 @@ using PepperDash_Essentials_DM.Config;
namespace PepperDash_Essentials_DM.Chassis namespace PepperDash_Essentials_DM.Chassis
{ {
[Description("Wrapper class for all HdPsXxx switchers")] [Description("Wrapper class for all HdPsXxx switchers")]
public class HdPsXxxController : CrestronGenericBridgeableBaseDevice, IRoutingNumericWithFeedback, ICec, IHasHdmiInHdcp, IHasFeedback public class HdPsXxxController : CrestronGenericBridgeableBaseDevice, IRoutingNumericWithFeedback
{ {
private readonly HdPsXxx _chassis; private readonly HdPsXxx _chassis;
@@ -61,7 +61,7 @@ namespace PepperDash_Essentials_DM.Chassis
InputPorts = new RoutingPortCollection<RoutingInputPort>(); InputPorts = new RoutingPortCollection<RoutingInputPort>();
InputNameFeedbacks = new FeedbackCollection<StringFeedback>(); InputNameFeedbacks = new FeedbackCollection<StringFeedback>();
InputHdcpEnableFeedback = new FeedbackCollection<BoolFeedback>(); InputHdcpEnableFeedback = new FeedbackCollection<BoolFeedback>();
InputNames = new Dictionary<uint, string>(); InputNames = new Dictionary<uint, string>();
OutputPorts = new RoutingPortCollection<RoutingOutputPort>(); OutputPorts = new RoutingPortCollection<RoutingOutputPort>();
OutputNameFeedbacks = new FeedbackCollection<StringFeedback>(); OutputNameFeedbacks = new FeedbackCollection<StringFeedback>();
@@ -79,8 +79,6 @@ namespace PepperDash_Essentials_DM.Chassis
OutputNames = props.Outputs; OutputNames = props.Outputs;
SetupOutputs(OutputNames); SetupOutputs(OutputNames);
//AddPostActivationAction();
} }
// input setup // input setup
@@ -102,19 +100,19 @@ namespace PepperDash_Essentials_DM.Chassis
var index = item.Number; var index = item.Number;
var key = string.Format("hdmiIn{0}", index); var key = string.Format("hdmiIn{0}", index);
var name = string.IsNullOrEmpty(InputNames[index]) ? string.Format("HDMI Input {0}", index) : InputNames[index]; var name = string.IsNullOrEmpty(InputNames[index]) ? string.Format("HDMI Input {0}", index) : InputNames[index];
InputNameFeedbacks.Add(new StringFeedback(name, () => InputNames[index])); InputNameFeedbacks.Add(new StringFeedback(name, () => InputNames[index]));
var port = new RoutingInputPort(key, eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, input, this) var port = new RoutingInputPort(key, eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, input, this)
{ {
FeedbackMatchObject = input FeedbackMatchObject = input
}; };
Debug.Console(1, this, "Adding HDMI Input port: {0}", port.Key); Debug.Console(1, this, "Adding Input port: {0}", port.Key);
InputPorts.Add(port); InputPorts.Add(port);
InputHdcpEnableFeedback.Add(new BoolFeedback(name, () => input.InputPort.HdcpSupportOnFeedback.BoolValue)); InputHdcpEnableFeedback.Add(new BoolFeedback(name, () => input.InputPort.HdcpSupportOnFeedback.BoolValue));
VideoInputSyncFeedbacks.Add(new BoolFeedback(name, () => input.VideoDetectedFeedback.BoolValue)); VideoInputSyncFeedbacks.Add(new BoolFeedback(name, () => input.VideoDetectedFeedback.BoolValue));
} }
foreach (var item in _chassis.DmLiteInputs) foreach (var item in _chassis.DmLiteInputs)
@@ -127,13 +125,13 @@ namespace PepperDash_Essentials_DM.Chassis
InputNameFeedbacks.Add(new StringFeedback(name, () => InputNames[index])); InputNameFeedbacks.Add(new StringFeedback(name, () => InputNames[index]));
var port = new RoutingInputPort(name, eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, input, this) var port = new RoutingInputPort(key, eRoutingSignalType.AudioVideo, eRoutingPortConnectionType.Hdmi, input, this)
{ {
FeedbackMatchObject = input FeedbackMatchObject = input
}; };
Debug.Console(0, this, "Adding DM Input port: {0}",port.Key); Debug.Console(0, this, "Adding Input port: {0}", port.Key);
InputPorts.Add(port); InputPorts.Add(port);
InputHdcpEnableFeedback.Add(new BoolFeedback(name, () => input.InputPort.HdcpSupportOnFeedback.BoolValue)); InputHdcpEnableFeedback.Add(new BoolFeedback(name, () => input.InputPort.HdcpSupportOnFeedback.BoolValue));
VideoInputSyncFeedbacks.Add(new BoolFeedback(name, () => input.VideoDetectedFeedback.BoolValue)); VideoInputSyncFeedbacks.Add(new BoolFeedback(name, () => input.VideoDetectedFeedback.BoolValue));
@@ -169,15 +167,35 @@ namespace PepperDash_Essentials_DM.Chassis
// set port for CEC // set port for CEC
Port = output Port = output
}; };
Debug.Console(0, this, "Adding HdmiDmLite Output port: {0} {1}", Debug.Console(0, this, "Adding Output port: {0}", port.Key);
port.Key, port.ParentDevice);
OutputPorts.Add(port); OutputPorts.Add(port);
OutputRouteNameFeedback.Add(new StringFeedback(name, () => output.VideoOutFeedback.NameFeedback.StringValue)); OutputRouteNameFeedback.Add(new StringFeedback(name, () => output.VideoOutFeedback.NameFeedback.StringValue));
VideoOutputRouteFeedbacks.Add(new IntFeedback(name, () => output.VideoOutFeedback == null ? 0 : (int)output.VideoOutFeedback.Number)); VideoOutputRouteFeedbacks.Add(new IntFeedback(name, () => output.VideoOutFeedback == null ? 0 : (int)output.VideoOutFeedback.Number));
// TODO [ ] Investigate setting input priorities per output
// {{in1-priority-level}, {in2-priority-level}, .... {in6-priority-level}}
// default priority level input 1-4 ascending
output.OutputPort.InputPriorities(new byte[] { 1, 2, 3, 4 });
if (port.Port == null) continue;
var hdmiOutputStreamCec = output.HdmiOutput.HdmiOutputPort.StreamCec;
if (hdmiOutputStreamCec != null)
{
var streamCec = new StreamCecWrapper(string.Format("{0}-hdmiOut{1}-streamCec", Key, index), hdmiOutputStreamCec);
DeviceManager.AddDevice(streamCec);
}
var dmLiteOutputStreamCec = output.DmLiteOutput.DmLiteOutputPort.StreamCec;
if (dmLiteOutputStreamCec != null)
{
var streamCec = new StreamCecWrapper(string.Format("{0}-dmLiteOut{1}-streamCec", Key, index), dmLiteOutputStreamCec);
DeviceManager.AddDevice(streamCec);
}
} }
_chassis.DMOutputChange += _chassis_OutputChange; _chassis.DMOutputChange += _chassis_OutputChange;
} }
@@ -263,7 +281,7 @@ namespace PepperDash_Essentials_DM.Chassis
} }
#endregion #endregion
/// <summary> /// <summary>
/// Executes a device switch using objects /// Executes a device switch using objects
@@ -450,7 +468,7 @@ namespace PepperDash_Essentials_DM.Chassis
} }
#endregion #endregion
#region Factory #region Factory
@@ -508,26 +526,18 @@ namespace PepperDash_Essentials_DM.Chassis
#endregion #endregion
}
// TODO [ ] Implement CEC control
// return _chassis.HdmiDmLiteOutputs[0].DmLiteOutput.DmLiteOutputPort.StreamCec; public class StreamCecWrapper : IKeyed, ICec
public Cec StreamCec {
public string Key { get; private set; }
public Cec StreamCec { get; private set; }
public StreamCecWrapper(string key, Cec streamCec)
{ {
get Key = key;
{ StreamCec = streamCec;
return _chassis.NumberOfOutputs == 1
//? _chassis.HdmiDmLiteOutputs[0].DmLiteOutput.DmLiteOutputPort.StreamCec
? _chassis.HdmiDmLiteOutputs[0].HdmiOutput.HdmiOutputPort.StreamCec
: null;
}
} }
public IntFeedback HdmiInHdcpStateFeedback { get; private set; }
public void SetHdmiInHdcpState(eHdcpCapabilityType hdcpState)
{
throw new NotImplementedException();
}
public eHdcpCapabilityType HdmiInHdcpCapability { get; private set; }
} }
} }