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

Commit a58cbdf8 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Promotion of av-aosp.lnx.2.0-00011. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1071034   Idd9fdbe45c82f2ced9dc9dae3b3453949910c65e   stagefright: ACodec: Handle temporal layered encoding er
1072534   Id75055e85fad3f6802f9939c7536fa8ce00dcb43   libstagefright: call release encoder instead of signalEO
1062825   I26e5e47e8cc3720895b962f7aab8a595a54b7c83   libmedia: correct latency computing of AudioRecord
1049259   I2ddb802647453c6349bf30397f702e72776b649f   NuPlayer: cancel pauseTimeout when tearing down offload

Change-Id: I0d842b53cc0e33ad41561c4e763807f14253e171
CRs-Fixed: 1049259, 1071034, 1062825, 1072534
parents 16ea5b5c 0be70d91

media/libmedia/AudioRecord.cpp

+6 −1
Original line number Diff line number Diff line
@@ -272,7 +272,12 @@ status_t AudioRecord::set( 
    mStatus = NO_ERROR;

    mUserData = user;

    // TODO: add audio hardware input latency here

    mLatency = (1000 * mFrameCount) / mSampleRate;

    if (mTransfer == TRANSFER_CALLBACK ||

            mTransfer == TRANSFER_SYNC) {

        mLatency = (1000 * mNotificationFramesAct) / sampleRate;

    } else {

        mLatency = (1000 * mFrameCount) / sampleRate;

    }

    mMarkerPosition = 0;

    mMarkerReached = false;

    mNewPosition = 0;

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

+1 −0
Original line number Diff line number Diff line
@@ -1163,6 +1163,7 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) { 
                if (reason == Renderer::kDueToTimeout && !(mPaused && mOffloadAudio)) {

                    // TimeoutWhenPaused is only for offload mode.

                    ALOGW("Receive a stale message for teardown.");

                    mRenderer->signalAudioTearDownComplete();

                    break;

                }

                closeAudioSink();

media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp

+4 −0
Original line number Diff line number Diff line
@@ -1747,6 +1747,10 @@ void NuPlayer::Renderer::onAudioTearDown(AudioTearDownReason reason) { 
    if (mAudioTearingDown) {

        return;

    }

    if (offloadingAudio() && mPaused) {

        cancelAudioOffloadPauseTimeout();

    }



    mAudioTearingDown = true;



    int64_t currentPositionUs;

media/libstagefright/ACodec.cpp

+4 −1
Original line number Diff line number Diff line
@@ -3876,7 +3876,10 @@ status_t ACodec::setupVideoEncoder( 
            if (err != OK) {

                ALOGE("Configuring temporal layers (P=%d B=%d) failed: %d",

                        numLayers, numBLayers, err);

                // not a fatal error

                // not a fatal error, set error code to OK

                // This will avoid tear down of session where temporal

                // layer encoding is not supported for some chipsets

                err = OK;

            }

        }

    }

media/libstagefright/MediaCodecSource.cpp

+2 −1
Original line number Diff line number Diff line
@@ -969,13 +969,14 @@ void MediaCodecSource::onMessageReceived(const sp<AMessage> &msg) { 
             break;

        }



        signalEOS();

        releaseEncoder();



        if (!(mFlags & FLAG_USE_SURFACE_INPUT)) {

            ALOGV("source (%s) stopping", mIsVideo ? "video" : "audio");

            mPuller->interruptSource();

            ALOGV("source (%s) stopped", mIsVideo ? "video" : "audio");

        }

        signalEOS();

    }



    case kWhatPause: