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

Commit 5896d378 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7243396 from 9fee705b to sc-release 

Change-Id: Ie96631a2cab81983dcc896beb98100d23da71e6e
parents d9052b74 9fee705b

media/codec2/sfplugin/CCodec.cpp

+7 −1
Original line number Diff line number Diff line
@@ -2311,7 +2311,13 @@ void CCodec::initiateReleaseIfStuck() { 
        return;

    }



    ALOGW("previous call to %s exceeded timeout", name.c_str());

    C2String compName;

    {

        Mutexed<State>::Locked state(mState);

        compName = state->comp->getName();

    }

    ALOGW("[%s] previous call to %s exceeded timeout", compName.c_str(), name.c_str());



    initiateRelease(false);

    mCallback->onError(UNKNOWN_ERROR, ACTION_CODE_FATAL);

}

media/libmediaplayerservice/nuplayer/AWakeLock.cpp

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ bool AWakeLock::acquire() { 
            binder::Status status = mPowerManager->acquireWakeLock(

                    binder, POWERMANAGER_PARTIAL_WAKE_LOCK,

                    String16("AWakeLock"), String16("media"),

                    {} /* workSource */, {} /* historyTag */);

                    {} /* workSource */, {} /* historyTag */, -1 /* displayId */);

            IPCThreadState::self()->restoreCallingIdentity(token);

            if (status.isOk()) {

                mWakeLockToken = binder;

media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1962,7 +1962,7 @@ status_t NuPlayer::Renderer::onOpenAudioSink( 
            ALOGV("Mime \"%s\" mapped to audio_format 0x%x",

                    mime.c_str(), audioFormat);



            int avgBitRate = -1;

            int avgBitRate = 0;

            format->findInt32("bitrate", &avgBitRate);



            int32_t aacProfile = -1;

media/libstagefright/Utils.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2169,7 +2169,7 @@ status_t getAudioOffloadInfo(const sp<MetaData>& meta, bool hasVideo, 
    }

    info->duration_us = duration;



    int32_t brate = -1;

    int32_t brate = 0;

    if (!meta->findInt32(kKeyBitRate, &brate)) {

        ALOGV("track of type '%s' does not publish bitrate", mime);

    }