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

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

Merge "Revert "Use AudioTrack::event_type not int in callback""

parents c78416fd e46a86fc

core/jni/android_media_AudioTrack.cpp

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ jint android_media_translateErrorCode(int code) { 




// ----------------------------------------------------------------------------

static void audioCallback(AudioTrack::event_type event, void* user, void *info) {

static void audioCallback(int event, void* user, void *info) {

    if (event == AudioTrack::EVENT_MORE_DATA) {

        // set size to 0 to signal we're not using the callback to write more data

        AudioTrack::Buffer* pBuff = (AudioTrack::Buffer*)info;

include/media/AudioTrack.h

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ public: 
     *          - EVENT_BUFFER_END: unused.

     */



    typedef void (*callback_t)(event_type event, void* user, void *info);

    typedef void (*callback_t)(int event, void* user, void *info);



    /* Returns the minimum frame count required for the successful creation of

     * an AudioTrack object.

include/media/ToneGenerator.h

+1 −1
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ private: 
    unsigned int mProcessSize;  // Size of audio blocks generated at a time by audioCallback() (in PCM frames).



    bool initAudioTrack();

    static void audioCallback(AudioTrack::event_type event, void* user, void *info);

    static void audioCallback(int event, void* user, void *info);

    bool prepareWave();

    unsigned int numWaves(unsigned int segmentIdx);

    void clearWaveGens();

include/media/stagefright/AudioPlayer.h

+2 −3
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 


#define AUDIO_PLAYER_H_



#include <media/AudioTrack.h>

#include <media/MediaPlayerInterface.h>

#include <media/stagefright/MediaBuffer.h>

#include <media/stagefright/TimeSource.h>
@@ -96,8 +95,8 @@ private: 
    sp<MediaPlayerBase::AudioSink> mAudioSink;

    AwesomePlayer *mObserver;



    static void AudioCallback(AudioTrack::event_type event, void *user, void *info);

    void AudioCallback(AudioTrack::event_type event, void *info);

    static void AudioCallback(int event, void *user, void *info);

    void AudioCallback(int event, void *info);



    static size_t AudioSinkCallback(

            MediaPlayerBase::AudioSink *audioSink,

media/jni/soundpool/SoundPool.cpp

+2 −2
Original line number Diff line number Diff line
@@ -682,14 +682,14 @@ void SoundChannel::nextEvent() 
    play(sample, nextChannelID, leftVolume, rightVolume, priority, loop, rate);

}



void SoundChannel::callback(AudioTrack::event_type event, void* user, void *info)

void SoundChannel::callback(int event, void* user, void *info)

{

    SoundChannel* channel = static_cast<SoundChannel*>((void *)((unsigned long)user & ~1));

    

    channel->process(event, info, (unsigned long)user & 1);

}



void SoundChannel::process(AudioTrack::event_type event, void *info, unsigned long toggle)

void SoundChannel::process(int event, void *info, unsigned long toggle)

{

    //LOGV("process(%d)", mChannelID);