Skip to content

Commit aaf5e9b

Browse files
committed
AVInput COM-RPC Support: Unit tests: Fixed setMixerLevels/getVRRFrameRateWrapper
1 parent 7d6994a commit aaf5e9b

File tree

2 files changed

+48
-2
lines changed

2 files changed

+48
-2
lines changed

AVInput/AVInputImplementation.cpp

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1122,6 +1122,51 @@ namespace Plugin {
11221122
return ret;
11231123
}
11241124

1125+
// <pca>
1126+
uint32_t AVInput::getVRRFrameRateWrapper(const JsonObject& parameters, JsonObject& response)
1127+
{
1128+
LOGINFOMETHOD();
1129+
returnIfParamNotFound(parameters, "portId");
1130+
string sPortId = parameters["portId"].String();
1131+
1132+
int portId = 0;
1133+
dsHdmiInVrrStatus_t vrrStatus;
1134+
vrrStatus.vrrAmdfreesyncFramerate_Hz = 0;
1135+
1136+
try {
1137+
portId = stoi(sPortId);
1138+
}catch (const std::exception& err) {
1139+
LOGWARN("sPortId invalid paramater: %s ", sPortId.c_str());
1140+
returnResponse(false);
1141+
}
1142+
1143+
bool result = getVRRStatus(portId, &vrrStatus);
1144+
if(result == true)
1145+
{
1146+
response["currentVRRVideoFrameRate"] = vrrStatus.vrrAmdfreesyncFramerate_Hz;
1147+
returnResponse(true);
1148+
}
1149+
else
1150+
{
1151+
returnResponse(false);
1152+
}
1153+
}
1154+
1155+
Core::hresult AVInputImplementation::GetVRRFrameRate(const int portId, double& currentVRRVideoFrameRate, bool& success)
1156+
{
1157+
dsHdmiInVrrStatus_t vrrStatus;
1158+
vrrStatus.vrrAmdfreesyncFramerate_Hz = 0;
1159+
1160+
success = getVRRStatus(portId, &vrrStatus);
1161+
if(success == true)
1162+
{
1163+
currentVRRVideoFrameRate = vrrStatus.vrrAmdfreesyncFramerate_Hz;
1164+
}
1165+
1166+
return Core::ERROR_NONE;
1167+
}
1168+
// </pca>
1169+
11251170
Core::hresult AVInputImplementation::GetRawSPD(const int portId, string& HDMISPD, bool& success)
11261171
{
11271172
LOGINFO("AVInputImplementation::getSPDInfo");
@@ -1206,7 +1251,7 @@ namespace Plugin {
12061251
return Core::ERROR_NONE;
12071252
}
12081253

1209-
Core::hresult AVInputImplementation::SetAudioMixerLevels(const int primaryVolume, const int inputVolume, SuccessResult& successResult)
1254+
Core::hresult AVInputImplementation::SetMixerLevels(const int primaryVolume, const int inputVolume, SuccessResult& successResult)
12101255
{
12111256
try {
12121257
device::Host::getInstance().setAudioMixerLevels(dsAUDIO_INPUT_PRIMARY, primaryVolume);

AVInput/AVInputImplementation.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,14 +162,15 @@ namespace Plugin {
162162
Core::hresult SetVRRSupport(const int portId, const bool vrrSupport) override;
163163
Core::hresult GetVRRSupport(const int portId, bool& vrrSupport) override;
164164
Core::hresult GetHdmiVersion(const int portId, string& HdmiCapabilityVersion, bool& success) override;
165-
Core::hresult SetAudioMixerLevels(const int primaryVolume, const int inputVolume, SuccessResult& successResult) override;
165+
Core::hresult SetMixerLevels(const int primaryVolume, const int inputVolume, SuccessResult& successResult) override;
166166
Core::hresult StartInput(const int portId, const int typeOfInput, const bool audioMix, const int planeType, const bool topMost, SuccessResult& successResult) override;
167167
Core::hresult StopInput(const int typeOfInput, SuccessResult& successResult) override;
168168
Core::hresult SetVideoRectangle(const uint16_t x, const uint16_t y, const uint16_t w, const uint16_t h, const uint16_t typeOfInput, SuccessResult& successResult) override;
169169
Core::hresult CurrentVideoMode(string& currentVideoMode, bool& success) override;
170170
Core::hresult ContentProtected(bool& isContentProtected, bool& success) override;
171171
Core::hresult GetSupportedGameFeatures(IStringIterator*& features, bool& success) override;
172172
Core::hresult GetGameFeatureStatus(const int portId, const string& gameFeature, bool& mode, bool& success) override;
173+
Core::hresult GetVRRFrameRate(const int portId, double& currentVRRVideoFrameRate, bool& success) override;
173174

174175
Core::hresult getInputDevices(const int typeOfInput, std::list<WPEFramework::Exchange::IAVInput::InputDevice>& inputDeviceList);
175176
void AVInputHotplug(int input, int connect, int type);

0 commit comments

Comments
 (0)