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

Commit 89c03a36 authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

Merge "Fix gapless SBR" 

am: 86873be3

* commit '86873be3':
  Fix gapless SBR

Change-Id: Ie5503e311cb237580f20c0979fd57e9d056ecd9d
parents 06c38ca4 86873be3

include/media/stagefright/ACodec.h

+1 −0
Original line number Diff line number Diff line
@@ -224,6 +224,7 @@ private: 
    sp<IdleToLoadedState> mIdleToLoadedState;

    sp<FlushingState> mFlushingState;

    sp<SkipCutBuffer> mSkipCutBuffer;

    int32_t mSampleRate;



    AString mComponentName;

    uint32_t mFlags;

media/libstagefright/ACodec.cpp

+10 −2
Original line number Diff line number Diff line
@@ -494,7 +494,8 @@ void ACodec::BufferInfo::checkReadFence(const char *dbg) { 
////////////////////////////////////////////////////////////////////////////////



ACodec::ACodec()

    : mQuirks(0),

    : mSampleRate(0),

      mQuirks(0),

      mNode(0),

      mNativeWindowUsageBits(0),

      mSentFormat(false),
@@ -2452,6 +2453,7 @@ status_t ACodec::setupAACCodec( 
    } else {

        ALOGW("did not set AudioAndroidAacPresentation due to error %d when setting AudioAac", res);

    }

    mSampleRate = sampleRate;

    return res;

}
@@ -4464,8 +4466,14 @@ void ACodec::sendFormatChange(const sp<AMessage> &reply) { 
        reply->setRect("crop", left, top, right + 1, bottom + 1);

    } else if (mime == MEDIA_MIMETYPE_AUDIO_RAW &&

               (mEncoderDelay || mEncoderPadding)) {

        int32_t channelCount;

        int32_t channelCount, sampleRate;

        CHECK(notify->findInt32("channel-count", &channelCount));

        CHECK(mOutputFormat->findInt32("sample-rate", &sampleRate));

        if (mSampleRate != 0 && sampleRate != 0) {

            mEncoderDelay = mEncoderDelay * sampleRate / mSampleRate;

            mEncoderPadding = mEncoderPadding * sampleRate / mSampleRate;

            mSampleRate = sampleRate;

        }

        if (mSkipCutBuffer != NULL) {

            size_t prevbufsize = mSkipCutBuffer->size();

            if (prevbufsize != 0) {