summaryrefslogtreecommitdiffstats
path: root/cmds
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2011-09-20 15:39:58 -0700
committerAndreas Huber <andih@google.com>2012-03-22 13:18:08 -0700
commitafed0e1fa37473a4cd30018577b560acc79d9a3f (patch)
tree60e3a06c0cc8266f4ecaa45eb7d08c0c47a8b2dd /cmds
parent898b11f2aeaaa2bed84d963a3fcfd3b229e00b99 (diff)
downloadframeworks_av-afed0e1fa37473a4cd30018577b560acc79d9a3f.zip
frameworks_av-afed0e1fa37473a4cd30018577b560acc79d9a3f.tar.gz
frameworks_av-afed0e1fa37473a4cd30018577b560acc79d9a3f.tar.bz2
Use NuPlayer for media playback everywhere
if media.stagefright.use-nuplayer is set to true. Change-Id: Ibb217e7d7d5195b7feeea557554fe78e1585744c
Diffstat (limited to 'cmds')
-rw-r--r--cmds/stagefright/sf2.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/cmds/stagefright/sf2.cpp b/cmds/stagefright/sf2.cpp
index e47cdc0..64df5d1 100644
--- a/cmds/stagefright/sf2.cpp
+++ b/cmds/stagefright/sf2.cpp
@@ -176,8 +176,9 @@ protected:
}
onDrainThisBuffer(msg);
- } else if (what == ACodec::kWhatEOS) {
- printf("$\n");
+ } else if (what == ACodec::kWhatEOS
+ || what == ACodec::kWhatError) {
+ printf((what == ACodec::kWhatEOS) ? "$\n" : "E\n");
int64_t delayUs = ALooper::GetNowUs() - mStartTimeUs;
@@ -412,7 +413,8 @@ private:
sp<AMessage> reply;
CHECK(msg->findMessage("reply", &reply));
- if (mSeekState == SEEK_FLUSHING) {
+ if (mSource == NULL || mSeekState == SEEK_FLUSHING) {
+ reply->setInt32("err", ERROR_END_OF_STREAM);
reply->post();
return;
}