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

Commit 23c6ad7a authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am 549629d3: Merge "Make sure stagefright -o terminates even if we\'re using a... 

am 549629d3: Merge "Make sure stagefright -o terminates even if we\'re using a raw audio source (such as .wav pcm)" into gingerbread

Merge commit '549629d3' into gingerbread-plus-aosp

* commit '549629d3':
  Make sure stagefright -o terminates even if we're using a raw audio source (such as .wav pcm)
parents c09cea39 549629d3

cmds/stagefright/stagefright.cpp

+3 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ static int64_t getNowUs() { 
    return (int64_t)tv.tv_usec + tv.tv_sec * 1000000ll;

}



static void playSource(OMXClient *client, const sp<MediaSource> &source) {

static void playSource(OMXClient *client, sp<MediaSource> &source) {

    sp<MetaData> meta = source->getFormat();



    const char *mime;
@@ -81,6 +81,8 @@ static void playSource(OMXClient *client, const sp<MediaSource> &source) { 
        }

    }



    source.clear();



    status_t err = rawSource->start();



    if (err != OK) {