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

Commit 1a470ddc authored by Byeongjo Park's avatar Byeongjo Park Committed by Lajos Molnar
Browse files

VT: fixed "Uninitialized scalar field" reported by static analysis 



[Problem] Uninitialized scalar field (UNINIT_CTOR) for
          member variables of RTPSource & ARTPWriter
[Solution] initialize variables in constructor.

Bug: 175266635

Change-Id: I5b41cbe2090803a40852102afbe97e34cde79895
Signed-off-by: default avatarByeongjo Park <bjo.park@samsung.com>
Signed-off-by: default avatarKim Sungyeon <sy85.kim@samsung.com>
parent 8eddf4be

media/libmediaplayerservice/nuplayer/RTPSource.cpp

+12 −2
Original line number Diff line number Diff line
@@ -45,7 +45,17 @@ NuPlayer::RTPSource::RTPSource( 
      mRTPConn(new ARTPConnection(ARTPConnection::kViLTEConnection)),

      mEOSTimeoutAudio(0),

      mEOSTimeoutVideo(0),

      mLastCVOUpdated(-1) {

      mFirstAccessUnit(true),

      mAllTracksHaveTime(false),

      mNTPAnchorUs(-1),

      mMediaAnchorUs(-1),

      mLastMediaTimeUs(-1),

      mNumAccessUnitsReceived(0),

      mLastCVOUpdated(-1),

      mReceivedFirstRTCPPacket(false),

      mReceivedFirstRTPPacket(false),

      mPausing(false),

      mPauseGeneration(0) {

    ALOGD("RTPSource initialized with rtpParams=%s", rtpParams.string());

}

media/libstagefright/rtsp/ARTPWriter.cpp

+26 −17
Original line number Diff line number Diff line
@@ -135,7 +135,8 @@ ARTPWriter::ARTPWriter(int fd, String8& localIp, int localPort, String8& remoteI 
    mSPSBuf = NULL;

    mPPSBuf = NULL;



    mSeqNo = seqNo;

    initState();

    mSeqNo = seqNo;     // Must use explicit # of seq for RTP continuity



#if LOG_TO_FILES

    mRTPFd = open(
@@ -186,6 +187,29 @@ ARTPWriter::~ARTPWriter() { 
    mFd = -1;

}



void ARTPWriter::initState() {

    if (mSourceID == 0)

        mSourceID = rand();

    mPayloadType = 0;

    if (mSeqNo == 0)

        mSeqNo = UniformRand(65536);

    mRTPTimeBase = 0;

    mNumRTPSent = 0;

    mNumRTPOctetsSent = 0;

    mLastRTPTime = 0;

    mLastNTPTime = 0;



    mOpponentID = 0;

    mBitrate = 192000;



    mNumSRsSent = 0;

    mRTPCVOExtMap = -1;

    mRTPCVODegrees = 0;

    mRTPSockNetwork = 0;



    mMode = INVALID;

}



status_t ARTPWriter::addSource(const sp<MediaSource> &source) {

    mSource = source;

    return OK;
@@ -203,21 +227,7 @@ status_t ARTPWriter::start(MetaData * params) { 
    }



    mFlags &= ~kFlagEOS;

    if (mSourceID == 0)

        mSourceID = rand();

    if (mSeqNo == 0)

        mSeqNo = UniformRand(65536);

    mRTPTimeBase = 0;

    mNumRTPSent = 0;

    mNumRTPOctetsSent = 0;

    mLastRTPTime = 0;

    mLastNTPTime = 0;

    mOpponentID = 0;

    mBitrate = 192000;

    mNumSRsSent = 0;

    mRTPCVOExtMap = -1;

    mRTPCVODegrees = 0;

    mRTPSockNetwork = 0;

    initState();



    const char *mime;

    CHECK(mSource->getFormat()->findCString(kKeyMIMEType, &mime));
@@ -246,7 +256,6 @@ status_t ARTPWriter::start(MetaData * params) { 
    if (params->findInt64(kKeySocketNetwork, &sockNetwork))

        updateSocketNetwork(sockNetwork);



    mMode = INVALID;

    if (!strcasecmp(mime, MEDIA_MIMETYPE_VIDEO_AVC)) {

        mMode = H264;

    } else if (!strcasecmp(mime, MEDIA_MIMETYPE_VIDEO_HEVC)) {

media/libstagefright/rtsp/ARTPWriter.h

+1 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ private: 


    static uint64_t GetNowNTP();



    void initState();

    void onRead(const sp<AMessage> &msg);

    void onSendSR(const sp<AMessage> &msg);