diff options
author | James Dong <jdong@google.com> | 2012-02-02 18:04:02 -0800 |
---|---|---|
committer | James Dong <jdong@google.com> | 2012-02-02 18:11:53 -0800 |
commit | b44c9d2bdc0d5b9cb03254022a58e017b516e9e6 (patch) | |
tree | 06a30f5984b5fd11da06bbc6bc7d8294f21d1ac2 /media/libstagefright/CameraSource.cpp | |
parent | 2af955b7437ac5345d75a5e528ebbb749667af7e (diff) | |
download | frameworks_av-b44c9d2bdc0d5b9cb03254022a58e017b516e9e6.zip frameworks_av-b44c9d2bdc0d5b9cb03254022a58e017b516e9e6.tar.gz frameworks_av-b44c9d2bdc0d5b9cb03254022a58e017b516e9e6.tar.bz2 |
Don't call virtual functions in the destructor for audio and camera source classes
Change-Id: Ia74ffc1c0cbd7971697f5e3c476e340ec5c7727a
Diffstat (limited to 'media/libstagefright/CameraSource.cpp')
-rwxr-xr-x | media/libstagefright/CameraSource.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/media/libstagefright/CameraSource.cpp b/media/libstagefright/CameraSource.cpp index 1850c9c..228659c 100755 --- a/media/libstagefright/CameraSource.cpp +++ b/media/libstagefright/CameraSource.cpp @@ -548,7 +548,7 @@ status_t CameraSource::initWithCameraAccess( CameraSource::~CameraSource() { if (mStarted) { - stop(); + reset(); } else if (mInitCheck == OK) { // Camera is initialized but because start() is never called, // the lock on Camera is never released(). This makes sure @@ -632,8 +632,8 @@ void CameraSource::releaseCamera() { mCameraFlags = 0; } -status_t CameraSource::stop() { - ALOGD("stop: E"); +status_t CameraSource::reset() { + ALOGD("reset: E"); Mutex::Autolock autoLock(mLock); mStarted = false; mFrameAvailableCondition.signal(); @@ -670,7 +670,7 @@ status_t CameraSource::stop() { } CHECK_EQ(mNumFramesReceived, mNumFramesEncoded + mNumFramesDropped); - ALOGD("stop: X"); + ALOGD("reset: X"); return OK; } |