summaryrefslogtreecommitdiffstats
path: root/cmds
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-05-20 11:14:37 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-05-20 11:14:37 -0700
commitc6a16327328cf04066ce948c3fbad34fdf1fbff4 (patch)
tree6339ed611cdc10909b46591224b1c99651b36ee4 /cmds
parentcf7d2d50a4b99e6729c02cc2257bd6bd62814c6a (diff)
parent3c16154a3309fe250177d69f3fcd5b6e9a82d1b3 (diff)
downloadframeworks_base-c6a16327328cf04066ce948c3fbad34fdf1fbff4.zip
frameworks_base-c6a16327328cf04066ce948c3fbad34fdf1fbff4.tar.gz
frameworks_base-c6a16327328cf04066ce948c3fbad34fdf1fbff4.tar.bz2
am 3c16154a: am 2723e092: Merge "Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize." into froyo
Merge commit '3c16154a3309fe250177d69f3fcd5b6e9a82d1b3' into kraken * commit '3c16154a3309fe250177d69f3fcd5b6e9a82d1b3': Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize.
Diffstat (limited to 'cmds')
-rw-r--r--cmds/stagefright/stagefright.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/cmds/stagefright/stagefright.cpp b/cmds/stagefright/stagefright.cpp
index 4405da6..b838f32 100644
--- a/cmds/stagefright/stagefright.cpp
+++ b/cmds/stagefright/stagefright.cpp
@@ -75,7 +75,12 @@ static void playSource(OMXClient *client, const sp<MediaSource> &source) {
}
}
- rawSource->start();
+ status_t err = rawSource->start();
+
+ if (err != OK) {
+ fprintf(stderr, "rawSource returned error %d (0x%08x)\n", err, err);
+ return;
+ }
if (gPlaybackAudio) {
AudioPlayer *player = new AudioPlayer(NULL);