summaryrefslogtreecommitdiffstats
path: root/include/media/stagefright/SurfaceMediaSource.h
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2012-02-04 06:19:50 -0800
committerJames Dong <jdong@google.com>2012-02-06 12:17:44 -0800
commit60c2b4ece6528d6d3f4e9e2c7e45772b65c4b87d (patch)
tree3df99c3e31172c3ffcb9361a46b68890891f5a0b /include/media/stagefright/SurfaceMediaSource.h
parentf9289a4ca88d8f72cb0d6b3ca16fbc44ef4a2aeb (diff)
downloadframeworks_av-60c2b4ece6528d6d3f4e9e2c7e45772b65c4b87d.zip
frameworks_av-60c2b4ece6528d6d3f4e9e2c7e45772b65c4b87d.tar.gz
frameworks_av-60c2b4ece6528d6d3f4e9e2c7e45772b65c4b87d.tar.bz2
Don't call virtual function in destructor of SurfaceMediaSource
Change-Id: I3cbc2b1222335b61c814b5cdcfaefa495148b0ec
Diffstat (limited to 'include/media/stagefright/SurfaceMediaSource.h')
-rw-r--r--include/media/stagefright/SurfaceMediaSource.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/media/stagefright/SurfaceMediaSource.h b/include/media/stagefright/SurfaceMediaSource.h
index d0940bb..54baab6 100644
--- a/include/media/stagefright/SurfaceMediaSource.h
+++ b/include/media/stagefright/SurfaceMediaSource.h
@@ -58,7 +58,7 @@ public:
// For the MediaSource interface for use by StageFrightRecorder:
virtual status_t start(MetaData *params = NULL);
- virtual status_t stop();
+ virtual status_t stop() { return reset(); }
virtual status_t read(
MediaBuffer **buffer, const ReadOptions *options = NULL);
virtual sp<MetaData> getFormat();
@@ -359,6 +359,8 @@ private:
Condition mFrameAvailableCondition;
Condition mFrameCompleteCondition;
+ status_t reset();
+
// Avoid copying and equating and default constructor
DISALLOW_IMPLICIT_CONSTRUCTORS(SurfaceMediaSource);
};