summaryrefslogtreecommitdiffstats
path: root/cmds
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2009-10-13 17:06:41 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-10-13 17:06:41 -0700
commit5dc13b769fa42ca227967a81a5fdeadfb55b6055 (patch)
tree0dd896fdd750122a35a8df9611f1774b8b7b85b2 /cmds
parent850efa869c181d0f84b3359471018bb9d272254f (diff)
parent9550e2892f88194c9abbb85616bb55db67231d6e (diff)
downloadframeworks_base-5dc13b769fa42ca227967a81a5fdeadfb55b6055.zip
frameworks_base-5dc13b769fa42ca227967a81a5fdeadfb55b6055.tar.gz
frameworks_base-5dc13b769fa42ca227967a81a5fdeadfb55b6055.tar.bz2
am 9550e289: am cfd55579: OMXCodec now notifies the reader of changes in the output format by returning a special result/error code.
Merge commit '9550e2892f88194c9abbb85616bb55db67231d6e' * commit '9550e2892f88194c9abbb85616bb55db67231d6e': OMXCodec now notifies the reader of changes in the output format by returning a special result/error code.
Diffstat (limited to 'cmds')
-rw-r--r--cmds/stagefright/stagefright.cpp13
1 files changed, 12 insertions, 1 deletions
diff --git a/cmds/stagefright/stagefright.cpp b/cmds/stagefright/stagefright.cpp
index 6674620..4d4d013 100644
--- a/cmds/stagefright/stagefright.cpp
+++ b/cmds/stagefright/stagefright.cpp
@@ -71,7 +71,12 @@ static void playSource(OMXClient *client, const sp<MediaSource> &source) {
options.clearSeekTo();
bool shouldSeek = false;
- if (err != OK) {
+ if (err == INFO_FORMAT_CHANGED) {
+ CHECK_EQ(buffer, NULL);
+
+ printf("format changed.\n");
+ continue;
+ } else if (err != OK) {
printf("reached EOF.\n");
shouldSeek = true;
@@ -136,6 +141,12 @@ static void playSource(OMXClient *client, const sp<MediaSource> &source) {
if (err != OK) {
CHECK_EQ(buffer, NULL);
+
+ if (err == INFO_FORMAT_CHANGED) {
+ printf("format changed.\n");
+ continue;
+ }
+
break;
}