From 60c2b4ece6528d6d3f4e9e2c7e45772b65c4b87d Mon Sep 17 00:00:00 2001 From: James Dong Date: Sat, 4 Feb 2012 06:19:50 -0800 Subject: Don't call virtual function in destructor of SurfaceMediaSource Change-Id: I3cbc2b1222335b61c814b5cdcfaefa495148b0ec --- include/media/stagefright/SurfaceMediaSource.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'include/media') 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 getFormat(); @@ -359,6 +359,8 @@ private: Condition mFrameAvailableCondition; Condition mFrameCompleteCondition; + status_t reset(); + // Avoid copying and equating and default constructor DISALLOW_IMPLICIT_CONSTRUCTORS(SurfaceMediaSource); }; -- cgit v1.1