From 54ff19ac69ace7c05ea90d225e26dab3b133f487 Mon Sep 17 00:00:00 2001
From: James Dong <jdong@google.com>
Date: Fri, 8 Oct 2010 11:59:32 -0700
Subject: Move Camera specific logic out from StagefrightRecorder to
 CameraSource

o updated comments and streamlined the logic in
  checkVideoSize() and checkFrameRate() as suggested

Change-Id: I49d04ac7998d4a215997aa63555dfb6e814e38d3
---
 media/libmediaplayerservice/StagefrightRecorder.h | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'media/libmediaplayerservice/StagefrightRecorder.h')

diff --git a/media/libmediaplayerservice/StagefrightRecorder.h b/media/libmediaplayerservice/StagefrightRecorder.h
index f14c704..039bc16 100644
--- a/media/libmediaplayerservice/StagefrightRecorder.h
+++ b/media/libmediaplayerservice/StagefrightRecorder.h
@@ -63,12 +63,7 @@ struct StagefrightRecorder : public MediaRecorderBase {
     virtual status_t dump(int fd, const Vector<String16>& args) const;
 
 private:
-    enum CameraFlags {
-        FLAGS_SET_CAMERA = 1L << 0,
-        FLAGS_HOT_CAMERA = 1L << 1,
-    };
-
-    sp<Camera> mCamera;
+    sp<ICamera> mCamera;
     sp<Surface> mPreviewSurface;
     sp<IMediaRecorderClient> mListener;
     sp<MediaWriter> mWriter, mWriterAux;
@@ -107,7 +102,6 @@ private:
 
     String8 mParams;
     int mOutputFd, mOutputFdAux;
-    int32_t mFlags;
 
     MediaProfiles *mEncoderProfiles;
 
@@ -125,10 +119,7 @@ private:
     status_t startAACRecording();
     status_t startRTPRecording();
     sp<MediaSource> createAudioSource();
-    status_t setupCamera();
-    bool     isVideoSizeSupported(const Vector<Size>& supportedSizes) const;
-    status_t setCameraVideoSize(CameraParameters* params,
-                bool *isSetVideoSizeSupported);
+    status_t checkVideoEncoderCapabilities();
     status_t setupCameraSource(sp<CameraSource> *cameraSource);
     status_t setupAudioEncoder(const sp<MediaWriter>& writer);
     status_t setupVideoEncoder(
-- 
cgit v1.1