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

Commit 3f273d10 authored by Wei Jia's avatar Wei Jia
Browse files

Uses AudioFlinger to signal battery stats for audio. 

Bug: 18177221
Change-Id: I704010c037cb99bb74b98798ee8e494fa8bdc875
parent c5fcd06e

media/libmediaplayerservice/MediaPlayerService.cpp

+1 −3
Original line number Diff line number Diff line
@@ -286,9 +286,7 @@ MediaPlayerService::MediaPlayerService() 
    // reset battery stats

    // if the mediaserver has crashed, battery stats could be left

    // in bad state, reset the state upon service start.

    BatteryNotifier& notifier(BatteryNotifier::getInstance());

    notifier.noteResetVideo();

    notifier.noteResetAudio();

    BatteryNotifier::getInstance().noteResetVideo();



    MediaPlayerFactory::registerBuiltinFactories();

}

media/libstagefright/MediaCodec.cpp

+6 −16
Original line number Diff line number Diff line
@@ -2810,25 +2810,15 @@ status_t MediaCodec::amendOutputFormatWithCodecSpecificData( 
}



void MediaCodec::updateBatteryStat() {

    if (mState == CONFIGURED && !mBatteryStatNotified) {

        BatteryNotifier& notifier(BatteryNotifier::getInstance());



        if (mIsVideo) {

            notifier.noteStartVideo();

        } else {

            notifier.noteStartAudio();

    if (!mIsVideo) {

        return;

    }



    if (mState == CONFIGURED && !mBatteryStatNotified) {

        BatteryNotifier::getInstance().noteStartVideo();

        mBatteryStatNotified = true;

    } else if (mState == UNINITIALIZED && mBatteryStatNotified) {

        BatteryNotifier& notifier(BatteryNotifier::getInstance());



        if (mIsVideo) {

            notifier.noteStopVideo();

        } else {

            notifier.noteStopAudio();

        }



        BatteryNotifier::getInstance().noteStopVideo();

        mBatteryStatNotified = false;

    }

}

services/audioflinger/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ LOCAL_SHARED_LIBRARIES := \ 
    liblog \

    libbinder \

    libmedia \

    libmediautils \

    libnbaio \

    libhardware \

    libhardware_legacy \

services/audioflinger/AudioFlinger.cpp

+6 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ 
#include <media/nbaio/Pipe.h>

#include <media/nbaio/PipeReader.h>

#include <media/AudioParameter.h>

#include <mediautils/BatteryNotifier.h>

#include <private/android_filesystem_config.h>



// ----------------------------------------------------------------------------
@@ -191,6 +192,11 @@ AudioFlinger::AudioFlinger() 
                MemoryHeapBase::READ_ONLY);

    }



    // reset battery stats.

    // if the audio service has crashed, battery stats could be left

    // in bad state, reset the state upon service start.

    BatteryNotifier::getInstance().noteResetAudio();



#ifdef TEE_SINK

    (void) property_get("ro.debuggable", value, "0");

    int debuggable = atoi(value);

services/audioflinger/Threads.cpp

+13 −1
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
#include <media/nbaio/Pipe.h>

#include <media/nbaio/PipeReader.h>

#include <media/nbaio/SourceAudioBufferProvider.h>

#include <mediautils/BatteryNotifier.h>



#include <powermanager/PowerManager.h>
@@ -546,7 +547,8 @@ AudioFlinger::ThreadBase::ThreadBase(const sp<AudioFlinger>& audioFlinger, audio 
        mAudioSource(AUDIO_SOURCE_DEFAULT), mId(id),

        // mName will be set by concrete (non-virtual) subclass

        mDeathRecipient(new PMDeathRecipient(this)),

        mSystemReady(systemReady)

        mSystemReady(systemReady),

        mNotifiedBatteryStart(false)

{

    memset(&mPatch, 0, sizeof(struct audio_patch));

}
@@ -927,6 +929,11 @@ void AudioFlinger::ThreadBase::acquireWakeLock_l(int uid) 
        }

        ALOGV("acquireWakeLock_l() %s status %d", mThreadName, status);

    }



    if (!mNotifiedBatteryStart) {

        BatteryNotifier::getInstance().noteStartAudio();

        mNotifiedBatteryStart = true;

    }

}



void AudioFlinger::ThreadBase::releaseWakeLock()
@@ -945,6 +952,11 @@ void AudioFlinger::ThreadBase::releaseWakeLock_l() 
        }

        mWakeLockToken.clear();

    }



    if (mNotifiedBatteryStart) {

        BatteryNotifier::getInstance().noteStopAudio();

        mNotifiedBatteryStart = false;

    }

}



void AudioFlinger::ThreadBase::updateWakeLockUids(const SortedVector<int> &uids) {