From 3489019deffff95ec5dd49ef96eed1ec0e58d738 Mon Sep 17 00:00:00 2001 From: smanes0213 Date: Thu, 31 Jul 2025 16:14:11 +0530 Subject: [PATCH 1/2] RDKEMW-6331 : Fix HdmiCecSink COM-RPC issues Signed-off-by: smanes0213 --- ccec/include/ccec/MessageProcessor.hpp | 6 +++--- ccec/include/ccec/Messages.hpp | 14 +++++++------- tests/CECMonitor.cpp | 8 ++++---- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ccec/include/ccec/MessageProcessor.hpp b/ccec/include/ccec/MessageProcessor.hpp index cc0783f1..92ea2450 100644 --- a/ccec/include/ccec/MessageProcessor.hpp +++ b/ccec/include/ccec/MessageProcessor.hpp @@ -64,11 +64,11 @@ class MessageProcessor virtual void process (const InActiveSource &msg, const Header &header) {header.print();msg.print();} virtual void process (const ImageViewOn &msg, const Header &header) {header.print();msg.print();} virtual void process (const TextViewOn &msg, const Header &header) {header.print();msg.print();} - virtual void process (const RequestActiveSource &msg, const Header &header) {header.print();msg.print();} + virtual void process (const RequestActiveSourceMessage &msg, const Header &header) {header.print();msg.print();} virtual void process (const Standby &msg, const Header &header) {header.print();msg.print();} virtual void process (const GetCECVersion &msg, const Header &header) {header.print();msg.print();} virtual void process (const CECVersion &msg, const Header &header) {header.print();msg.print();} - virtual void process (const SetMenuLanguage &msg, const Header &header) {header.print();msg.print();} + virtual void process (const SetMenuLanguageMessage &msg, const Header &header) {header.print();msg.print();} virtual void process (const GiveOSDName &msg, const Header &header) {header.print();msg.print();} virtual void process (const GivePhysicalAddress &msg, const Header &header) {header.print();msg.print();} virtual void process (const GiveDeviceVendorID &msg, const Header &header) {header.print();msg.print();} @@ -89,7 +89,7 @@ class MessageProcessor virtual void process (const Polling &msg, const Header &header) {header.print();msg.print();} virtual void process (const InitiateArc &msg, const Header &header) {header.print();msg.print();} virtual void process (const TerminateArc &msg, const Header &header) {header.print();msg.print();} - virtual void process (const RequestShortAudioDescriptor &msg,const Header &header) {header.print();msg.print();} + virtual void process (const RequestShortAudioDescriptorMessage &msg,const Header &header) {header.print();msg.print();} virtual void process (const ReportShortAudioDescriptor &msg, const Header &header) {header.print();msg.print();} virtual void process (const SystemAudioModeRequest &msg , const Header &header) {header.print();msg.print();} virtual void process (const SetSystemAudioMode &msg , const Header &header) {header.print();msg.print();} diff --git a/ccec/include/ccec/Messages.hpp b/ccec/include/ccec/Messages.hpp index a4f89fc4..50392fed 100644 --- a/ccec/include/ccec/Messages.hpp +++ b/ccec/include/ccec/Messages.hpp @@ -146,7 +146,7 @@ class InActiveSource : public DataBlock PhysicalAddress physicalAddress; }; -class RequestActiveSource : public DataBlock +class RequestActiveSourceMessage : public DataBlock { public: Op_t opCode(void) const {return REQUEST_ACTIVE_SOURCE;} @@ -187,15 +187,15 @@ class CECVersion : public DataBlock Version version; }; -class SetMenuLanguage : public DataBlock +class SetMenuLanguageMessage : public DataBlock { public: Op_t opCode(void) const {return SET_MENU_LANGUAGE;} - SetMenuLanguage(const Language &language) : language(language) {}; + SetMenuLanguageMessage(const Language &language) : language(language) {}; - SetMenuLanguage(const CECFrame &frame, int startPos = 0) + SetMenuLanguageMessage(const CECFrame &frame, int startPos = 0) : language(frame, startPos) { } @@ -463,13 +463,13 @@ class SetStreamPath: public DataBlock PhysicalAddress toSink; }; -class RequestShortAudioDescriptor : public DataBlock +class RequestShortAudioDescriptorMessage : public DataBlock { public: Op_t opCode(void) const {return REQUEST_SHORT_AUDIO_DESCRIPTOR;} - RequestShortAudioDescriptor(const std::vector formatid, const std::vector audioFormatCode, uint8_t number_of_descriptor = 1) + RequestShortAudioDescriptorMessage(const std::vector formatid, const std::vector audioFormatCode, uint8_t number_of_descriptor = 1) { uint8_t audioFormatIdCode; numberofdescriptor = number_of_descriptor > 4 ? 4 : number_of_descriptor; @@ -480,7 +480,7 @@ class RequestShortAudioDescriptor : public DataBlock } } /* called by the messaged_decoder */ - RequestShortAudioDescriptor(const CECFrame &frame, int startPos = 0) + RequestShortAudioDescriptorMessage(const CECFrame &frame, int startPos = 0) { uint8_t len = frame.length(); numberofdescriptor = len > 4 ? 4:len; diff --git a/tests/CECMonitor.cpp b/tests/CECMonitor.cpp index 6beb6957..ad576077 100644 --- a/tests/CECMonitor.cpp +++ b/tests/CECMonitor.cpp @@ -87,10 +87,10 @@ class TestCecProcessor : public MessageProcessor printHeader(header); printf("Command: TextViewOn\n"); } - void process (const RequestActiveSource &msg, const Header &header) + void process (const RequestActiveSourceMessage &msg, const Header &header) { printHeader(header); - printf("Command: RequestActiveSource\n"); + printf("Command: RequestActiveSourceMessage\n"); } void process (const Standby &msg, const Header &header) { @@ -108,10 +108,10 @@ class TestCecProcessor : public MessageProcessor printf("Command: CECVersion\n"); printf("Version : %s \n",msg.version.toString().c_str()); } - void process (const SetMenuLanguage &msg, const Header &header) + void process (const SetMenuLanguageMessage &msg, const Header &header) { printHeader(header); - printf("Command: SetMenuLanguage\n"); + printf("Command: SetMenuLanguageMessage\n"); printf("Language : %s \n",msg.language.toString().c_str()); } void process (const GiveOSDName &msg, const Header &header) From adadeeefb18a302f55f74b20d3bf6ef4112efd88 Mon Sep 17 00:00:00 2001 From: Sankalp Maneshwar Date: Tue, 5 Aug 2025 12:22:50 +0530 Subject: [PATCH 2/2] Update MessageDecoder.cpp --- ccec/src/MessageDecoder.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ccec/src/MessageDecoder.cpp b/ccec/src/MessageDecoder.cpp index 95287d63..734fd5e9 100644 --- a/ccec/src/MessageDecoder.cpp +++ b/ccec/src/MessageDecoder.cpp @@ -69,7 +69,7 @@ void MessageDecoder::decode(const CECFrame &in_) processor.process(TextViewOn(), header); break; case REQUEST_ACTIVE_SOURCE: - processor.process(RequestActiveSource(), header); + processor.process(RequestActiveSourceMessage(), header); break; case STANDBY: CCEC_LOG( LOG_DEBUG, "Decoding STANDBY\r\n"); @@ -82,7 +82,7 @@ void MessageDecoder::decode(const CECFrame &in_) processor.process(CECVersion(in), header); break; case SET_MENU_LANGUAGE: - processor.process(SetMenuLanguage(in), header); + processor.process(SetMenuLanguageMessage(in), header); break; case GIVE_OSD_NAME: processor.process(GiveOSDName(), header); @@ -154,7 +154,7 @@ void MessageDecoder::decode(const CECFrame &in_) processor.process(TerminateArc(), header); break; case REQUEST_SHORT_AUDIO_DESCRIPTOR: - processor.process(RequestShortAudioDescriptor(in), header); + processor.process(RequestShortAudioDescriptorMessage(in), header); break; case REPORT_SHORT_AUDIO_DESCRIPTOR: