diff --git a/amp/src/ddl/comp_clk/source/clk_avsync.c b/amp/src/ddl/comp_clk/source/clk_avsync.c index dd50552..739a6e2 100755 --- a/amp/src/ddl/comp_clk/source/clk_avsync.c +++ b/amp/src/ddl/comp_clk/source/clk_avsync.c @@ -4461,8 +4461,22 @@ HRESULT sideband_check_video_pts(AVSYNC_MGR *pSyncMgr, pSyncMgr->m_iSyncAdjCnt = 0; } _Exit: - avsync_mgr_log(pSyncMgr, pStream, hBD, pBDInfo, NULL, eAct, uiTime, - uiOrigSTC, uiDelay); + AVSU1("[AVS][%d]CHECK_%s([%c][%c] V:0x%08x(%d), M:0x%08x(%d)[%d], " + "AM:0x%08x, AM-V:%d)%s, usrdelay %d ms\n", + pSyncMgr->m_pAVClock->m_uiClockID, + pStream->m_szName, + pszSyncChar[pSyncMgr->m_eSyncStatus], + pszActChar[eAct], pBDInfo ? (UINT32)pBDInfo->m_uiPtsStart : 0, + pBDInfo ? (INT32)(pBDInfo->m_uiPtsStart - pStream->m_uiLastCheckPts): 0, + (UINT32)uiOrigSTC, (UINT32)(uiOrigSTC - pStream->m_uiLastCheckStc), + uiTime - pStream->m_uiLastCheckTime, + (UINT32)uiSTC, pBDInfo ? (UINT32)PTS64_DIFF_WRAP(uiSTC, pBDInfo->m_uiPtsStart) : 0, + (pBDInfo && pBDInfo->m_fEosReached) ? "--EOS" : "", + pStream->m_iUsrDelay/90); + + pStream->m_uiLastCheckStc = uiOrigSTC; + pStream->m_uiLastCheckTime = uiTime; + if (pBDInfo) pStream->m_uiLastCheckPts = pBDInfo->m_uiPtsStart; if ((AMP_CLK_HOLD != eAct) && pBDInfo) { pStream->m_uiBuffedTime -= pBDInfo->m_uiDuration; @@ -4492,7 +4506,7 @@ HRESULT sideband_check_audio_pts(AVSYNC_MGR *pSyncMgr, AMP_CLK_ACT *pAction, AMP_CLK_DROP_INFO *pDropInfo) { BD_INFO *pBDInfo = 0; - AMP_CLK_ACT eAct; + AMP_CLK_ACT eActP, eActN, eActL, eAct; UINT64 uiSTC = 0; UINT32 uiTime = 0, uiRateDen; INT32 iRateNum; @@ -4507,6 +4521,7 @@ HRESULT sideband_check_audio_pts(AVSYNC_MGR *pSyncMgr, pAudInfo = (AMP_CLK_AREN_INFO *)pRndInfo->m_pPrivData; eAct = AMP_CLK_DISP; + eActP = eActN = eActL = AMP_CLK_ACT_MAX; pBDInfo = stream_resync_to_bd(pStream, hBD); if (pSyncMgr->m_eSyncStatus == SYNC_DISABLED) { @@ -4545,8 +4560,30 @@ HRESULT sideband_check_audio_pts(AVSYNC_MGR *pSyncMgr, } _Exit: - avsync_mgr_log(pSyncMgr, pStream, hBD, pBDInfo, pAudInfo, eAct, uiTime, - uiSTC, pStream->m_iDelay); + //eAct = AMP_CLK_DISP; + AVSU2("[AVS][%d]CHECK_%s([%c][%c%c%c%c] A:0x%08x(%d), M:0x%08x(%d)[%d], " + "O:0x%08x, A:[%d, %d][%d]%s)\n", + pSyncMgr->m_pAVClock->m_uiClockID, + pStream->m_szName, + pszSyncChar[pSyncMgr->m_eSyncStatus], + pszActChar[eActP], pszActChar[eActN], pszActChar[eActL], + pszActChar[eAct], pBDInfo ? (UINT32)pBDInfo->m_uiPtsStart : 0, + pBDInfo ? (UINT32)(GET_PTS_VAL64(pBDInfo->m_uiPtsStart) - + GET_PTS_VAL64(pStream->m_uiLastCheckPts)) : 0, + (UINT32)uiSTC, (UINT32)(uiSTC - pStream->m_uiLastCheckStc), + uiTime - pStream->m_uiLastCheckTime, + pAudInfo ? (UINT32)pAudInfo->m_uiAOutPts : 0, + pAudInfo && (pAudInfo->m_uiNumComps > 0) ? + pAudInfo->m_eAudCompInfo[0].m_uiInputBD : 0, + pAudInfo && (pAudInfo->m_uiNumComps > 0) ? + pAudInfo->m_eAudCompInfo[0].m_uiOutputBD : 0, + pAudInfo && (pAudInfo->m_uiNumComps > 1) ? + pAudInfo->m_eAudCompInfo[1].m_uiInputFullness : 0, + (pBDInfo && pBDInfo->m_fEosReached) ? "--EOS" : ""); + + pStream->m_uiLastCheckStc = uiSTC; + pStream->m_uiLastCheckTime = uiTime; + pStream->m_uiLastCheckPts = pBDInfo ? pBDInfo->m_uiPtsStart : 0; if ((AMP_CLK_HOLD != eAct) && pBDInfo) { pStream->m_uiBuffedTime -= pBDInfo->m_uiDuration;