Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d05479a authored by Kim Sungyeon's avatar Kim Sungyeon Committed by Lajos Molnar
Browse files

VT: Refine codes in AAVCAssembler. 



 - Fixed a crash problem by overflow when rtp time hits 2^31
 - Code clean up for jitter buffer's logging.

Bug: 165061754
Merged-in: I1c9f39d8857870e1590d1f320f0385e0a500c7e6
Change-Id: I1c9f39d8857870e1590d1f320f0385e0a500c7e6
Signed-off-by: default avatarKim Sungyeon <sy85.kim@samsung.com>
parent 470df354

media/libstagefright/rtsp/AAVCAssembler.cpp

+76 −67
Original line number Diff line number Diff line
@@ -109,35 +109,28 @@ ARTPAssembler::AssemblyStatus AAVCAssembler::addNALUnit( 
    }



    sp<ABuffer> buffer = *queue->begin();

    int32_t rtpTime;

    CHECK(buffer->meta()->findInt32("rtp-time", &rtpTime));

    uint32_t rtpTime;

    CHECK(buffer->meta()->findInt32("rtp-time", (int32_t *)&rtpTime));

    int64_t startTime = source->mFirstSysTime / 1000;

    int64_t nowTime = ALooper::GetNowUs() / 1000;

    int64_t playedTime = nowTime - startTime;

    int32_t playedTimeRtp = source->mFirstRtpTime +

    int64_t playedTimeRtp = source->mFirstRtpTime +

        (((uint32_t)playedTime) * (source->mClockRate / 1000));

    const int32_t jitterTime = (int32_t)(source->mClockRate / ((float)1000 / (source->mJbTime)));

    int32_t expiredTimeInJb = rtpTime + jitterTime;

    const uint32_t jitterTime = (uint32_t)(source->mClockRate / ((float)1000 / (source->mJbTime)));

    uint32_t expiredTimeInJb = rtpTime + jitterTime;

    bool isExpired = expiredTimeInJb <= (playedTimeRtp);

    bool isTooLate200 = expiredTimeInJb < (playedTimeRtp - jitterTime);

    bool isTooLate300 = expiredTimeInJb < (playedTimeRtp - (jitterTime * 3 / 2));



    if (mShowQueue && mShowQueueCnt < 20) {

        showCurrentQueue(queue);

        ALOGD("start=%lld, now=%lld, played=%lld", (long long)startTime,

                (long long)nowTime, (long long)playedTime);

        ALOGD("rtp-time(JB)=%d, played-rtp-time(JB)=%d, expired-rtp-time(JB)=%d isExpired=%d",

                rtpTime, playedTimeRtp, expiredTimeInJb, isExpired);

        printNowTimeUs(startTime, nowTime, playedTime);

        printRTPTime(rtpTime, playedTimeRtp, expiredTimeInJb, isExpired);

        mShowQueueCnt++;

    }



    AAVCAssembler::addNack(source);



    ALOGV("start=%lld, now=%lld, played=%lld", (long long)startTime,

            (long long)nowTime, (long long)playedTime);

    ALOGV("rtp-time(JB)=%d, played-rtp-time(JB)=%d, expired-rtp-time(JB)=%d isExpired=%d",

            rtpTime, playedTimeRtp, expiredTimeInJb, isExpired);



    if (!isExpired) {

        ALOGV("buffering in jitter buffer.");

        return NOT_ENOUGH_DATA;
@@ -147,42 +140,21 @@ ARTPAssembler::AssemblyStatus AAVCAssembler::addNALUnit( 
        ALOGW("=== WARNING === buffer arrived 200ms late. === WARNING === ");



    if (isTooLate300) {

        ALOGW("buffer arrived too late. 300ms..");

        ALOGW("start=%lld, now=%lld, played=%lld", (long long)startTime,

                (long long)nowTime, (long long)playedTime);

        ALOGW("rtp-time(JB)=%d, plyed-rtp-time(JB)=%d, exp-rtp-time(JB)=%d diff=%lld isExpired=%d",

                rtpTime, playedTimeRtp, expiredTimeInJb,

                ((long long)playedTimeRtp) - expiredTimeInJb, isExpired);

        ALOGW("expected Seq. NO =%d", buffer->int32Data());

        ALOGW("buffer arrived after 300ms ... \t Diff in Jb=%lld \t Seq# %d",

              ((long long)playedTimeRtp) - expiredTimeInJb, buffer->int32Data());

        printNowTimeUs(startTime, nowTime, playedTime);

        printRTPTime(rtpTime, playedTimeRtp, expiredTimeInJb, isExpired);



        List<sp<ABuffer> >::iterator it = queue->begin();

        while (it != queue->end()) {

            CHECK((*it)->meta()->findInt32("rtp-time", &rtpTime));

            if (rtpTime + jitterTime >= playedTimeRtp) {

                mNextExpectedSeqNo = (*it)->int32Data();

                break;

            }

            it++;

        }

        source->noticeAbandonBuffer();

        mNextExpectedSeqNo = pickProperSeq(queue, jitterTime, playedTimeRtp);

    }



    if (mNextExpectedSeqNoValid) {

        int32_t size = queue->size();

        int32_t cnt = 0;

        List<sp<ABuffer> >::iterator it = queue->begin();

        while (it != queue->end()) {

            if ((uint32_t)(*it)->int32Data() >= mNextExpectedSeqNo) {

                break;

            }



            it = queue->erase(it);

            cnt++;

        }

        int32_t cntRemove = deleteUnitUnderSeq(queue, mNextExpectedSeqNo);



        if (cnt > 0) {

            source->noticeAbandonBuffer(cnt);

            ALOGW("delete %d of %d buffers", cnt, size);

        if (cntRemove > 0) {

            source->noticeAbandonBuffer(cntRemove);

            ALOGW("delete %d of %d buffers", cntRemove, size);

        }

        if (queue->empty()) {

            return NOT_ENOUGH_DATA;
@@ -339,8 +311,8 @@ ARTPAssembler::AssemblyStatus AAVCAssembler::addFragmentedNALUnit( 
    size_t totalCount = 1;

    bool complete = false;



    int32_t rtpTimeStartAt;

    CHECK(buffer->meta()->findInt32("rtp-time", &rtpTimeStartAt));

    uint32_t rtpTimeStartAt;

    CHECK(buffer->meta()->findInt32("rtp-time", (int32_t *)&rtpTimeStartAt));

    uint32_t startSeqNo = buffer->int32Data();

    bool pFrame = nalType == 0x1;
@@ -368,8 +340,8 @@ ARTPAssembler::AssemblyStatus AAVCAssembler::addFragmentedNALUnit( 
                    return WRONG_SEQUENCE_NUMBER;

            }



            int32_t rtpTime;

            CHECK(buffer->meta()->findInt32("rtp-time", &rtpTime));

            uint32_t rtpTime;

            CHECK(buffer->meta()->findInt32("rtp-time", (int32_t *)&rtpTime));

            if (size < 2

                    || data[0] != indicator

                    || (data[1] & 0x1f) != nalType
@@ -379,12 +351,8 @@ ARTPAssembler::AssemblyStatus AAVCAssembler::addFragmentedNALUnit( 


                // Delete the whole start of the FU.



                it = queue->begin();

                for (size_t i = 0; i <= totalCount; ++i) {

                    it = queue->erase(it);

                }



                mNextExpectedSeqNo = expectedSeqNo + 1;

                deleteUnitUnderSeq(queue, mNextExpectedSeqNo);



                return MALFORMED_PACKET;

            }
@@ -395,23 +363,12 @@ ARTPAssembler::AssemblyStatus AAVCAssembler::addFragmentedNALUnit( 
            expectedSeqNo = buffer->int32Data() + 1;



            if (data[1] & 0x40) {

                if (pFrame) {

                    ALOGV("checking p-frame losses.. recvBufs %d diff %d drop? %d",

                            (uint32_t)totalCount, expectedSeqNo - startSeqNo,

                            totalCount < ((expectedSeqNo - startSeqNo) / 2));

                    if (totalCount < ((expectedSeqNo - startSeqNo) / 2)) {

                        ALOGI("drop p-frame. recvBufs %d lastSeq %d startSeq %d",

                                (uint32_t)totalCount, expectedSeqNo - 1, startSeqNo);



                        it = queue->begin();

                        for (size_t i = 0; i <= totalCount; ++i) {

                            it = queue->erase(it);

                        }

                if (pFrame && !recycleUnit(startSeqNo, expectedSeqNo, totalCount, 0.5f)) {

                        mNextExpectedSeqNo = expectedSeqNo;

                        deleteUnitUnderSeq(queue, mNextExpectedSeqNo);



                        return MALFORMED_PACKET;

                }

                }

                // This is the last fragment.

                complete = true;

                break;
@@ -518,6 +475,58 @@ void AAVCAssembler::submitAccessUnit() { 
    msg->post();

}



int32_t AAVCAssembler::pickProperSeq(const Q *q, uint32_t jit, int64_t play) {

    sp<ABuffer> buffer = *(q->begin());

    uint32_t rtpTime;

    int32_t nextSeqNo = buffer->int32Data();



    Q::const_iterator it = q->begin();

    while (it != q->end()) {

        CHECK((*it)->meta()->findInt32("rtp-time", (int32_t *)&rtpTime));

        // if pkt in time exists, that should be the next pivot

        if (rtpTime + jit >= play) {

            nextSeqNo = (*it)->int32Data();

            break;

        }

        it++;

    }

    return nextSeqNo;

}



bool AAVCAssembler::recycleUnit(uint32_t start, uint32_t end, size_t avail, float goodRatio) {

    float total = end - start;

    float exist = avail;

    bool isRecycle = (exist / total) >= goodRatio;



    ALOGV("checking p-frame losses.. recvBufs %f diff %f recycle? %d",

            exist, total, isRecycle);



    return isRecycle;

}



int32_t AAVCAssembler::deleteUnitUnderSeq(Q *q, uint32_t seq) {

    int32_t initSize = q->size();

    Q::iterator it = q->begin();

    while (it != q->end()) {

        if ((uint32_t)(*it)->int32Data() >= seq) {

            break;

        }

        it++;

    }

    q->erase(q->begin(), it);

    return initSize - q->size();

}



inline void AAVCAssembler::printNowTimeUs(int64_t start, int64_t now, int64_t play) {

    ALOGD("start=%lld, now=%lld, played=%lld",

            (long long)start, (long long)now, (long long)play);

}



inline void AAVCAssembler::printRTPTime(uint32_t rtp, int64_t play, uint32_t exp, bool isExp) {

    ALOGD("rtp-time(JB)=%u, played-rtp-time(JB)=%lld, expired-rtp-time(JB)=%u isExpired=%d",

            rtp, (long long)play, exp, isExp);

}



ARTPAssembler::AssemblyStatus AAVCAssembler::assembleMore(

        const sp<ARTPSource> &source) {

    AssemblyStatus status = addNALUnit(source);

media/libstagefright/rtsp/AAVCAssembler.h

+8 −0
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ 


namespace android {



using Q = List<sp<ABuffer> >;



struct ABuffer;

struct AMessage;
@@ -55,6 +57,12 @@ private: 


    void submitAccessUnit();



    int32_t pickProperSeq(const Q *q, uint32_t jit, int64_t play);

    bool recycleUnit(uint32_t start, uint32_t end, size_t avail, float goodRatio);

    int32_t deleteUnitUnderSeq(Q *q, uint32_t seq);

    void printNowTimeUs(int64_t start, int64_t now, int64_t play);

    void printRTPTime(uint32_t rtp, int64_t play, uint32_t exp, bool isExp);



    DISALLOW_EVIL_CONSTRUCTORS(AAVCAssembler);

};

media/libstagefright/rtsp/AHEVCAssembler.cpp

+6 −6
Original line number Diff line number Diff line
@@ -63,19 +63,19 @@ ARTPAssembler::AssemblyStatus AHEVCAssembler::addNALUnit( 
    }



    sp<ABuffer> buffer = *queue->begin();

    int32_t rtpTime;

    CHECK(buffer->meta()->findInt32("rtp-time", &rtpTime));

    uint32_t rtpTime;

    CHECK(buffer->meta()->findInt32("rtp-time", (int32_t *)&rtpTime));

    int64_t startTime = source->mFirstSysTime / 1000;

    int64_t nowTime = ALooper::GetNowUs() / 1000;

    int64_t playedTime = nowTime - startTime;

    int32_t playedTimeRtp = source->mFirstRtpTime +

    int64_t playedTimeRtp = source->mFirstRtpTime +

        (((uint32_t)playedTime) * (source->mClockRate / 1000));

    int32_t expiredTimeInJb = rtpTime + (source->mClockRate / 5);

    const uint32_t expiredTimeInJb = rtpTime + (source->mClockRate / 5);

    bool isExpired = expiredTimeInJb <= (playedTimeRtp);

    ALOGV("start=%lld, now=%lld, played=%lld", (long long)startTime,

            (long long)nowTime, (long long)playedTime);

    ALOGV("rtp-time(JB)=%d, played-rtp-time(JB)=%d, expired-rtp-time(JB)=%d isExpired=%d",

            rtpTime, playedTimeRtp, expiredTimeInJb, isExpired);

    ALOGV("rtp-time(JB)=%u, played-rtp-time(JB)=%lld, expired-rtp-time(JB)=%u isExpired=%d",

            rtpTime, (long long)playedTimeRtp, expiredTimeInJb, isExpired);



    if (!isExpired) {

        ALOGV("buffering in jitter buffer.");

media/libstagefright/rtsp/ARTPSource.cpp

+2 −2
Original line number Diff line number Diff line
@@ -129,8 +129,8 @@ bool ARTPSource::queuePacket(const sp<ABuffer> &buffer) { 
    buffer->meta()->findInt32("ssrc", &ssrc);



    if (mNumBuffersReceived++ == 0 && mFirstSysTime == 0) {

        int32_t firstRtpTime;

        CHECK(buffer->meta()->findInt32("rtp-time", &firstRtpTime));

        uint32_t firstRtpTime;

        CHECK(buffer->meta()->findInt32("rtp-time", (int32_t *)&firstRtpTime));

        mFirstSysTime = ALooper::GetNowUs();

        mHighestSeqNumber = seqNum;

        mBaseSeqNumber = seqNum;

media/libstagefright/rtsp/ARTPSource.h

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ struct ARTPSource : public RefBase { 
    void noticeAbandonBuffer(int cnt=1);



    int32_t mFirstSeqNumber;

    int32_t mFirstRtpTime;

    uint32_t mFirstRtpTime;

    int64_t mFirstSysTime;

    int32_t mClockRate;