summaryrefslogtreecommitdiffstats
path: root/cmds
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2012-02-28 15:54:51 -0800
committerAndreas Huber <andih@google.com>2012-02-28 15:54:51 -0800
commitc95c2ddcdfc974f42408a377fbe2de51b94a8c94 (patch)
tree24239ca3f0d24f790b73d92627de057f738f91d5 /cmds
parenta3873833d518e032138cf70188b6f33cd7acec3d (diff)
downloadframeworks_av-c95c2ddcdfc974f42408a377fbe2de51b94a8c94.zip
frameworks_av-c95c2ddcdfc974f42408a377fbe2de51b94a8c94.tar.gz
frameworks_av-c95c2ddcdfc974f42408a377fbe2de51b94a8c94.tar.bz2
Separate the notion of "stop" from that of "release", i.e.
stop - means transition back to LOADED state and keeping the component instance allocated. release - means we get rid of the component completely. Change-Id: I40ad01ce70821faaad43f57999249904f9144924
Diffstat (limited to 'cmds')
-rw-r--r--cmds/stagefright/SimplePlayer.cpp2
-rw-r--r--cmds/stagefright/codec.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/cmds/stagefright/SimplePlayer.cpp b/cmds/stagefright/SimplePlayer.cpp
index f269e80..fac3a8c 100644
--- a/cmds/stagefright/SimplePlayer.cpp
+++ b/cmds/stagefright/SimplePlayer.cpp
@@ -396,7 +396,7 @@ status_t SimplePlayer::onReset() {
for (size_t i = 0; i < mStateByTrackIndex.size(); ++i) {
CodecState *state = &mStateByTrackIndex.editValueAt(i);
- CHECK_EQ(state->mCodec->stop(), (status_t)OK);
+ CHECK_EQ(state->mCodec->release(), (status_t)OK);
}
mStartTimeRealUs = -1ll;
diff --git a/cmds/stagefright/codec.cpp b/cmds/stagefright/codec.cpp
index b850190..fbf800c 100644
--- a/cmds/stagefright/codec.cpp
+++ b/cmds/stagefright/codec.cpp
@@ -295,7 +295,7 @@ static int decode(
for (size_t i = 0; i < stateByTrack.size(); ++i) {
CodecState *state = &stateByTrack.editValueAt(i);
- CHECK_EQ((status_t)OK, state->mCodec->stop());
+ CHECK_EQ((status_t)OK, state->mCodec->release());
}
return 0;