Skip to content

Commit fa169cf

Browse files
pahearn73pahearn73
committed
AVInput COM-RPC Support: WIP
1 parent c33dc80 commit fa169cf

File tree

1 file changed

+41
-41
lines changed

1 file changed

+41
-41
lines changed

‎AVInput/AVInputImplementation.cpp‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -562,23 +562,23 @@ namespace Plugin {
562562
try {
563563
id = stoi(portId);
564564
} catch (const std::exception& err) {
565-
LOGERR("StartInput: Invalid paramater: portId: %s ", portId);
565+
LOGERR("StartInput: Invalid paramater: portId: %s ", portId.c_str());
566566
return Core::ERROR_GENERAL;
567567
}
568568

569569
successResult.success = true;
570570

571571
try {
572572
if (strcmp(typeOfInput.c_str(), INPUT_TYPE_HDMI) == 0) {
573-
device::HdmiInput::getInstance().selectPort(portId, requestAudioMix, plane, topMost);
573+
device::HdmiInput::getInstance().selectPort(id, requestAudioMix, plane, topMost);
574574
} else if (strcmp(typeOfInput.c_str(), INPUT_TYPE_COMPOSITE) == 0) {
575-
device::CompositeInput::getInstance().selectPort(portId);
575+
device::CompositeInput::getInstance().selectPort(id);
576576
} else {
577577
LOGWARN("Invalid input type passed to StartInput");
578578
successResult.success = false;
579579
}
580580
} catch (const device::Exception& err) {
581-
LOG_DEVICE_EXCEPTION1(std::to_string(portId));
581+
LOG_DEVICE_EXCEPTION1(std::to_string(id));
582582
successResult.success = false;
583583
}
584584

@@ -709,7 +709,7 @@ namespace Plugin {
709709
try {
710710
id = stoi(portId);
711711
} catch (const std::exception& err) {
712-
LOGERR("WriteEDID: Invalid paramater: portId: %s ", portId);
712+
LOGERR("WriteEDID: Invalid paramater: portId: %s ", portId.c_str());
713713
return Core::ERROR_GENERAL;
714714
}
715715

@@ -725,15 +725,15 @@ namespace Plugin {
725725
try {
726726
id = stoi(portId);
727727
} catch (const std::exception& err) {
728-
LOGERR("ReadEDID: Invalid paramater: portId: %s ", portId);
728+
LOGERR("ReadEDID: Invalid paramater: portId: %s ", portId.c_str());
729729
return Core::ERROR_GENERAL;
730730
}
731731

732732
vector<uint8_t> edidVec({ 'u', 'n', 'k', 'n', 'o', 'w', 'n' });
733733

734734
try {
735735
vector<uint8_t> edidVec2;
736-
device::HdmiInput::getInstance().getEDIDBytesInfo(portId, edidVec2);
736+
device::HdmiInput::getInstance().getEDIDBytesInfo(id, edidVec2);
737737
edidVec = edidVec2; // edidVec must be "unknown" unless we successfully get to this line
738738

739739
// convert to base64
@@ -747,7 +747,7 @@ namespace Plugin {
747747
}
748748
Core::ToString((uint8_t*)&edidVec[0], size, true, EDID);
749749
} catch (const device::Exception& err) {
750-
LOG_DEVICE_EXCEPTION1(std::to_string(portId));
750+
LOG_DEVICE_EXCEPTION1(std::to_string(id));
751751
success = false;
752752
return Core::ERROR_NONE;
753753
}
@@ -1105,27 +1105,27 @@ namespace Plugin {
11051105
try {
11061106
id = stoi(portId);
11071107
} catch (const std::exception& err) {
1108-
LOGERR("GetGameFeatureStatus: Invalid paramater: portId: %s ", portId);
1108+
LOGERR("GetGameFeatureStatus: Invalid paramater: portId: %s ", portId.c_str());
11091109
return Core::ERROR_GENERAL;
11101110
}
11111111

11121112
if (gameFeature == STR_ALLM) {
1113-
mode = getALLMStatus(portId);
1113+
mode = getALLMStatus(id);
11141114
} else if (gameFeature == VRR_TYPE_HDMI) {
11151115
dsHdmiInVrrStatus_t vrrStatus;
1116-
getVRRStatus(portId, &vrrStatus);
1116+
getVRRStatus(id, &vrrStatus);
11171117
mode = (vrrStatus.vrrType == dsVRR_HDMI_VRR);
11181118
} else if (gameFeature == VRR_TYPE_FREESYNC) {
11191119
dsHdmiInVrrStatus_t vrrStatus;
1120-
getVRRStatus(portId, &vrrStatus);
1120+
getVRRStatus(id, &vrrStatus);
11211121
mode = (vrrStatus.vrrType == dsVRR_AMD_FREESYNC);
11221122
} else if (gameFeature == VRR_TYPE_FREESYNC_PREMIUM) {
11231123
dsHdmiInVrrStatus_t vrrStatus;
1124-
getVRRStatus(portId, &vrrStatus);
1124+
getVRRStatus(id, &vrrStatus);
11251125
mode = (vrrStatus.vrrType == dsVRR_AMD_FREESYNC_PREMIUM);
11261126
} else if (gameFeature == VRR_TYPE_FREESYNC_PREMIUM_PRO) {
11271127
dsHdmiInVrrStatus_t vrrStatus;
1128-
getVRRStatus(portId, &vrrStatus);
1128+
getVRRStatus(id, &vrrStatus);
11291129
mode = (vrrStatus.vrrType == dsVRR_AMD_FREESYNC_PREMIUM_PRO);
11301130
} else {
11311131
LOGWARN("AVInputImplementation::GetGameFeatureStatus Unsupported feature: %s", gameFeature.c_str());
@@ -1170,14 +1170,14 @@ namespace Plugin {
11701170
try {
11711171
id = stoi(portId);
11721172
} catch (const std::exception& err) {
1173-
LOGERR("GetVRRFrameRate: Invalid paramater: portId: %s ", portId);
1173+
LOGERR("GetVRRFrameRate: Invalid paramater: portId: %s ", portId.c_str());
11741174
return Core::ERROR_GENERAL;
11751175
}
11761176

11771177
dsHdmiInVrrStatus_t vrrStatus;
11781178
vrrStatus.vrrAmdfreesyncFramerate_Hz = 0;
11791179

1180-
success = getVRRStatus(portId, &vrrStatus);
1180+
success = getVRRStatus(id, &vrrStatus);
11811181
if(success == true)
11821182
{
11831183
currentVRRVideoFrameRate = vrrStatus.vrrAmdfreesyncFramerate_Hz;
@@ -1195,7 +1195,7 @@ namespace Plugin {
11951195
try {
11961196
id = stoi(portId);
11971197
} catch (const std::exception& err) {
1198-
LOGERR("GetRawSPD: Invalid paramater: portId: %s ", portId);
1198+
LOGERR("GetRawSPD: Invalid paramater: portId: %s ", portId.c_str());
11991199
return Core::ERROR_GENERAL;
12001200
}
12011201

@@ -1204,7 +1204,7 @@ namespace Plugin {
12041204
try {
12051205
LOGWARN("AVInputImplementation::getSPDInfo");
12061206
vector<uint8_t> spdVect2;
1207-
device::HdmiInput::getInstance().getHDMISPDInfo(portId, spdVect2);
1207+
device::HdmiInput::getInstance().getHDMISPDInfo(id, spdVect2);
12081208
spdVect = spdVect2; // spdVect must be "unknown" unless we successfully get to this line
12091209

12101210
// convert to base64
@@ -1224,7 +1224,7 @@ namespace Plugin {
12241224
}
12251225
Core::ToString((uint8_t*)&spdVect[0], size, false, HDMISPD);
12261226
} catch (const device::Exception& err) {
1227-
LOG_DEVICE_EXCEPTION1(std::to_string(portId));
1227+
LOG_DEVICE_EXCEPTION1(std::to_string(id));
12281228
success = false;
12291229
return Core::ERROR_NONE;
12301230
}
@@ -1240,7 +1240,7 @@ namespace Plugin {
12401240
try {
12411241
id = stoi(portId);
12421242
} catch (const std::exception& err) {
1243-
LOGERR("GetSPD: Invalid paramater: portId: %s ", portId);
1243+
LOGERR("GetSPD: Invalid paramater: portId: %s ", portId.c_str());
12441244
return Core::ERROR_GENERAL;
12451245
}
12461246

@@ -1250,7 +1250,7 @@ namespace Plugin {
12501250

12511251
try {
12521252
vector<uint8_t> spdVect2;
1253-
device::HdmiInput::getInstance().getHDMISPDInfo(portId, spdVect2);
1253+
device::HdmiInput::getInstance().getHDMISPDInfo(id, spdVect2);
12541254
spdVect = spdVect2; // edidVec must be "unknown" unless we successfully get to this line
12551255

12561256
// convert to base64
@@ -1279,7 +1279,7 @@ namespace Plugin {
12791279
HDMISPD = str;
12801280
}
12811281
} catch (const device::Exception& err) {
1282-
LOG_DEVICE_EXCEPTION1(std::to_string(portId));
1282+
LOG_DEVICE_EXCEPTION1(std::to_string(id));
12831283
success = false;
12841284
return Core::ERROR_NONE;
12851285
}
@@ -1311,17 +1311,17 @@ namespace Plugin {
13111311
try {
13121312
id = stoi(portId);
13131313
} catch (const std::exception& err) {
1314-
LOGERR("SetEdid2AllmSupport: Invalid paramater: portId: %s ", portId);
1314+
LOGERR("SetEdid2AllmSupport: Invalid paramater: portId: %s ", portId.c_str());
13151315
return Core::ERROR_GENERAL;
13161316
}
13171317

13181318
successResult.success = true;
13191319

13201320
try {
1321-
device::HdmiInput::getInstance().setEdid2AllmSupport(portId, allmSupport);
1321+
device::HdmiInput::getInstance().setEdid2AllmSupport(id, allmSupport);
13221322
LOGWARN("AVInput - allmsupport:%d", allmSupport);
13231323
} catch (const device::Exception& err) {
1324-
LOG_DEVICE_EXCEPTION1(std::to_string(portId));
1324+
LOG_DEVICE_EXCEPTION1(std::to_string(id));
13251325
successResult.success = false;
13261326
}
13271327

@@ -1335,7 +1335,7 @@ namespace Plugin {
13351335
try {
13361336
id = stoi(portId);
13371337
} catch (const std::exception& err) {
1338-
LOGERR("GetEdid2AllmSupport: Invalid paramater: portId: %s ", portId);
1338+
LOGERR("GetEdid2AllmSupport: Invalid paramater: portId: %s ", portId.c_str());
13391339
return Core::ERROR_GENERAL;
13401340
}
13411341

@@ -1359,17 +1359,17 @@ namespace Plugin {
13591359
try {
13601360
id = stoi(portId);
13611361
} catch (const std::exception& err) {
1362-
LOGERR("GetVRRSupport: Invalid paramater: portId: %s ", portId);
1362+
LOGERR("GetVRRSupport: Invalid paramater: portId: %s ", portId.c_str());
13631363
return Core::ERROR_GENERAL;
13641364
}
13651365

13661366
Core::hresult ret = Core::ERROR_NONE;
13671367

13681368
try {
1369-
device::HdmiInput::getInstance().getVRRSupport(portId, &vrrSupport);
1369+
device::HdmiInput::getInstance().getVRRSupport(id, &vrrSupport);
13701370
LOGINFO("AVInput - getVRRSupport:%d", vrrSupport);
13711371
} catch (const device::Exception& err) {
1372-
LOG_DEVICE_EXCEPTION1(std::to_string(portId));
1372+
LOG_DEVICE_EXCEPTION1(std::to_string(id));
13731373
ret = Core::ERROR_GENERAL;
13741374
}
13751375
return ret;
@@ -1382,16 +1382,16 @@ namespace Plugin {
13821382
try {
13831383
id = stoi(portId);
13841384
} catch (const std::exception& err) {
1385-
LOGERR("SetVRRSupport: Invalid paramater: portId: %s ", portId);
1385+
LOGERR("SetVRRSupport: Invalid paramater: portId: %s ", portId.c_str());
13861386
return Core::ERROR_GENERAL;
13871387
}
13881388

13891389
Core::hresult ret = Core::ERROR_NONE;
13901390
try {
1391-
device::HdmiInput::getInstance().setVRRSupport(portId, vrrSupport);
1391+
device::HdmiInput::getInstance().setVRRSupport(id, vrrSupport);
13921392
LOGWARN("AVInput - vrrSupport:%d", vrrSupport);
13931393
} catch (const device::Exception& err) {
1394-
LOG_DEVICE_EXCEPTION1(std::to_string(portId));
1394+
LOG_DEVICE_EXCEPTION1(std::to_string(id));
13951395
ret = Core::ERROR_GENERAL;
13961396
}
13971397
return ret;
@@ -1404,17 +1404,17 @@ namespace Plugin {
14041404
try {
14051405
id = stoi(portId);
14061406
} catch (const std::exception& err) {
1407-
LOGERR("GetHdmiVersion: Invalid paramater: portId: %s ", portId);
1407+
LOGERR("GetHdmiVersion: Invalid paramater: portId: %s ", portId.c_str());
14081408
return Core::ERROR_GENERAL;
14091409
}
14101410

14111411
dsHdmiMaxCapabilityVersion_t hdmiCapVersion = HDMI_COMPATIBILITY_VERSION_14;
14121412

14131413
try {
1414-
device::HdmiInput::getInstance().getHdmiVersion(portId, &hdmiCapVersion);
1414+
device::HdmiInput::getInstance().getHdmiVersion(id, &hdmiCapVersion);
14151415
LOGWARN("AVInputImplementation::GetHdmiVersion Hdmi Version:%d", hdmiCapVersion);
14161416
} catch (const device::Exception& err) {
1417-
LOG_DEVICE_EXCEPTION1(std::to_string(portId));
1417+
LOG_DEVICE_EXCEPTION1(std::to_string(id));
14181418
return Core::ERROR_NONE;
14191419
}
14201420

@@ -1451,7 +1451,7 @@ namespace Plugin {
14511451
try {
14521452
id = stoi(portId);
14531453
} catch (const std::exception& err) {
1454-
LOGERR("SetEdidVersion: Invalid paramater: portId: %s ", portId);
1454+
LOGERR("SetEdidVersion: Invalid paramater: portId: %s ", portId.c_str());
14551455
return Core::ERROR_GENERAL;
14561456
}
14571457

@@ -1469,10 +1469,10 @@ namespace Plugin {
14691469
}
14701470

14711471
try {
1472-
device::HdmiInput::getInstance().setEdidVersion(portId, edidVer);
1472+
device::HdmiInput::getInstance().setEdidVersion(id, edidVer);
14731473
LOGWARN("AVInputImplementation::setEdidVersion EDID Version: %s", edidVersion.c_str());
14741474
} catch (const device::Exception& err) {
1475-
LOG_DEVICE_EXCEPTION1(std::to_string(portId));
1475+
LOG_DEVICE_EXCEPTION1(std::to_string(id));
14761476
successResult.success = false;
14771477
}
14781478

@@ -1486,18 +1486,18 @@ namespace Plugin {
14861486
try {
14871487
id = stoi(portId);
14881488
} catch (const std::exception& err) {
1489-
LOGERR("GetEdidVersion: Invalid paramater: portId: %s ", portId);
1489+
LOGERR("GetEdidVersion: Invalid paramater: portId: %s ", portId.c_str());
14901490
return Core::ERROR_GENERAL;
14911491
}
14921492

14931493
success = true;
14941494
int version = -1;
14951495

14961496
try {
1497-
device::HdmiInput::getInstance().getEdidVersion(portId, &version);
1497+
device::HdmiInput::getInstance().getEdidVersion(id, &version);
14981498
LOGWARN("AVInputImplementation::getEdidVersion EDID Version:%d", version);
14991499
} catch (const device::Exception& err) {
1500-
LOG_DEVICE_EXCEPTION1(std::to_string(portId));
1500+
LOG_DEVICE_EXCEPTION1(std::to_string(id));
15011501
success = false;
15021502
return Core::ERROR_NONE;
15031503
}

0 commit comments

Comments
 (0)