diff options
author | James Dong <jdong@google.com> | 2012-02-04 06:19:50 -0800 |
---|---|---|
committer | James Dong <jdong@google.com> | 2012-02-06 12:17:44 -0800 |
commit | f5a9f439b6560f286a9326212c8cd44034cc6d78 (patch) | |
tree | 58fe5852645a8c7a5e3e22c36164b46e4bec00d2 | |
parent | cea2c396c5846a77c1427b9301e712beabe3f13d (diff) | |
download | frameworks_base-f5a9f439b6560f286a9326212c8cd44034cc6d78.zip frameworks_base-f5a9f439b6560f286a9326212c8cd44034cc6d78.tar.gz frameworks_base-f5a9f439b6560f286a9326212c8cd44034cc6d78.tar.bz2 |
Don't call virtual function in destructor of SurfaceMediaSource
Change-Id: I3cbc2b1222335b61c814b5cdcfaefa495148b0ec
-rw-r--r-- | include/media/stagefright/SurfaceMediaSource.h | 4 | ||||
-rw-r--r-- | media/libstagefright/SurfaceMediaSource.cpp | 6 |
2 files changed, 6 insertions, 4 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); }; diff --git a/media/libstagefright/SurfaceMediaSource.cpp b/media/libstagefright/SurfaceMediaSource.cpp index 2233d1b..d068381 100644 --- a/media/libstagefright/SurfaceMediaSource.cpp +++ b/media/libstagefright/SurfaceMediaSource.cpp @@ -60,7 +60,7 @@ SurfaceMediaSource::SurfaceMediaSource(uint32_t bufW, uint32_t bufH) : SurfaceMediaSource::~SurfaceMediaSource() { ALOGV("SurfaceMediaSource::~SurfaceMediaSource"); if (!mStopped) { - stop(); + reset(); } } @@ -716,9 +716,9 @@ status_t SurfaceMediaSource::start(MetaData *params) } -status_t SurfaceMediaSource::stop() +status_t SurfaceMediaSource::reset() { - ALOGV("Stop"); + ALOGV("Reset"); Mutex::Autolock lock(mMutex); // TODO: Add waiting on mFrameCompletedCondition here? |