diff options
Diffstat (limited to 'service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include')
7 files changed, 17 insertions, 25 deletions
diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/BaseJitterBuffer.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/BaseJitterBuffer.h index 1883aecf..76225875 100644 --- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/BaseJitterBuffer.h +++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/BaseJitterBuffer.h @@ -41,8 +41,8 @@ public: */ virtual void SetCodecType(uint32_t type); virtual void SetJitterBufferSize(uint32_t nInit, uint32_t nMin, uint32_t nMax); - virtual void SetJitterOptions(uint32_t nReduceTH, uint32_t nStepSize, double zValue, - bool bIgnoreSID, bool bImprovement); + virtual void SetJitterOptions( + uint32_t nReduceTH, uint32_t nStepSize, double zValue, bool bIgnoreSID); virtual uint32_t GetCount(); virtual void Reset(); virtual void Delete(); @@ -62,6 +62,7 @@ public: */ virtual void Add(ImsMediaSubType subtype, uint8_t* data, uint32_t dataSize, uint32_t timestamp, bool mark, uint32_t seq, + /** TODO: remove deprecated argument dataType */ ImsMediaSubType dataType = ImsMediaSubType::MEDIASUBTYPE_UNDEFINED, uint32_t arrivalTime = 0) = 0; @@ -75,11 +76,10 @@ public: * @param timestamp The timestamp of data, it can be milliseconds unit or rtp timestamp unit * @param mark It is true when the data has marker bit set * @param seq The sequence number of data. it is 0 when there is no valid sequence number set - * @param pnChecker + * @param currentTime The current timestamp of this method invoked with milliseconds unit */ virtual bool Get(ImsMediaSubType* psubtype, uint8_t** ppData, uint32_t* pnDataSize, - uint32_t* ptimestamp, bool* pmark, uint32_t* pnSeqNum, - uint32_t* pnChecker = nullptr) = 0; + uint32_t* ptimestamp, bool* pmark, uint32_t* pnSeqNum, uint32_t currentTime) = 0; protected: BaseSessionCallback* mCallback; diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/ImsMediaDefine.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/ImsMediaDefine.h index a445059e..045051c1 100644 --- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/ImsMediaDefine.h +++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/ImsMediaDefine.h @@ -26,10 +26,6 @@ #define USHORT_SEQ_ROUND_COMPARE(a, b) \ ((((a) >= (b)) && (((b) >= SEQ_ROUND_QUARD) || (((a) <= 0xffff - SEQ_ROUND_QUARD)))) || \ (((a) <= SEQ_ROUND_QUARD) && ((b) >= 0xffff - SEQ_ROUND_QUARD))) -#define TS_ROUND_QUARD 3000 -#define USHORT_TS_ROUND_COMPARE(a, b) \ - (((a) >= (b) && (b) >= TS_ROUND_QUARD) || ((a) <= 0xffff - TS_ROUND_QUARD) || \ - ((a) <= TS_ROUND_QUARD && (b) >= 0xffff - TS_ROUND_QUARD)) #define IMS_MEDIA_WORD_SIZE 4 using namespace android::telephony::imsmedia; 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 2ab210ce..001588fc 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 @@ -27,38 +27,32 @@ public: virtual ~AudioJitterBuffer(); virtual void Reset(); virtual void SetJitterBufferSize(uint32_t nInit, uint32_t nMin, uint32_t nMax); - void SetJitterOptions(uint32_t nReduceTH, uint32_t nStepSize, double zValue, bool bIgnoreSID, - bool bImprovement); + void SetJitterOptions(uint32_t nReduceTH, uint32_t nStepSize, double zValue, bool bIgnoreSID); virtual void Add(ImsMediaSubType subtype, uint8_t* pbBuffer, uint32_t nBufferSize, uint32_t nTimestamp, bool bMark, uint32_t nSeqNum, ImsMediaSubType nDataType = ImsMediaSubType::MEDIASUBTYPE_UNDEFINED, uint32_t arrivalTime = 0); virtual bool Get(ImsMediaSubType* psubtype, uint8_t** ppData, uint32_t* pnDataSize, - uint32_t* pnTimestamp, bool* pbMark, uint32_t* pnSeqNum, uint32_t* pnChecker = nullptr); + uint32_t* pnTimestamp, bool* pbMark, uint32_t* pnSeqNum, uint32_t currentTime); private: bool IsSID(uint8_t* pbBuffer, uint32_t nBufferSize); void CollectRxRtpStatus(int32_t seq, kRtpPacketStatus status); void CollectJitterBufferStatus(int32_t currSize, int32_t maxSize); - JitterNetworkAnalyser mJitterAnalyser; + JitterNetworkAnalyser mJitterAnalyzer; bool mDtxOn; - bool mBufferImprovement; bool mBufferIgnoreSIDPacket; bool mNeedToUpdateBasePacket; - bool mIsReceivedFirst; bool mWaiting; - bool mFourceToUpdateJitterBuffer; - uint32_t mCanNotGetCount; + bool mEnforceUpdate; + uint32_t mCannotGetCount; uint32_t mCurrPlayingTS; uint16_t mCurrPlayingSeq; uint32_t mBaseTimestamp; uint32_t mBaseArrivalTime; - uint32_t mNullDataCount; - uint32_t mUpdateJitterBufferSize; uint32_t mCheckUpdateJitterPacketCnt; uint32_t mCurrJitterBufferSize; - uint32_t mBufferUpdateDuration; uint32_t mSIDCount; uint32_t mDeleteCount; uint32_t mNextJitterBufferSize; 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 29f0bb48..f83ea088 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 @@ -229,6 +229,7 @@ protected: */ void processData(const int32_t timeCount); void processMediaQuality(); + void notifyCallQuality(); void notifyMediaQualityStatus(); void AddEvent(uint32_t event, uint64_t paramA, uint64_t paramB); void processEvent(uint32_t event, uint64_t paramA, uint64_t paramB); @@ -247,6 +248,8 @@ protected: std::list<LostPacket*> mListLostPacket; /** The list of the packets sent */ std::list<RtpPacket*> mListTxPacket; + /** The time of call started in milliseconds unit*/ + int32_t mTimeStarted; /** The ssrc of the receiving Rtp stream to identify */ int32_t mSSRC; /** The codec type of the audio session retrieved from the AudioConfig.h */ diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/nodes/JitterBufferControlNode.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/nodes/JitterBufferControlNode.h index e794ce13..68ee9db1 100644 --- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/nodes/JitterBufferControlNode.h +++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/nodes/JitterBufferControlNode.h @@ -27,8 +27,7 @@ public: BaseSessionCallback* callback = nullptr, ImsMediaType type = IMS_MEDIA_AUDIO); virtual ~JitterBufferControlNode(); void SetJitterBufferSize(uint32_t nInit, uint32_t nMin, uint32_t nMax); - void SetJitterOptions(uint32_t nReduceTH, uint32_t nStepSize, double zValue, bool bIgnoreSID, - bool bImprovement); + void SetJitterOptions(uint32_t nReduceTH, uint32_t nStepSize, double zValue, bool bIgnoreSID); void Reset(); virtual uint32_t GetDataCount(); virtual void OnDataFromFrontNode(ImsMediaSubType subtype, uint8_t* pData, uint32_t nDataSize, diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/text/TextJitterBuffer.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/text/TextJitterBuffer.h index 0cab794c..f744d5fc 100644 --- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/text/TextJitterBuffer.h +++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/text/TextJitterBuffer.h @@ -30,7 +30,7 @@ public: ImsMediaSubType dataType = ImsMediaSubType::MEDIASUBTYPE_UNDEFINED, uint32_t arrivalTime = 0); virtual bool Get(ImsMediaSubType* subtype, uint8_t** data, uint32_t* dataSize, - uint32_t* timestamp, bool* mark, uint32_t* seqNum, uint32_t* checker = nullptr); + uint32_t* timestamp, bool* mark, uint32_t* seqNum, uint32_t currentTime); virtual void Delete(); }; diff --git a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/video/VideoJitterBuffer.h b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/video/VideoJitterBuffer.h index 9319e3fd..104b7cea 100644 --- a/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/video/VideoJitterBuffer.h +++ b/service/src/com/android/telephony/imsmedia/lib/libimsmedia/core/include/video/VideoJitterBuffer.h @@ -44,8 +44,8 @@ public: virtual void Add(ImsMediaSubType subtype, uint8_t* pbBuffer, uint32_t nBufferSize, uint32_t nTimeStamp, bool mark, uint32_t nSeqNum, ImsMediaSubType nDataType, uint32_t arrivalTime); - virtual bool Get(ImsMediaSubType* pImsMediaSubType, uint8_t** ppData, uint32_t* pnDataSize, - uint32_t* pnTimeStamp, bool* pmark, uint32_t* pnSeqNum, uint32_t* pnChecker = nullptr); + virtual bool Get(ImsMediaSubType* psubtype, uint8_t** ppData, uint32_t* pnDataSize, + uint32_t* ptimestamp, bool* pmark, uint32_t* pnSeqNum, uint32_t currentTime); /** * @brief Set the video codec type |