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

Commit 0ebff76e authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "Fix issue 2285561: New AudioFlinger and audio driver API needed for A/V sync"

parents e6dca5c2 0986e790

include/media/AudioSystem.h

+11 −0
Original line number Diff line number Diff line
@@ -222,6 +222,17 @@ public: 


    static status_t setVoiceVolume(float volume);



    // return the number of audio frames written by AudioFlinger to audio HAL and

    // audio dsp to DAC since the output on which the specificed stream is playing

    // has exited standby.

    // returned status (from utils/Errors.h) can be:

    // - NO_ERROR: successful operation, halFrames and dspFrames point to valid data

    // - INVALID_OPERATION: Not supported on current hardware platform

    // - BAD_VALUE: invalid parameter

    // NOTE: this feature is not supported on all hardware platforms and it is

    // necessary to check returned status before using the returned values.

    static status_t getRenderPosition(uint32_t *halFrames, uint32_t *dspFrames, int stream = DEFAULT);



    //

    // AudioPolicyService interface

    //

include/media/IAudioFlinger.h

+1 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ public: 
    virtual status_t setStreamOutput(uint32_t stream, int output) = 0;



    virtual status_t setVoiceVolume(float volume) = 0;

    virtual status_t getRenderPosition(uint32_t *halFrames, uint32_t *dspFrames, int output) = 0;

};

include/media/MediaPlayerInterface.h

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ public: 
        virtual ssize_t     frameSize() const = 0;

        virtual uint32_t    latency() const = 0;

        virtual float       msecsPerFrame() const = 0;

        virtual status_t    getPosition(uint32_t *position) = 0;



        // If no callback is specified, use the "write" API below to submit

        // audio data. Otherwise return a full buffer of audio data on each

libs/audioflinger/A2dpAudioInterface.cpp

+6 −0
Original line number Diff line number Diff line
@@ -457,4 +457,10 @@ status_t A2dpAudioInterface::A2dpAudioStreamOut::dump(int fd, const Vector<Strin 
    return NO_ERROR;

}



status_t A2dpAudioInterface::A2dpAudioStreamOut::getRenderPosition(uint32_t *driverFrames)

{

    //TODO: enable when supported by driver

    return INVALID_OPERATION;

}



}; // namespace android

libs/audioflinger/A2dpAudioInterface.h

+1 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ private: 
        virtual status_t    dump(int fd, const Vector<String16>& args);

        virtual status_t    setParameters(const String8& keyValuePairs);

        virtual String8     getParameters(const String8& keys);

        virtual status_t    getRenderPosition(uint32_t *dspFrames);



    private:

        friend class A2dpAudioInterface;