diff options
| author | Andreas Huber <andih@google.com> | 2010-09-16 17:29:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-16 17:29:23 -0700 |
| commit | 58fc6e51ad887bfd2124efd41f9f1584e07f4422 (patch) | |
| tree | 78b5238113b33b0b9c68c36e4a8562b08e3edff6 /cmds | |
| parent | b6f349adaba0efbd7c34b5d41a71f24c4e8c95e8 (diff) | |
| parent | 23c6ad7aedecb5bc4be9ed61c2550c43715b47b0 (diff) | |
| download | frameworks_base-58fc6e51ad887bfd2124efd41f9f1584e07f4422.zip frameworks_base-58fc6e51ad887bfd2124efd41f9f1584e07f4422.tar.gz frameworks_base-58fc6e51ad887bfd2124efd41f9f1584e07f4422.tar.bz2 | |
am 23c6ad7a: 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 '23c6ad7aedecb5bc4be9ed61c2550c43715b47b0'
* commit '23c6ad7aedecb5bc4be9ed61c2550c43715b47b0':
Make sure stagefright -o terminates even if we're using a raw audio source (such as .wav pcm)
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/stagefright/stagefright.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cmds/stagefright/stagefright.cpp b/cmds/stagefright/stagefright.cpp index 4a1d27b..8ab94ad 100644 --- a/cmds/stagefright/stagefright.cpp +++ b/cmds/stagefright/stagefright.cpp @@ -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) { |