diff options
Diffstat (limited to 'service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include')
4 files changed, 11 insertions, 31 deletions
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/AudioManager.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/AudioManager.h index 231b4141..d2a0e441 100644 --- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/AudioManager.h +++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/AudioManager.h @@ -37,10 +37,6 @@ public: */ class RequestHandler : public ImsMediaEventHandler { - public: - RequestHandler(); - virtual ~RequestHandler(); - protected: virtual void processEvent( uint32_t event, uint64_t sessionId, uint64_t paramA, uint64_t paramB); @@ -51,10 +47,6 @@ public: */ class ResponseHandler : public ImsMediaEventHandler { - public: - ResponseHandler(); - virtual ~ResponseHandler(); - protected: virtual void processEvent( uint32_t event, uint64_t sessionId, uint64_t paramA, uint64_t paramB); @@ -63,20 +55,22 @@ public: static AudioManager* getInstance(); virtual int getState(int sessionId); virtual void sendMessage(const int sessionId, const android::Parcel& parcel); - void SendInternalEvent(uint32_t event, uint64_t sessionId, uint64_t paramA, uint64_t paramB); -private: +protected: AudioManager(); virtual ~AudioManager(); ImsMediaResult openSession(int sessionId, int rtpFd, int rtcpFd, AudioConfig* config); ImsMediaResult closeSession(int sessionId); ImsMediaResult modifySession(int sessionId, AudioConfig* config); ImsMediaResult addConfig(int sessionId, AudioConfig* config); - ImsMediaResult deleteConfig(int sessionId, AudioConfig* config); + virtual ImsMediaResult deleteConfig(int sessionId, AudioConfig* config); ImsMediaResult confirmConfig(int sessionId, AudioConfig* config); - void sendDtmf(int sessionId, char dtmfDigit, int duration); - void sendRtpHeaderExtension(int sessionId, std::list<RtpHeaderExtension>* listExtension); - void setMediaQualityThreshold(int sessionId, MediaQualityThreshold* threshold); + virtual void sendDtmf(int sessionId, char dtmfDigit, int duration); + virtual void sendRtpHeaderExtension( + int sessionId, std::list<RtpHeaderExtension>* listExtension); + virtual void setMediaQualityThreshold(int sessionId, MediaQualityThreshold* threshold); + virtual void SendInternalEvent( + uint32_t event, uint64_t sessionId, uint64_t paramA, uint64_t paramB); static AudioManager* sManager; std::unordered_map<int, std::unique_ptr<AudioSession>> mSessions; diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/text/TextManager.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/text/TextManager.h index 66201daa..67b24ed3 100644 --- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/text/TextManager.h +++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/text/TextManager.h @@ -37,10 +37,6 @@ public: */ class RequestHandler : public ImsMediaEventHandler { - public: - RequestHandler(); - virtual ~RequestHandler(); - protected: virtual void processEvent( uint32_t event, uint64_t sessionId, uint64_t paramA, uint64_t paramB); @@ -51,10 +47,6 @@ public: */ class ResponseHandler : public ImsMediaEventHandler { - public: - ResponseHandler(); - virtual ~ResponseHandler(); - protected: virtual void processEvent( uint32_t event, uint64_t sessionId, uint64_t paramA, uint64_t paramB); diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/utils/ImsMediaEventHandler.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/utils/ImsMediaEventHandler.h index 4e5dc7f0..e01761da 100644 --- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/utils/ImsMediaEventHandler.h +++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/utils/ImsMediaEventHandler.h @@ -46,8 +46,10 @@ private: std::mutex mMutexEvent; public: - ImsMediaEventHandler(const char* strName); + ImsMediaEventHandler(); virtual ~ImsMediaEventHandler(); + void Init(const char* strName); + void Deinit(); static void SendEvent(const char* strEventHandlerName, uint32_t event, uint64_t paramA, uint64_t paramB = 0, uint64_t paramC = 0); char* getName(); diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/video/VideoManager.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/video/VideoManager.h index 7c780fd0..91c2747b 100644 --- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/video/VideoManager.h +++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/video/VideoManager.h @@ -37,10 +37,6 @@ public: */ class RequestHandler : public ImsMediaEventHandler { - public: - RequestHandler(); - virtual ~RequestHandler(); - protected: virtual void processEvent( uint32_t event, uint64_t sessionId, uint64_t paramA, uint64_t paramB); @@ -51,10 +47,6 @@ public: */ class ResponseHandler : public ImsMediaEventHandler { - public: - ResponseHandler(); - virtual ~ResponseHandler(); - protected: virtual void processEvent( uint32_t event, uint64_t sessionId, uint64_t paramA, uint64_t paramB); |