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

Commit d9b59579 authored by Lajos Molnar's avatar Lajos Molnar
Browse files

Miscellaneous fixups for VT contribution update. 

fixed misc. spacing and style issues
AAVCAssembler/AHEVCAssembler: fix OOB reads in checkIFrameProvided,
  checkSpsUpdated and dropFramesUntilIFrame
ARTPWriter: fix OOB read in SpsPpsParser, VpsSpsPpsParser and sendVPSSPSPPSIfIFrame
ARTPWriter: use KMP algorithm for VpsSpsPpsParser
ARTPSource/ARTPConnection/RTPSource: rename jbTIme to jbTimeMs

Bug: 165061754
Change-Id: Iceeb3851aed0ba9b1c2c50b1a2378df06faa29d6
Merged-In: Iceeb3851aed0ba9b1c2c50b1a2378df06faa29d6
parent dc816386

media/libmediaplayerservice/StagefrightRecorder.cpp

+4 −1
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ 
//#define LOG_NDEBUG 0

#define LOG_TAG "StagefrightRecorder"

#include <inttypes.h>

// TODO/workaround: including base logging now as it conflicts with ADebug.h

// and it must be included first.

#include <android-base/logging.h>

#include <utils/Log.h>



#include "WebmWriter.h"

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

+2 −1
Original line number Diff line number Diff line
@@ -1703,9 +1703,10 @@ void NuPlayer::updateInternalTimers() { 
}



void NuPlayer::setTargetBitrate(int bitrate) {

    if (mSource != NULL)

    if (mSource != NULL) {

        mSource->setTargetBitrate(bitrate);

    }

}



void NuPlayer::onPause() {

media/libmediaplayerservice/nuplayer/NuPlayer.h

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ struct NuPlayer : public AHandler { 


    void updateInternalTimers();



    void setTargetBitrate(int bitrate);

    void setTargetBitrate(int bitrate /* bps */);



protected:

    virtual ~NuPlayer();

media/libmediaplayerservice/nuplayer/RTPSource.cpp

+4 −3
Original line number Diff line number Diff line
@@ -114,7 +114,8 @@ void NuPlayer::RTPSource::prepareAsync() { 
        // index(i) should be started from 1. 0 is reserved for [root]

        mRTPConn->addStream(sockRtp, sockRtcp, desc, i + 1, notify, false);

        mRTPConn->setSelfID(info->mSelfID);

        mRTPConn->setJbTime((info->mJbTime <= 3000 && info->mJbTime >= 40) ? info->mJbTime : 300);

        mRTPConn->setJbTime(

                (info->mJbTimeMs <= 3000 && info->mJbTimeMs >= 40) ? info->mJbTimeMs : 300);



        info->mRTPSocket = sockRtp;

        info->mRTCPSocket = sockRtcp;
@@ -669,7 +670,7 @@ status_t NuPlayer::RTPSource::setParameter(const String8 &key, const String8 &va 
        newTrackInfo.mIsAudio = isAudioKey;

        mTracks.push(newTrackInfo);

        info = &mTracks.editTop();

        info->mJbTime = 300;

        info->mJbTimeMs = 300;

    }



    if (key == "rtp-param-mime-type") {
@@ -713,7 +714,7 @@ status_t NuPlayer::RTPSource::setParameter(const String8 &key, const String8 &va 
        int64_t networkHandle = atoll(value);

        setSocketNetwork(networkHandle);

    } else if (key == "rtp-param-jitter-buffer-time") {

        info->mJbTime = atoi(value);

        info->mJbTimeMs = atoi(value);

    }



    return OK;

media/libmediaplayerservice/nuplayer/RTPSource.h

+2 −2
Original line number Diff line number Diff line
@@ -129,8 +129,8 @@ private: 
        int32_t mTimeScale;

        int32_t mAS;



        /* RTP jitter buffer time in millsecond */

        uint32_t mJbTime;

        /* RTP jitter buffer time in milliseconds */

        uint32_t mJbTimeMs;

        /* Unique ID indicates itself */

        uint32_t mSelfID;

        /* extmap:<value> for CVO will be set to here */