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

Commit e1e5d7a3 authored by Praveen Chavan's avatar Praveen Chavan Committed by Lajos Molnar
Browse files

NuPlayer: Enhance dumpsys statistics 

Account for dropped output-frames (rather than input-frames)
in percentage dropped frames.
Print mime and component name for each active track

Change-Id: I3491d336c696d8ed0fd1503b80afe1df47c787c8
parent 4a4265e9

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

+9 −7
Original line number Diff line number Diff line
@@ -1729,13 +1729,15 @@ status_t NuPlayer::getCurrentPosition(int64_t *mediaUs) { 
    return renderer->getCurrentPosition(mediaUs);

}



void NuPlayer::getStats(int64_t *numFramesTotal, int64_t *numFramesDropped) {

    sp<DecoderBase> decoder = getDecoder(false /* audio */);

    if (decoder != NULL) {

        decoder->getStats(numFramesTotal, numFramesDropped);

    } else {

        *numFramesTotal = 0;

        *numFramesDropped = 0;

void NuPlayer::getStats(Vector<sp<AMessage> > *mTrackStats) {

    CHECK(mTrackStats != NULL);



    mTrackStats->clear();

    if (mVideoDecoder != NULL) {

        mTrackStats->push_back(mVideoDecoder->getStats());

    }

    if (mAudioDecoder != NULL) {

        mTrackStats->push_back(mAudioDecoder->getStats());

    }

}

media/libmediaplayerservice/nuplayer/NuPlayer.h

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ struct NuPlayer : public AHandler { 
    status_t getSelectedTrack(int32_t type, Parcel* reply) const;

    status_t selectTrack(size_t trackIndex, bool select, int64_t timeUs);

    status_t getCurrentPosition(int64_t *mediaUs);

    void getStats(int64_t *mNumFramesTotal, int64_t *mNumFramesDropped);

    void getStats(Vector<sp<AMessage> > *mTrackStats);



    sp<MetaData> getFileMeta();

    float getFrameRate();

media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp

+31 −11
Original line number Diff line number Diff line
@@ -58,7 +58,10 @@ NuPlayer::Decoder::Decoder( 
      mCCDecoder(ccDecoder),

      mSkipRenderingUntilMediaTimeUs(-1ll),

      mNumFramesTotal(0ll),

      mNumFramesDropped(0ll),

      mNumInputFramesDropped(0ll),

      mNumOutputFramesDropped(0ll),

      mVideoWidth(0),

      mVideoHeight(0),

      mIsAudio(true),

      mIsVideoAVC(false),

      mIsSecure(false),
@@ -77,11 +80,11 @@ NuPlayer::Decoder::~Decoder() { 
    releaseAndResetMediaBuffers();

}



void NuPlayer::Decoder::getStats(

        int64_t *numFramesTotal,

        int64_t *numFramesDropped) const {

    *numFramesTotal = mNumFramesTotal;

    *numFramesDropped = mNumFramesDropped;

sp<AMessage> NuPlayer::Decoder::getStats() const {

    mStats->setInt64("frames-total", mNumFramesTotal);

    mStats->setInt64("frames-dropped-input", mNumInputFramesDropped);

    mStats->setInt64("frames-dropped-output", mNumOutputFramesDropped);

    return mStats;

}



void NuPlayer::Decoder::onMessageReceived(const sp<AMessage> &msg) {
@@ -237,6 +240,18 @@ void NuPlayer::Decoder::onConfigure(const sp<AMessage> &format) { 
    CHECK_EQ((status_t)OK, mCodec->getOutputFormat(&mOutputFormat));

    CHECK_EQ((status_t)OK, mCodec->getInputFormat(&mInputFormat));



    mStats->setString("mime", mime.c_str());

    mStats->setString("component-name", mComponentName.c_str());



    if (!mIsAudio) {

        int32_t width, height;

        if (mOutputFormat->findInt32("width", &width)

                && mOutputFormat->findInt32("height", &height)) {

            mStats->setInt32("width", width);

            mStats->setInt32("height", height);

        }

    }



    sp<AMessage> reply = new AMessage(kWhatCodecNotify, this);

    mCodec->setCallback(reply);
@@ -520,6 +535,8 @@ bool NuPlayer::Decoder::handleAnOutputBuffer( 
        mSkipRenderingUntilMediaTimeUs = -1;

    }



    mNumFramesTotal += !mIsAudio;



    // wait until 1st frame comes out to signal resume complete

    notifyResumeCompleteIfNecessary();
@@ -536,6 +553,12 @@ bool NuPlayer::Decoder::handleAnOutputBuffer( 


void NuPlayer::Decoder::handleOutputFormatChange(const sp<AMessage> &format) {

    if (!mIsAudio) {

        int32_t width, height;

        if (format->findInt32("width", &width)

                && format->findInt32("height", &height)) {

            mStats->setInt32("width", width);

            mStats->setInt32("height", height);

        }

        sp<AMessage> notify = mNotify->dup();

        notify->setInt32("what", kWhatVideoSizeChanged);

        notify->setMessage("format", format);
@@ -654,10 +677,6 @@ status_t NuPlayer::Decoder::fetchInputData(sp<AMessage> &reply) { 
            return ERROR_END_OF_STREAM;

        }



        if (!mIsAudio) {

            ++mNumFramesTotal;

        }



        dropAccessUnit = false;

        if (!mIsAudio

                && !mIsSecure
@@ -665,7 +684,7 @@ status_t NuPlayer::Decoder::fetchInputData(sp<AMessage> &reply) { 
                && mIsVideoAVC

                && !IsAVCReferenceFrame(accessUnit)) {

            dropAccessUnit = true;

            ++mNumFramesDropped;

            ++mNumInputFramesDropped;

        }

    } while (dropAccessUnit);
@@ -833,6 +852,7 @@ void NuPlayer::Decoder::onRenderBuffer(const sp<AMessage> &msg) { 
        CHECK(msg->findInt64("timestampNs", &timestampNs));

        err = mCodec->renderOutputBufferAndRelease(bufferIx, timestampNs);

    } else {

        mNumOutputFramesDropped += !mIsAudio;

        err = mCodec->releaseOutputBuffer(bufferIx);

    }

    if (err != OK) {

media/libmediaplayerservice/nuplayer/NuPlayerDecoder.h

+5 −4
Original line number Diff line number Diff line
@@ -30,9 +30,7 @@ struct NuPlayer::Decoder : public DecoderBase { 
            const sp<Surface> &surface = NULL,

            const sp<CCDecoder> &ccDecoder = NULL);



    virtual void getStats(

            int64_t *mNumFramesTotal,

            int64_t *mNumFramesDropped) const;

    virtual sp<AMessage> getStats() const;



protected:

    virtual ~Decoder();
@@ -77,7 +75,10 @@ private: 


    int64_t mSkipRenderingUntilMediaTimeUs;

    int64_t mNumFramesTotal;

    int64_t mNumFramesDropped;

    int64_t mNumInputFramesDropped;

    int64_t mNumOutputFramesDropped;

    int32_t mVideoWidth;

    int32_t mVideoHeight;

    bool mIsAudio;

    bool mIsVideoAVC;

    bool mIsSecure;

media/libmediaplayerservice/nuplayer/NuPlayerDecoderBase.cpp

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ namespace android { 
NuPlayer::DecoderBase::DecoderBase(const sp<AMessage> &notify)

    :  mNotify(notify),

       mBufferGeneration(0),

       mStats(new AMessage),

       mRequestInputBuffersPending(false) {

    // Every decoder has its own looper because MediaCodec operations

    // are blocking, but NuPlayer needs asynchronous operations.