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

Commit 7714d713 authored by Andreas Huber's avatar Andreas Huber Committed by Android (Google) Code Review
Browse files

Merge "Ensure that the audio codec instance is actually going away before we... 

Merge "Ensure that the audio codec instance is actually going away before we attempt to instantiate another one, otherwise we might end up with the software codec even though the hardware codec would have been available shortly."
parents ec8f9b64 5f0d5ce3

media/libstagefright/AudioPlayer.cpp

+11 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#define LOG_TAG "AudioPlayer"

#include <utils/Log.h>



#include <binder/IPCThreadState.h>

#include <media/AudioTrack.h>

#include <media/stagefright/AudioPlayer.h>

#include <media/stagefright/MediaDebug.h>
@@ -164,6 +165,16 @@ void AudioPlayer::stop() { 


    mSource->stop();



    // The following hack is necessary to ensure that the OMX

    // component is completely released by the time we may try

    // to instantiate it again.

    wp<MediaSource> tmp = mSource;

    mSource.clear();

    while (tmp.promote() != NULL) {

        usleep(1000);

    }

    IPCThreadState::self()->flushCommands();



    mNumFramesPlayed = 0;

    mPositionTimeMediaUs = -1;

    mPositionTimeRealUs = -1;