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
---
 media/libstagefright/CameraSourceTimeLapse.cpp | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'media/libstagefright/CameraSourceTimeLapse.cpp')

diff --git a/media/libstagefright/CameraSourceTimeLapse.cpp b/media/libstagefright/CameraSourceTimeLapse.cpp
index 263ab50..83d67b9 100644
--- a/media/libstagefright/CameraSourceTimeLapse.cpp
+++ b/media/libstagefright/CameraSourceTimeLapse.cpp
@@ -87,6 +87,10 @@ CameraSourceTimeLapse::CameraSourceTimeLapse(
 }
 
 CameraSourceTimeLapse::~CameraSourceTimeLapse() {
+    if (mLastReadBufferCopy) {
+        mLastReadBufferCopy->release();
+        mLastReadBufferCopy = NULL;
+    }
 }
 
 void CameraSourceTimeLapse::startQuickReadReturns() {
@@ -204,15 +208,6 @@ status_t CameraSourceTimeLapse::read(
     }
 }
 
-void CameraSourceTimeLapse::stopCameraRecording() {
-    ALOGV("stopCameraRecording");
-    CameraSource::stopCameraRecording();
-    if (mLastReadBufferCopy) {
-        mLastReadBufferCopy->release();
-        mLastReadBufferCopy = NULL;
-    }
-}
-
 sp<IMemory> CameraSourceTimeLapse::createIMemoryCopy(
         const sp<IMemory> &source_data) {
 
-- 
cgit v1.1