diff options
Diffstat (limited to 'service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio')
8 files changed, 22 insertions, 20 deletions
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/AudioJitterBuffer.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/AudioJitterBuffer.h index 001588fc..2c592514 100644 --- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/AudioJitterBuffer.h +++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/AudioJitterBuffer.h @@ -36,7 +36,8 @@ public: uint32_t* pnTimestamp, bool* pbMark, uint32_t* pnSeqNum, uint32_t currentTime); private: - bool IsSID(uint8_t* pbBuffer, uint32_t nBufferSize); + bool IsSID(uint32_t nBufferSize); + bool Resync(uint32_t currentTime); void CollectRxRtpStatus(int32_t seq, kRtpPacketStatus status); void CollectJitterBufferStatus(int32_t currSize, int32_t maxSize); @@ -48,7 +49,6 @@ private: bool mEnforceUpdate; uint32_t mCannotGetCount; uint32_t mCurrPlayingTS; - uint16_t mCurrPlayingSeq; uint32_t mBaseTimestamp; uint32_t mBaseArrivalTime; uint32_t mCheckUpdateJitterPacketCnt; 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/audio/AudioStreamGraphRtcp.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/AudioStreamGraphRtcp.h index 9691826c..7253b035 100644 --- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/AudioStreamGraphRtcp.h +++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/AudioStreamGraphRtcp.h @@ -27,6 +27,7 @@ public: virtual ~AudioStreamGraphRtcp(); virtual ImsMediaResult create(RtpConfig* config); virtual ImsMediaResult update(RtpConfig* config); + virtual ImsMediaResult start(); virtual bool OnEvent(int32_t type, uint64_t param1, uint64_t param2); }; diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/MediaQualityAnalyzer.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/MediaQualityAnalyzer.h index f83ea088..feff4892 100644 --- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/MediaQualityAnalyzer.h +++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/MediaQualityAnalyzer.h @@ -256,6 +256,10 @@ protected: int32_t mCodecType; /** The codec attribute of the audio session, it could be bandwidth in evs codec */ int32_t mCodecAttribute; + /** Whether RTP is activated for the receiver or not */ + bool mIsRxRtpEnabled; + /** Whether RTCP is activated for both sender and receiver */ + bool mIsRtcpEnabled; /** The begin of the rx rtp packet sequence number for Rtcp-Xr report */ int32_t mBeginSeq; /** The end of the rx rtp packet sequence number for Rtcp-Xr report */ diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/nodes/AudioRtpPayloadDecoderNode.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/nodes/AudioRtpPayloadDecoderNode.h index 469ea586..c074f0be 100644 --- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/nodes/AudioRtpPayloadDecoderNode.h +++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/nodes/AudioRtpPayloadDecoderNode.h @@ -45,8 +45,8 @@ public: uint32_t arrivalTime = 0); private: - void DecodePayloadAmr(uint8_t* pData, uint32_t nDataSize, uint32_t nTimestamp, bool bMark, - uint32_t nSeqNum, uint32_t arrivalTime); + void DecodePayloadAmr(uint8_t* pData, uint32_t nDataSize, uint32_t nTimestamp, uint32_t nSeqNum, + uint32_t arrivalTime); void DecodePayloadEvs(uint8_t* pData, uint32_t nDataSize, uint32_t nTimeStamp, bool bMark, uint32_t nSeqNum, uint32_t arrivalTime); bool ProcessCMRForEVS(kRtpPyaloadHeaderMode eEVSPayloadHeaderMode, kEvsCmrCodeType cmr_t, diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/nodes/AudioRtpPayloadEncoderNode.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/nodes/AudioRtpPayloadEncoderNode.h index 28adc783..cc3be7f3 100644 --- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/nodes/AudioRtpPayloadEncoderNode.h +++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/nodes/AudioRtpPayloadEncoderNode.h @@ -38,7 +38,7 @@ public: virtual bool IsSameConfig(void* config); private: - void EncodePayloadAmr(uint8_t* pData, uint32_t nDataSize, uint32_t nTimestamp, bool bMark); + void EncodePayloadAmr(uint8_t* pData, uint32_t nDataSize, uint32_t nTimestamp); void EncodePayloadEvs(uint8_t* pData, uint32_t nDataSize, uint32_t nTimeStamp); uint32_t CheckPaddingNecessity(uint32_t nTotalSize); diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/nodes/IAudioPlayerNode.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/nodes/IAudioPlayerNode.h index cb41c0c6..afea1a56 100644 --- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/nodes/IAudioPlayerNode.h +++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/nodes/IAudioPlayerNode.h @@ -49,11 +49,12 @@ private: int32_t mCodecType; uint32_t mMode; ImsMediaCondition mCondition; - bool mFirstFrame; int8_t mEvsChannelAwOffset; kEvsBandwidth mEvsBandwidth; int8_t mSamplingRate; int32_t mEvsPayloadHeaderMode; + bool mIsDtxEnabled; + bool mIsOctetAligned; }; #endif diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/nodes/IAudioSourceNode.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/nodes/IAudioSourceNode.h index 1f5d8d6e..741556b0 100644 --- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/nodes/IAudioSourceNode.h +++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/audio/nodes/IAudioSourceNode.h @@ -68,6 +68,8 @@ public: int8_t mSamplingRate; int8_t mEvsChAwOffset; int32_t mMediaDirection; + bool mIsDtxEnabled; + bool mIsOctetAligned; }; #endif |