From b44c9d2bdc0d5b9cb03254022a58e017b516e9e6 Mon Sep 17 00:00:00 2001
From: James Dong <jdong@google.com>
Date: Thu, 2 Feb 2012 18:04:02 -0800
Subject: Don't call virtual functions in the destructor for audio and camera
 source classes

Change-Id: Ia74ffc1c0cbd7971697f5e3c476e340ec5c7727a
---
 include/media/stagefright/CameraSource.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'include/media/stagefright/CameraSource.h')

diff --git a/include/media/stagefright/CameraSource.h b/include/media/stagefright/CameraSource.h
index 446720b..5a35358 100644
--- a/include/media/stagefright/CameraSource.h
+++ b/include/media/stagefright/CameraSource.h
@@ -79,7 +79,7 @@ public:
     virtual ~CameraSource();
 
     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);
 
@@ -163,7 +163,6 @@ protected:
                  bool storeMetaDataInVideoBuffers);
 
     virtual void startCameraRecording();
-    virtual void stopCameraRecording();
     virtual void releaseRecordingFrame(const sp<IMemory>& frame);
 
     // Returns true if need to skip the current frame.
@@ -220,7 +219,9 @@ private:
     status_t checkFrameRate(const CameraParameters& params,
                     int32_t frameRate);
 
+    void stopCameraRecording();
     void releaseCamera();
+    status_t reset();
 
     CameraSource(const CameraSource &);
     CameraSource &operator=(const CameraSource &);
-- 
cgit v1.1