Camera: Rename new API to camera2, rearrange camera service

 - Support API rename from photography to camera2
 - Reorganize camera service files
   - API support files to api1/, api2/, api_pro/
   - HAL device support files into device{1,2,3}/
   - Common files into common/
   - Camera service remains at top-level

Change-Id: Ie474c12536f543832fba0a2dc936ac4fd39fe6a9

1 files changed, 0 insertions, 86 deletions

diff --git a/services/camera/libcameraservice/camera2/JpegProcessor.h b/services/camera/libcameraservice/camera2/JpegProcessor.h
deleted file mode 100644
index a38611c..0000000
--- a/services/camera/libcameraservice/camera2/JpegProcessor.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ANDROID_SERVERS_CAMERA_CAMERA2_JPEGPROCESSOR_H
-#define ANDROID_SERVERS_CAMERA_CAMERA2_JPEGPROCESSOR_H
-
-#include <utils/Thread.h>
-#include <utils/String16.h>
-#include <utils/Vector.h>
-#include <utils/Mutex.h>
-#include <utils/Condition.h>
-#include <gui/CpuConsumer.h>
-#include "Parameters.h"
-#include "camera/CameraMetadata.h"
-
-namespace android {
-
-class Camera2Client;
-class CameraDeviceBase;
-class MemoryHeapBase;
-
-namespace camera2 {
-
-class CaptureSequencer;
-
-/***
- * Still image capture output image processing
- */
-class JpegProcessor:
-            public Thread, public CpuConsumer::FrameAvailableListener {
-  public:
-    JpegProcessor(sp<Camera2Client> client, wp<CaptureSequencer> sequencer);
-    ~JpegProcessor();
-
-    // CpuConsumer listener implementation
-    void onFrameAvailable();
-
-    status_t updateStream(const Parameters &params);
-    status_t deleteStream();
-    int getStreamId() const;
-
-    void dump(int fd, const Vector<String16>& args) const;
-  private:
-    static const nsecs_t kWaitDuration = 10000000; // 10 ms
-    wp<CameraDeviceBase> mDevice;
-    wp<CaptureSequencer> mSequencer;
-    int mId;
-
-    mutable Mutex mInputMutex;
-    bool mCaptureAvailable;
-    Condition mCaptureAvailableSignal;
-
-    enum {
-        NO_STREAM = -1
-    };
-
-    int mCaptureStreamId;
-    sp<CpuConsumer>    mCaptureConsumer;
-    sp<ANativeWindow>  mCaptureWindow;
-    sp<MemoryHeapBase>    mCaptureHeap;
-
-    virtual bool threadLoop();
-
-    status_t processNewCapture();
-    size_t findJpegSize(uint8_t* jpegBuffer, size_t maxSize);
-
-};
-
-
-}; //namespace camera2
-}; //namespace android
-
-#endif