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

Commit 2ade3000 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "FastMixer use FastThread and FastMixerState use FastThreadState"

parents 1e0c8cd8 f7160b5d

services/audioflinger/FastMixer.h

+3 −3
Original line number Diff line number Diff line
@@ -18,10 +18,10 @@ 
#define ANDROID_AUDIO_FAST_MIXER_H



#include <utils/Debug.h>

#include <utils/Thread.h>

extern "C" {

#include "../private/bionic_futex.h"

}

#include "FastThread.h"

#include "StateQueue.h"

#include "FastMixerState.h"
@@ -29,10 +29,10 @@ namespace android { 


typedef StateQueue<FastMixerState> FastMixerStateQueue;



class FastMixer : public Thread {

class FastMixer : public FastThread {



public:

            FastMixer() : Thread(false /*canCallJava*/) { }

            FastMixer() : FastThread() { }

    virtual ~FastMixer() { }



            FastMixerStateQueue* sq() { return &mSQ; }

services/audioflinger/FastMixerState.cpp

+3 −3
Original line number Diff line number Diff line
@@ -29,10 +29,10 @@ FastTrack::~FastTrack() 
{

}



FastMixerState::FastMixerState() :

FastMixerState::FastMixerState() : FastThreadState(),

    mFastTracksGen(0), mTrackMask(0), mOutputSink(NULL), mOutputSinkGen(0),

    mFrameCount(0), mCommand(INITIAL), mColdFutexAddr(NULL), mColdGen(0),

    mDumpState(NULL), mTeeSink(NULL), mNBLogWriter(NULL)

    mFrameCount(0),

    mDumpState(NULL), mTeeSink(NULL)

{

}

services/audioflinger/FastMixerState.h

+7 −12
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <media/ExtendedAudioBufferProvider.h>

#include <media/nbaio/NBAIO.h>

#include <media/nbaio/NBLog.h>

#include "FastThreadState.h"



namespace android {
@@ -48,7 +49,7 @@ struct FastTrack { 
};



// Represents a single state of the fast mixer

struct FastMixerState {

struct FastMixerState : FastThreadState {

                FastMixerState();

    /*virtual*/ ~FastMixerState();
@@ -61,23 +62,17 @@ struct FastMixerState { 
    NBAIO_Sink* mOutputSink;    // HAL output device, must already be negotiated

    int         mOutputSinkGen; // increment when mOutputSink is assigned

    size_t      mFrameCount;    // number of frames per fast mix buffer

    enum Command {

        INITIAL = 0,            // used only for the initial state

        HOT_IDLE = 1,           // do nothing

        COLD_IDLE = 2,          // wait for the futex

        IDLE = 3,               // either HOT_IDLE or COLD_IDLE

        EXIT = 4,               // exit from thread



    // Extends FastThreadState::Command

    static const Command

        // The following commands also process configuration changes, and can be "or"ed:

        MIX = 0x8,              // mix tracks

        WRITE = 0x10,           // write to output sink

        MIX_WRITE = 0x18,       // mix tracks and write to output sink

    } mCommand;

    int32_t*    mColdFutexAddr; // for COLD_IDLE only, pointer to the associated futex

    unsigned    mColdGen;       // increment when COLD_IDLE is requested so it's only performed once

        MIX_WRITE = 0x18;       // mix tracks and write to output sink



    // This might be a one-time configuration rather than per-state

    FastMixerDumpState* mDumpState; // if non-NULL, then update dump state periodically

    NBAIO_Sink* mTeeSink;       // if non-NULL, then duplicate write()s to this non-blocking sink

    NBLog::Writer* mNBLogWriter; // non-blocking logger

};  // struct FastMixerState



}   // namespace android